Migrate web3wallet to walletkit

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"))
     }
 }

product/web3wallet/build.gradle.kts → 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 {

product/web3wallet/src/main/AndroidManifest.xml → product/walletkit/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.walletconnect.web3.wallet">
+    package="com.reown.walletkit">
 
 </manifest>

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt → 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

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt → 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

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt → 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

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt → 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.

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 { *; }

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"))

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 { *; }
+-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 { *; }

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

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

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

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

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<String> {
     return namespace.methods.takeIf { namespace.chains != null && namespace.chains!!.contains(chainId) } ?: emptyList()

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(

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
 

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,

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

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,

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()

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,

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() {

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
 

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