BOM_1.2.2 (#70)

* fix: package_name as bundleId (#57)

* fix: handle get network capabilities exception (#56)

* Merge pull request #60 from reown-com/chore/verification

* Feat/in wallet transaction (#61)

* fix: solana sign all (#69)

---------

Co-authored-by: Derek <[email protected]>

Author: jakubuid

.github/actions/ci_relay/action.yml

@@ -17,7 +17,7 @@ runs:
         architecture: x86_64
         cache: 'gradle'
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches

buildSrc/src/main/kotlin/Versions.kt

@@ -5,14 +5,14 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
 const val KEY_SDK_NAME = "SDK_NAME"
 
 //Latest versions
-const val BOM_VERSION = "1.2.1"
-const val FOUNDATION_VERSION = "1.2.1"
-const val CORE_VERSION = "1.2.1"
-const val SIGN_VERSION = "1.2.1"
-const val NOTIFY_VERSION = "1.2.1"
-const val WALLETKIT_VERSION = "1.2.1"
-const val APPKIT_VERSION = "1.2.1"
-const val MODAL_CORE_VERSION = "1.2.1"
+const val BOM_VERSION = "1.2.2"
+const val FOUNDATION_VERSION = "1.2.2"
+const val CORE_VERSION = "1.2.2"
+const val SIGN_VERSION = "1.2.2"
+const val NOTIFY_VERSION = "1.2.2"
+const val WALLETKIT_VERSION = "1.2.2"
+const val APPKIT_VERSION = "1.2.2"
+const val MODAL_CORE_VERSION = "1.2.2"
 
 //Artifact ids
 const val ANDROID_BOM = "android-bom"

funding.json

@@ -0,0 +1,5 @@
+{
+    "opRetro": {
+      "projectId": "0xa9155fd8bb7b8ef244047ad8578cabe91326a31ecb803485cc99147818fc30ca"
+    }
+}

product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt

@@ -304,9 +304,8 @@ internal fun PreparedSendTransaction.toWallet(moshi: Moshi): Wallet.Params.Prepa
     return Wallet.Params.PrepareSendTransactionsResult(hash = hash, doSendTransactionParams = jsonParams, eip712Domain = domain)
 }
 
-
 @JvmSynthetic
-internal fun Wallet.Params.Call.toYttrium(): Call = Call(to = to, value = value, input = data)
+internal fun Call.toWallet(): Wallet.Model.Call = Wallet.Model.Call(to = to, value = value, input = input)
 
 @JvmSynthetic
 internal fun Wallet.Params.OwnerSignature.toYttrium(): OwnerSignature = OwnerSignature(owner = address, signature = signature)

product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt

@@ -60,14 +60,13 @@ object Wallet {
 
         data class DecryptMessage(val topic: String, val encryptedMessage: String) : Params()
         data class GetSmartAccountAddress(val owner: Account) : Params()
-        data class PrepareSendTransactions(val calls: List<Call>, val owner: Account) : Params()
+        data class PrepareSendTransactions(val calls: List<Model.Call>, val owner: Account) : Params()
         data class DoSendTransactions(val owner: Account, val signatures: List<OwnerSignature>, val doSendTransactionParams: String) : Params()
         data class PrepareSendTransactionsResult(var hash: String, var doSendTransactionParams: String, val eip712Domain: String) : Params()
         data class DoSendTransactionsResult(var userOperationHash: String) : Params()
         data class WaitForUserOperationReceipt(var owner: Account, var userOperationHash: String) : Params()
         data class OwnerSignature(val address: String, val signature: String) : Params()
         data class Account(val address: String) : Params()
-        data class Call(val to: String, val value: String, val data: String) : Params()
     }
 
     sealed class Model {
@@ -77,6 +76,8 @@ object Wallet {
             data class Error(val error: Throwable) : Ping()
         }
 
+        data class Call(val to: String, val value: String, val input: String) : Model()
+
         data class Error(val throwable: Throwable) : Model()
 
         data class Transaction(

product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt

@@ -11,6 +11,7 @@ import com.reown.walletkit.di.walletKitModule
 import com.reown.walletkit.use_cases.EstimateGasUseCase
 import com.reown.walletkit.use_cases.ExecuteChainAbstractionUseCase
 import com.reown.walletkit.use_cases.GetERC20TokenBalanceUseCase
+import com.reown.walletkit.use_cases.PrepareCallERC20TransferCallUseCase
 import com.reown.walletkit.use_cases.PrepareChainAbstractionUseCase
 import kotlinx.coroutines.*
 import java.util.*
@@ -21,6 +22,7 @@ object WalletKit {
     private val executeChainAbstractionUseCase: ExecuteChainAbstractionUseCase by wcKoinApp.koin.inject()
     private val estimateGasUseCase: EstimateGasUseCase by wcKoinApp.koin.inject()
     private val getERC20TokenBalanceUseCase: GetERC20TokenBalanceUseCase by wcKoinApp.koin.inject()
+    private val prepareCallERC20TransferCallUseCase: PrepareCallERC20TransferCallUseCase by wcKoinApp.koin.inject()
 
     interface WalletDelegate {
         fun onSessionProposal(sessionProposal: Wallet.Model.SessionProposal, verifyContext: Wallet.Model.VerifyContext)
@@ -388,4 +390,9 @@ object WalletKit {
     fun getERC20Balance(chainId: String, tokenAddress: String, ownerAddress: String): String {
         return getERC20TokenBalanceUseCase(chainId, tokenAddress, ownerAddress)
     }
+
+    @Throws(Exception::class)
+    fun prepareErc20TransferCall(contractAddress: String, to: String, amount: String): Wallet.Model.Call {
+        return prepareCallERC20TransferCallUseCase(contractAddress, to, amount)
+    }
 }

product/walletkit/src/main/kotlin/com/reown/walletkit/di/WalletModule.kt

@@ -6,6 +6,7 @@ import com.reown.walletkit.BuildConfig
 import com.reown.walletkit.use_cases.EstimateGasUseCase
 import com.reown.walletkit.use_cases.ExecuteChainAbstractionUseCase
 import com.reown.walletkit.use_cases.GetERC20TokenBalanceUseCase
+import com.reown.walletkit.use_cases.PrepareCallERC20TransferCallUseCase
 import com.reown.walletkit.use_cases.PrepareChainAbstractionUseCase
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
@@ -34,4 +35,6 @@ internal fun walletKitModule() = module {
     single { GetERC20TokenBalanceUseCase(get()) }
 
     single { ExecuteChainAbstractionUseCase(get()) }
+
+    single { PrepareCallERC20TransferCallUseCase(get()) }
 }

product/walletkit/src/main/kotlin/com/reown/walletkit/use_cases/PrepareCallERC20TransferCallUseCase.kt

@@ -0,0 +1,12 @@
+package com.reown.walletkit.use_cases
+
+import com.reown.walletkit.client.Wallet
+import com.reown.walletkit.client.toWallet
+import kotlinx.coroutines.runBlocking
+import uniffi.uniffi_yttrium.ChainAbstractionClient
+
+class PrepareCallERC20TransferCallUseCase(private val chainAbstractionClient: ChainAbstractionClient) {
+    operator fun invoke(contractAddress: String, to: String, amount: String): Wallet.Model.Call {
+        return runBlocking { chainAbstractionClient.prepareErc20TransferCall(contractAddress, to, amount).toWallet() }
+    }
+}

product/walletkit/src/main/kotlin/com/reown/walletkit/use_cases/PrepareChainAbstractionUseCase.kt

@@ -22,7 +22,7 @@ class PrepareChainAbstractionUseCase(private val chainAbstractionClient: ChainAb
             try {
                 val result = async {
                     try {
-                        val call = Call(initialTransaction.to, initialTransaction.value, initialTransaction.input)
+                        val call = Call(to = initialTransaction.to, value = initialTransaction.value, input = initialTransaction.input)
                         chainAbstractionClient.prepareDetailed(initialTransaction.chainId, initialTransaction.from, call, Currency.USD)
                     } catch (e: Exception) {
                         return@async onError(Wallet.Model.PrepareError.Unknown(e.message ?: "Unknown error"))

protocol/sign/src/main/kotlin/com/reown/sign/engine/model/tvf/TVF.kt

@@ -1,6 +1,8 @@
 package com.reown.sign.engine.model.tvf
 
 import com.squareup.moshi.Moshi
+import io.ipfs.multibase.Base58
+import org.bouncycastle.util.encoders.Base64
 
 class TVF(private val moshi: Moshi) {
     private val evm: List<String>
@@ -47,19 +49,41 @@ class TVF(private val moshi: Moshi) {
                         ?.signature
                         ?.let { listOf(it) }
 
-                SOLANA_SIGN_ALL_TRANSACTION ->
+                SOLANA_SIGN_ALL_TRANSACTION -> {
                     moshi.adapter(SolanaSignAllTransactionsResult::class.java)
                         .fromJson(rpcResult)
                         ?.transactions
+                        ?.map { transaction -> extractSignature(transaction) }
+                }
 
                 else -> null
             }
         } catch (e: Exception) {
-            println("error processing $rpcMethod - $e")
+            println("Error processing $rpcMethod - $e")
             null
         }
     }
 
+    private fun extractSignature(transaction: String): String {
+        val transactionBuffer = try {
+            Base64.decode(transaction)
+        } catch (e: Exception) {
+            Base58.decode(transaction)
+        }
+
+        if (transactionBuffer.isEmpty()) {
+            throw IllegalArgumentException("Transaction buffer is empty")
+        }
+
+        val numSignatures = transactionBuffer[0].toInt() and 0xFF
+        if (numSignatures > 0 && transactionBuffer.size >= 65) {
+            val signatureBuffer = transactionBuffer.copyOfRange(1, 65)
+            return Base58.encode(signatureBuffer)
+        } else {
+            throw IllegalArgumentException("No signatures found in transaction")
+        }
+    }
+
     companion object {
         private const val ETH_SEND_TRANSACTION = "eth_sendTransaction"
         private const val ETH_SEND_RAW_TRANSACTION = "eth_sendRawTransaction"