From 13f0e1bc81a549f459f9744a9a9a4649137df655 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 07:42:45 +0200 Subject: [PATCH] Migrate web3wallet to walletkit --- core/bom/build.gradle.kts | 2 +- product/{web3wallet => walletkit}/.gitignore | 0 product/{web3wallet => walletkit}/ReadMe.md | 0 product/{web3wallet => walletkit}/build.gradle.kts | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../kotlin/com/reown/walletkit}/client/ClientMapper.kt | 2 +- .../src/main/kotlin/com/reown/walletkit}/client/Wallet.kt | 2 +- .../main/kotlin/com/reown/walletkit}/client/WalletKit.kt | 2 +- .../main/kotlin/com/reown/walletkit}/utils/CacaoSigner.kt | 4 ++-- product/walletkit/web3wallet-rules.pro | 4 ++++ product/web3wallet/web3wallet-rules.pro | 4 ---- sample/wallet/build.gradle.kts | 4 ++-- sample/wallet/proguard-rules.pro | 8 ++++---- .../walletconnect/sample/wallet/WalletKitApplication.kt | 4 ++-- .../com/walletconnect/sample/wallet/domain/WCDelegate.kt | 4 ++-- .../walletconnect/sample/wallet/ui/WalletKitActivity.kt | 2 +- .../walletconnect/sample/wallet/ui/Web3WalletViewModel.kt | 4 ++-- .../walletconnect/sample/wallet/ui/common/Namespaces.kt | 2 +- .../walletconnect/sample/wallet/ui/common/peer/PeerUI.kt | 2 +- .../connection_details/ConnectionDetailsRoute.kt | 4 ++-- .../routes/composable_routes/connections/ConnectionUI.kt | 2 +- .../composable_routes/connections/ConnectionsViewModel.kt | 2 +- .../session_authenticate/SessionAuthenticateUI.kt | 2 +- .../session_authenticate/SessionAuthenticateViewModel.kt | 6 +++--- .../dialog_routes/session_proposal/SessionProposalUI.kt | 2 +- .../session_proposal/SessionProposalViewModel.kt | 4 ++-- .../session_request/SessionRequestViewModel.kt | 6 +++--- .../sample/wallet/domain/EthAccountDelegateTest.kt | 2 +- 28 files changed, 42 insertions(+), 42 deletions(-) rename product/{web3wallet => walletkit}/.gitignore (100%) rename product/{web3wallet => walletkit}/ReadMe.md (100%) rename product/{web3wallet => walletkit}/build.gradle.kts (97%) rename product/{web3wallet => walletkit}/src/main/AndroidManifest.xml (72%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/client/ClientMapper.kt (99%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/client/Wallet.kt (99%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/client/WalletKit.kt (99%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/utils/CacaoSigner.kt (85%) create mode 100644 product/walletkit/web3wallet-rules.pro delete mode 100644 product/web3wallet/web3wallet-rules.pro diff --git a/core/bom/build.gradle.kts b/core/bom/build.gradle.kts index dfe3ee844..c494b1de3 100644 --- a/core/bom/build.gradle.kts +++ b/core/bom/build.gradle.kts @@ -17,6 +17,6 @@ dependencies { api(project(":protocol:sign")) api(project(":protocol:notify")) api(project(":product:web3modal")) - api(project(":product:web3wallet")) + api(project(":product:walletkit")) } } \ No newline at end of file diff --git a/product/web3wallet/.gitignore b/product/walletkit/.gitignore similarity index 100% rename from product/web3wallet/.gitignore rename to product/walletkit/.gitignore diff --git a/product/web3wallet/ReadMe.md b/product/walletkit/ReadMe.md similarity index 100% rename from product/web3wallet/ReadMe.md rename to product/walletkit/ReadMe.md diff --git a/product/web3wallet/build.gradle.kts b/product/walletkit/build.gradle.kts similarity index 97% rename from product/web3wallet/build.gradle.kts rename to product/walletkit/build.gradle.kts index 784a92487..7746b3929 100644 --- a/product/web3wallet/build.gradle.kts +++ b/product/walletkit/build.gradle.kts @@ -13,7 +13,7 @@ project.apply { } android { - namespace = "com.walletconnect.web3.wallet" + namespace = "com.reown.walletkit" compileSdk = COMPILE_SDK defaultConfig { diff --git a/product/web3wallet/src/main/AndroidManifest.xml b/product/walletkit/src/main/AndroidManifest.xml similarity index 72% rename from product/web3wallet/src/main/AndroidManifest.xml rename to product/walletkit/src/main/AndroidManifest.xml index e94e2a41a..9bb540c41 100644 --- a/product/web3wallet/src/main/AndroidManifest.xml +++ b/product/walletkit/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.reown.walletkit"> \ No newline at end of file diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt similarity index 99% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt index 2fd620328..2946b1ee2 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.wallet.client +package com.reown.walletkit.client import com.reown.android.internal.common.signing.cacao.CacaoType import com.reown.sign.client.Sign diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt similarity index 99% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt index 16fa58858..bf6ad5217 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.wallet.client +package com.reown.walletkit.client import androidx.annotation.Keep import com.reown.android.Core diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt similarity index 99% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt index d3bf6ca41..bfdfc8d4e 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.wallet.client +package com.reown.walletkit.client import com.reown.android.Core import com.reown.android.CoreInterface diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/utils/CacaoSigner.kt similarity index 85% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/utils/CacaoSigner.kt index 3976c335f..4551ae884 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/utils/CacaoSigner.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.web3.wallet.utils +package com.reown.walletkit.utils import com.reown.android.cacao.signature.ISignatureType import com.reown.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet /// Only added to have backwards compatibility. Newer SDKs should only add CacaoSigner object below. diff --git a/product/walletkit/web3wallet-rules.pro b/product/walletkit/web3wallet-rules.pro new file mode 100644 index 000000000..d7bb92f85 --- /dev/null +++ b/product/walletkit/web3wallet-rules.pro @@ -0,0 +1,4 @@ +-keep class com.reown.walletkit.client.Wallet$Model$Cacao$Signature { *; } +-keep class com.reown.walletkit.client.Wallet$Model$Cacao { *; } +-keep class com.reown.walletkit.client.Wallet$Model { *; } +-keep class com.reown.walletkit.client.Wallet { *; } \ No newline at end of file diff --git a/product/web3wallet/web3wallet-rules.pro b/product/web3wallet/web3wallet-rules.pro deleted file mode 100644 index 733da187b..000000000 --- a/product/web3wallet/web3wallet-rules.pro +++ /dev/null @@ -1,4 +0,0 @@ --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao$Signature { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model { *; } --keep class com.walletconnect.web3.wallet.client.Wallet { *; } \ No newline at end of file diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts index 13de64347..71e751f64 100644 --- a/sample/wallet/build.gradle.kts +++ b/sample/wallet/build.gradle.kts @@ -123,11 +123,11 @@ dependencies { // WalletConnect debugImplementation(project(":core:android")) - debugImplementation(project(":product:web3wallet")) + debugImplementation(project(":product:walletkit")) debugImplementation(project(":protocol:notify")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:web3wallet")) + internalImplementation(project(":product:walletkit")) internalImplementation(project(":protocol:notify")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) diff --git a/sample/wallet/proguard-rules.pro b/sample/wallet/proguard-rules.pro index 4ba904ad8..25ef9e66e 100644 --- a/sample/wallet/proguard-rules.pro +++ b/sample/wallet/proguard-rules.pro @@ -1,7 +1,7 @@ -keepnames class com.fasterxml.jackson.** { *; } -dontwarn com.fasterxml.jackson.databind.** --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao$Signature { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model { *; } --keep class com.walletconnect.web3.wallet.client.Wallet { *; } \ No newline at end of file +-keep class com.reown.walletkit.client.Wallet$Model$Cacao$Signature { *; } +-keep class com.reown.walletkit.client.Wallet$Model$Cacao { *; } +-keep class com.reown.walletkit.client.Wallet$Model { *; } +-keep class com.reown.walletkit.client.Wallet { *; } \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt index a2dfb1222..51e8a059b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt @@ -34,8 +34,8 @@ import com.walletconnect.sample.wallet.domain.mixPanel import com.walletconnect.sample.wallet.ui.state.ConnectionState import com.walletconnect.sample.wallet.ui.state.connectionStateFlow import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt index cfb8c98de..ec8da3c6c 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt @@ -3,8 +3,8 @@ package com.walletconnect.sample.wallet.domain import android.util.Log import com.reown.android.Core import com.reown.android.CoreClient -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt index c8edae63f..1062db6f7 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt @@ -32,7 +32,7 @@ import com.walletconnect.sample.wallet.domain.NotifyDelegate import com.walletconnect.sample.wallet.ui.routes.Route import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import com.walletconnect.sample.wallet.ui.routes.host.WalletSampleHost -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt index 4bf3b8c3a..b96bf9aa1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt @@ -12,8 +12,8 @@ import com.walletconnect.sample.wallet.domain.ISSUER import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.state.ConnectionState import com.walletconnect.sample.wallet.ui.state.PairingEvent -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt index b5ca32d26..a6adfcd43 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt @@ -1,6 +1,6 @@ package com.walletconnect.sample.wallet.ui.common -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet fun getAllMethodsByChainId(namespace: Wallet.Model.Namespace.Proposal, chainId: String): List { return namespace.methods.takeIf { namespace.chains != null && namespace.chains!!.contains(chainId) } ?: emptyList() diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt index 3c008c4d6..a78a021f2 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt @@ -5,7 +5,7 @@ import com.walletconnect.sample.common.ui.theme.mismatch_color import com.walletconnect.sample.common.ui.theme.unverified_color import com.walletconnect.sample.common.ui.theme.verified_color import com.walletconnect.sample.wallet.R -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class PeerUI( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt index 27fd1ecbc..544e446bb 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt @@ -63,8 +63,8 @@ import com.walletconnect.sample.wallet.ui.common.getAllMethodsByChainId import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionType import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionUI import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt index 5e1d8accf..73e8f84f8 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt @@ -1,6 +1,6 @@ package com.walletconnect.sample.wallet.ui.routes.composable_routes.connections -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class ConnectionUI( val id: Int, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt index d338c2d61..05fe9b96a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.viewModelScope import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt index 57a2cea29..5959726b1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt @@ -3,7 +3,7 @@ package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenti import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class SessionAuthenticateUI( val peerUI: PeerUI, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt index 8d6198c92..24b9b507e 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt @@ -12,9 +12,9 @@ import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit -import com.walletconnect.web3.wallet.utils.CacaoSigner +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit +import com.reown.walletkit.utils.CacaoSigner class SessionAuthenticateViewModel : ViewModel() { val sessionAuthenticateUI: SessionAuthenticateUI? get() = generateAuthRequestUI() diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt index a8728f9f3..d4e0a7ac4 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt @@ -4,7 +4,7 @@ import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class SessionProposalUI( val peerUI: PeerUI, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt index cdae31eb4..d63523021 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt @@ -6,8 +6,8 @@ import com.google.firebase.ktx.Firebase import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import timber.log.Timber class SessionProposalViewModel : ViewModel() { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index cdd217840..3149cdc68 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -14,9 +14,9 @@ import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit -import com.walletconnect.web3.wallet.utils.CacaoSigner +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit +import com.reown.walletkit.utils.CacaoSigner import org.json.JSONArray import org.web3j.utils.Numeric.hexStringToByteArray diff --git a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt b/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt index 4a9fa7f88..ae3db535a 100644 --- a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt +++ b/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt @@ -5,7 +5,7 @@ import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.signing.message.MessageSignatureVerifier import com.reown.android.utils.cacao.sign import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.utils.CacaoSigner +import com.reown.walletkit.utils.CacaoSigner import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertFalse import junit.framework.TestCase.assertTrue