Integrate Yttrium methods in WalletKit

reown-com · Oct 31, 2024 · 14d07ea · 14d07ea
1 parent a4f9ed2
commit 14d07ea
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 39 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -13,7 +13,7 @@ const val NOTIFY_VERSION = "1.0.1"
 const val WALLETKIT_VERSION = "1.0.1"
 const val APPKIT_VERSION = "1.0.1"
 const val MODAL_CORE_VERSION = "1.0.1"
-const val YTTRIUM_VERSION = "0.2.5"
+const val YTTRIUM_VERSION = "0.2.6"
 
 //Artifact ids
 const val ANDROID_BOM = "android-bom"

diff --git a/product/walletkit/build.gradle.kts b/product/walletkit/build.gradle.kts
@@ -69,29 +69,20 @@ tasks.register("downloadYttriumArtifacts") {
         val tagName = YTTRIUM_VERSION
         val downloadUrl = "https://github.com/reown-com/yttrium/releases/download/$tagName/kotlin-artifacts.zip"
         val outputFile = file("${file(layout.buildDirectory)}/kotlin-artifacts.zip")
-
-
         outputFile.parentFile.mkdirs()
 
-        println("kobe: downloading $downloadUrl to: $outputFile")
-
         try {
             // Download the kotlin-artifacts.zip from GitHub Releases
             URL(downloadUrl).openStream().use { input ->
-                println("kobe: input: $input")
                 outputFile.outputStream().use { output ->
-                    println("kobe: output: $output")
                     input.copyTo(output)
                 }
             }
         } catch (e: Exception) {
-            println("kobe: Failed to download $downloadUrl error: $e")
+            println("Failed to download $downloadUrl error: $e")
             throw e
         }
 
-
-
-        println("kobe: extracting from $outputFile: to: ${file(layout.buildDirectory)}")
         // Extract the kotlin-artifacts.zip to the build directory
         copy {
             from(zipTree(outputFile))
@@ -101,7 +92,6 @@ tasks.register("downloadYttriumArtifacts") {
         // Delete the zip file after extraction
         if (outputFile.exists()) {
             outputFile.delete()
-            println("Deleted $outputFile")
         } else {
             println("File $outputFile does not exist")
         }

diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt
@@ -2,6 +2,9 @@ package com.reown.walletkit.client
 
 import com.reown.android.internal.common.signing.cacao.CacaoType
 import com.reown.sign.client.Sign
+import uniffi.uniffi_yttrium.OwnerSignature
+import uniffi.uniffi_yttrium.PreparedSendTransaction
+import uniffi.uniffi_yttrium.Transaction
 
 @JvmSynthetic
 internal fun Map<String, Wallet.Model.Namespace.Session>.toSign(): Map<String, Sign.Model.Namespace.Session> =
@@ -277,6 +280,15 @@ internal fun Sign.Model.Cacao.toWallet(): Wallet.Model.Cacao = with(this) {
 
 @JvmSynthetic
 internal fun Sign.Model.ConnectionState.Reason.toWallet(): Wallet.Model.ConnectionState.Reason = when (this) {
-	is Sign.Model.ConnectionState.Reason.ConnectionClosed -> Wallet.Model.ConnectionState.Reason.ConnectionClosed(this.message)
-	is Sign.Model.ConnectionState.Reason.ConnectionFailed -> Wallet.Model.ConnectionState.Reason.ConnectionFailed(this.throwable)
-}
+    is Sign.Model.ConnectionState.Reason.ConnectionClosed -> Wallet.Model.ConnectionState.Reason.ConnectionClosed(this.message)
+    is Sign.Model.ConnectionState.Reason.ConnectionFailed -> Wallet.Model.ConnectionState.Reason.ConnectionFailed(this.throwable)
+}
+
+@JvmSynthetic
+internal fun PreparedSendTransaction.toWallet(): Wallet.Model.PreparedSendTransaction = Wallet.Model.PreparedSendTransaction(hash, doSendTransactionParams)
+
+@JvmSynthetic
+internal fun Wallet.Params.Transaction.toYttrium(): Transaction = Transaction(to, data, value)
+
+@JvmSynthetic
+internal fun Wallet.Params.OwnerSignature.toYttrium(): OwnerSignature = OwnerSignature(address, signature)
diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt
@@ -18,7 +18,7 @@ object Wallet {
     }
 
     sealed class Params {
-        data class Init(val core: CoreInterface) : Params()
+        data class Init(val core: CoreInterface, val pimlicoApiKey: String? = null) : Params()
 
         data class Pair(val uri: String) : Params()
 
@@ -59,6 +59,12 @@ object Wallet {
         }
 
         data class DecryptMessage(val topic: String, val encryptedMessage: String) : Params()
+
+        data class Transaction(val to: String, val value: String, val data: String) : Params()
+
+        data class Account(val address: String) : Params()
+
+        data class OwnerSignature(val address: String, val signature: String) : Params()
     }
 
     sealed class Model {
@@ -309,5 +315,10 @@ object Wallet {
                 ) : Message()
             }
         }
+
+        data class PreparedSendTransaction(
+            var hash: String,
+            var doSendTransactionParams: String
+        ) : Model()
     }
 }
diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt
@@ -1,6 +1,5 @@
 package com.reown.walletkit.client
 
-import accountClient
 import com.reown.android.Core
 import com.reown.android.CoreInterface
 import com.reown.android.internal.common.scope
@@ -100,8 +99,10 @@ object WalletKit {
     @Throws(IllegalStateException::class)
     fun initialize(params: Wallet.Params.Init, onSuccess: () -> Unit = {}, onError: (Wallet.Model.Error) -> Unit) {
         coreClient = params.core
-
-        //todo: init safeInteractor
+        if (params.pimlicoApiKey != null) {
+            println("kobe: SafeInteractor initialized")
+            safeInteractor = SafeInteractor(params.pimlicoApiKey)
+        }
 
         SignClient.initialize(Sign.Params.Init(params.core), onSuccess = onSuccess) { error ->
             if (error.throwable is SignClientAlreadyInitializedException) {
@@ -276,20 +277,36 @@ object WalletKit {
     }
 
     //Yttrium
-    fun prepareSendTransactions() {
+    @Throws(IllegalStateException::class)
+    fun getSmartAccount(owner: Wallet.Params.Account): String {
+        check(::safeInteractor.isInitialized) { "Smart Accounts are not enabled" }
 
+        val client = safeInteractor.getOrCreate(owner.address)
+        return runBlocking { client.getAddress() }
     }
 
-    fun doSendTransaction() {
+    @Throws(IllegalStateException::class)
+    fun prepareSendTransactions(transactions: List<Wallet.Params.Transaction>, owner: Wallet.Params.Account): Wallet.Model.PreparedSendTransaction {
+        check(::safeInteractor.isInitialized) { "Smart Accounts are not enabled" }
 
+        val client = safeInteractor.getOrCreate(owner.address)
+        return runBlocking { client.prepareSendTransactions(transactions.map { it.toYttrium() }).toWallet() }
     }
 
-    fun getSmartAccount() {
+    @Throws(IllegalStateException::class)
+    fun doSendTransactions(owner: Wallet.Params.Account, signatures: List<Wallet.Params.OwnerSignature>, doSendTransactionParams: String): String {
+        check(::safeInteractor.isInitialized) { "Smart Accounts are not enabled" }
 
+        val client = safeInteractor.getOrCreate(owner.address)
+        return runBlocking { client.doSendTransactions(signatures.map { it.toYttrium() }, doSendTransactionParams) }
     }
 
-    fun waitForUserOperationReceipt() {
+    @Throws(IllegalStateException::class)
+    fun waitForUserOperationReceipt(owner: Wallet.Params.Account, userOperationHash: String): String {
+        check(::safeInteractor.isInitialized) { "Smart Accounts are not enabled" }
 
+        val client = safeInteractor.getOrCreate(owner.address)
+        return runBlocking { client.waitForUserOperationReceipt(userOperationHash) }
     }
 
     /**

diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/smart_account/SafeInteractor.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/smart_account/SafeInteractor.kt
@@ -24,7 +24,7 @@ class SafeInteractor(private val pimlicoApiKey: String) {
 
 
     private fun createSafeAccount(owner: String): AccountClient {
-        val (namespace: String, reference: String, _) = owner.split(":")
+        val (namespace: String, reference: String, address: String) = owner.split(":")
         val pimlicoUrl = "https://api.pimlico.io/v2/$reference/rpc?apikey=$pimlicoApiKey"
         val endpoints = Endpoints(
             rpc = Endpoint(baseUrl = "https://rpc.walletconnect.com/v1?chainId=$namespace:$reference&projectId=$projectId", apiKey = ""),
@@ -34,13 +34,14 @@ class SafeInteractor(private val pimlicoApiKey: String) {
         val config = Config(endpoints)
 
         val accountConfig = AccountClientConfig(
-            ownerAddress = owner,
+            ownerAddress = address,
             chainId = reference.toULong(),
             config = config,
-            privateKey = "", //todo: remove
+            privateKey = "ff89825a799afce0d5deaa079cdde227072ec3f62973951683ac8cc033092156", //todo: remove sign service
             safe = true,
-            signerType = "PrivateKey" //todo: remove
+            signerType = "PrivateKey" //todo: remove sign service
         )
+        println("kobe: init Safe Account")
         return AccountClient(accountConfig)
     }
 }
diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts
@@ -22,6 +22,7 @@ android {
             useSupportLibrary = true
         }
         buildConfigField("String", "PROJECT_ID", "\"${System.getenv("WC_CLOUD_PROJECT_ID") ?: ""}\"")
+        buildConfigField("String", "PIMLICO_API_KEY", "\"${System.getenv("PIMLICO_API_KEY") ?: ""}\"")
         buildConfigField("String", "BOM_VERSION", "\"${BOM_VERSION}\"")
     }
 

diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt
@@ -72,7 +72,7 @@ class WalletKitApplication : Application() {
 
         println("Account: ${EthAccountDelegate.account}")
 
-        WalletKit.initialize(Wallet.Params.Init(core = CoreClient),
+        WalletKit.initialize(Wallet.Params.Init(core = CoreClient, pimlicoApiKey = BuildConfig.PIMLICO_API_KEY),
             onSuccess = { println("Web3Wallet initialized") },
             onError = { error ->
                 Firebase.crashlytics.recordException(error.throwable)
@@ -81,12 +81,8 @@ class WalletKitApplication : Application() {
 
         FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable()
 
-//        //Yttrium Account Client init
-//        accountClient = AccountClient(accountConfig)
-//        scope.launch {
-//            smartAccountAddress = accountClient.getAddress()
-//            println("kobe: SmartAccountAddress: $smartAccountAddress")
-//        }
+        val smartAccountAddress = WalletKit.getSmartAccount(owner = Wallet.Params.Account(EthAccountDelegate.ethAddress))
+        println("kobe: SmartAccountAddress: $smartAccountAddress")
 
         NotifyClient.initialize(
             init = Notify.Params.Init(CoreClient)

diff --git a/...lin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt b/...lin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt
@@ -1,6 +1,6 @@
 package com.reown.sample.wallet.ui.routes.dialog_routes.session_proposal
 
-import smartAccountAddress
+import com.reown.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS
 import com.reown.sample.wallet.ui.common.peer.PeerContextUI
 import com.reown.sample.wallet.ui.common.peer.PeerUI
 import com.reown.walletkit.client.Wallet
@@ -48,7 +48,7 @@ val walletMetaData = WalletMetaData(
             ),
             events = listOf("chainChanged", "accountsChanged", "connect", "disconnect"),
             accounts = listOf(
-                "eip155:11155111:$smartAccountAddress"
+                "eip155:11155111:$ACCOUNTS_1_EIP155_ADDRESS"
             )
 //            "eip155:1:$ACCOUNTS_1_EIP155_ADDRESS",
 //            "eip155:1:$ACCOUNTS_2_EIP155_ADDRESS",

diff --git a/.../reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt b/.../reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt
@@ -3,8 +3,8 @@ package com.reown.sample.wallet.ui.routes.dialog_routes.session_proposal
 import androidx.lifecycle.ViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
+import com.reown.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS
 import com.reown.sample.wallet.domain.WCDelegate
-import smartAccountAddress
 import com.reown.sample.wallet.ui.common.peer.PeerUI
 import com.reown.sample.wallet.ui.common.peer.toPeerUI
 import com.reown.walletkit.client.Wallet
@@ -20,7 +20,7 @@ class SessionProposalViewModel : ViewModel() {
                 Timber.d("Approving session proposal: $proposalPublicKey")
                 val sessionNamespaces = WalletKit.generateApprovedNamespaces(sessionProposal = proposal, supportedNamespaces = walletMetaData.namespaces)
 
-                val capability = "{\"$smartAccountAddress\":{\"0xaa36a7\":{\"atomicBatch\":{\"supported\":true}}}}"
+                val capability = "{\"eip155:11155111:$ACCOUNTS_1_EIP155_ADDRESS\":{\"0xaa36a7\":{\"atomicBatch\":{\"supported\":true}}}}"
 
 //                "[{\"from\":\"$account\",\"to\":\"0x70012948c348CBF00806A3C79E3c5DAdFaAa347B\",\"data\":\"0x\",\"gasLimit\":\"0x5208\",\"gasPrice\":\"0x0649534e00\",\"value\":\"0x01\",\"nonce\":\"0x07\"}]"
                 val sessionProperties = mapOf(

diff --git a/...om/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/...om/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt
@@ -12,7 +12,6 @@ import com.reown.android.utils.cacao.sign
 import com.reown.sample.common.Chains
 import com.reown.sample.wallet.domain.EthAccountDelegate
 import com.reown.sample.wallet.domain.WCDelegate
-import accountClient
 import com.reown.sample.wallet.ui.common.peer.PeerUI
 import com.reown.sample.wallet.ui.common.peer.toPeerUI
 import com.reown.util.hexToBytes