Merge pull request #88 from reown-com/develop

BOM_1.3.3

Author: jakubuid

.idea/codeStyles/Project.xml

@@ -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.3.2"
-const val FOUNDATION_VERSION = "1.3.2"
-const val CORE_VERSION = "1.3.2"
-const val SIGN_VERSION = "1.3.2"
-const val NOTIFY_VERSION = "1.3.2"
-const val WALLETKIT_VERSION = "1.3.2"
-const val APPKIT_VERSION = "1.3.2"
-const val MODAL_CORE_VERSION = "1.3.2"
+const val BOM_VERSION = "1.3.3"
+const val FOUNDATION_VERSION = "1.3.3"
+const val CORE_VERSION = "1.3.3"
+const val SIGN_VERSION = "1.3.3"
+const val NOTIFY_VERSION = "1.3.3"
+const val WALLETKIT_VERSION = "1.3.3"
+const val APPKIT_VERSION = "1.3.3"
+const val MODAL_CORE_VERSION = "1.3.3"
 
 //Artifact ids
 const val ANDROID_BOM = "android-bom"

buildSrc/src/main/kotlin/Versions.kt

@@ -65,7 +65,7 @@ android {
 
 dependencies {
     implementation("net.java.dev.jna:jna:5.15.0@aar")
-    implementation("com.github.reown-com:yttrium:0.8.19") //unspecified
+    implementation("com.github.reown-com:yttrium:0.9.4") //unspecified
 
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)

product/walletkit/build.gradle.kts

@@ -14,9 +14,14 @@ import uniffi.yttrium.InitialTransactionMetadata
 import uniffi.yttrium.OwnerSignature
 import uniffi.yttrium.PrepareResponseAvailable
 import uniffi.yttrium.PreparedSendTransaction
+import uniffi.yttrium.Route
+import uniffi.yttrium.RouteSig
+import uniffi.yttrium.SolanaTransaction
+import uniffi.yttrium.SolanaTxnDetails
 import uniffi.yttrium.Metadata as YMetadata
 import uniffi.yttrium.Transaction
 import uniffi.yttrium.TransactionFee
+import uniffi.yttrium.Transactions
 import uniffi.yttrium.TxnDetails
 import uniffi.yttrium.UiFields
 
@@ -86,7 +91,13 @@ internal fun Wallet.Model.PayloadAuthRequestParams.toSign(): Sign.Model.PayloadP
 
 @JvmSynthetic
 internal fun Sign.Model.Session.toWallet(): Wallet.Model.Session = Wallet.Model.Session(
-    pairingTopic, topic, expiry, requiredNamespaces.toWalletProposalNamespaces(), optionalNamespaces?.toWalletProposalNamespaces(), namespaces.toWallet(), metaData
+    pairingTopic,
+    topic,
+    expiry,
+    requiredNamespaces.toWalletProposalNamespaces(),
+    optionalNamespaces?.toWalletProposalNamespaces(),
+    namespaces.toWallet(),
+    metaData
 )
 
 @JvmSynthetic
@@ -133,7 +144,8 @@ internal fun Sign.Model.SessionAuthenticate.toWallet(): Wallet.Model.SessionAuth
     Wallet.Model.SessionAuthenticate(id, topic, participant.toWallet(), payloadParams.toWallet())
 
 @JvmSynthetic
-internal fun Sign.Model.SessionAuthenticate.Participant.toWallet(): Wallet.Model.SessionAuthenticate.Participant = Wallet.Model.SessionAuthenticate.Participant(publicKey, metadata)
+internal fun Sign.Model.SessionAuthenticate.Participant.toWallet(): Wallet.Model.SessionAuthenticate.Participant =
+    Wallet.Model.SessionAuthenticate.Participant(publicKey, metadata)
 
 @JvmSynthetic
 internal fun Sign.Model.PayloadParams.toWallet(): Wallet.Model.PayloadAuthRequestParams =
@@ -323,7 +335,13 @@ internal fun UiFields.toWallet(): Wallet.Model.PrepareSuccess.Available =
     Wallet.Model.PrepareSuccess.Available(
         orchestratorId = routeResponse.orchestrationId,
         checkIn = routeResponse.metadata.checkIn.toLong(),
-        transactions = routeResponse.transactions.map { it.toWallet() },
+        transactions = routeResponse.transactions.map {
+            when (it) {
+                is Transactions.Eip155 -> Wallet.Model.Transactions.Eip155(it.v1.map { eip155 -> eip155.toWallet() })
+                is Transactions.Solana -> Wallet.Model.Transactions.Solana(it.v1.map { solana -> solana.toWallet() })
+                else -> throw Exception("Unsupported Transaction type")
+            }
+        },
         initialTransaction = routeResponse.initialTransaction.toWallet(),
         initialTransactionMetadata = routeResponse.metadata.initialTransaction.toWallet(),
         funding = routeResponse.metadata.fundingFrom.map { it.toWallet() },
@@ -333,7 +351,13 @@ internal fun UiFields.toWallet(): Wallet.Model.PrepareSuccess.Available =
 private fun UiFields.toTransactionsDetails() = Wallet.Model.TransactionsDetails(
     localTotal = localTotal.toWallet(),
     initialDetails = initial.toWallet(),
-    details = route.map { it.toWallet() },
+    route = route.map {
+        when (it) {
+            is Route.Eip155 -> Wallet.Model.Route.Eip155(it.v1.map { eip155 -> eip155.toWallet() })
+            is Route.Solana -> Wallet.Model.Route.Solana(it.v1.map { solana -> solana.toWallet() })
+            else -> throw Exception("Unsupported Route type")
+        }
+    },
     bridgeFees = bridge.map { it.toWallet() },
     localFulfilmentTotal = localRouteTotal.toWallet(),
     localBridgeTotal = localBridgeTotal.toWallet()
@@ -349,12 +373,28 @@ internal fun Wallet.Model.PrepareSuccess.Available.toResponseYttrium(): PrepareR
             fundingFrom = funding.map { it.toYttrium() }
         ),
         initialTransaction = initialTransaction.toYttrium(),
-        transactions = transactions.map { it.toYttrium() })
+        transactions = transactions.map {
+            when (it) {
+                is Wallet.Model.Transactions.Eip155 -> Transactions.Eip155(it.transactions.map { eip155 -> eip155.toYttrium() })
+                is Wallet.Model.Transactions.Solana -> Transactions.Solana(it.transactions.map { solana -> solana.toYttrium() })
+            }
+        })
+
+@JvmSynthetic
+internal fun Wallet.Model.RouteSig.toYttrium(): RouteSig = when (this) {
+    is Wallet.Model.RouteSig.Eip155 -> RouteSig.Eip155(this.signatures)
+    is Wallet.Model.RouteSig.Solana -> RouteSig.Solana(this.signatures)
+}
 
 @JvmSynthetic
 internal fun Wallet.Model.PrepareSuccess.Available.toYttrium(): UiFields =
     UiFields(
-        route = transactionsDetails.details.map { it.toYttrium() },
+        route = transactionsDetails.route.map {
+            when (it) {
+                is Wallet.Model.Route.Eip155 -> Route.Eip155(it.transactionDetails.map { eip155 -> eip155.toYttrium() })
+                is Wallet.Model.Route.Solana -> Route.Solana(it.solanaTransactionDetails.map { solana -> solana.toYttrium() })
+            }
+        },
         localTotal = transactionsDetails.localTotal.toYttrium(),
         localRouteTotal = transactionsDetails.localFulfilmentTotal.toYttrium(),
         bridge = transactionsDetails.bridgeFees.map { it.toYttrium() },
@@ -394,6 +434,13 @@ fun Transaction.toWallet(): Wallet.Model.Transaction = Wallet.Model.Transaction(
     chainId = chainId
 )
 
+@JvmSynthetic
+fun SolanaTransaction.toWallet(): Wallet.Model.SolanaTransaction = Wallet.Model.SolanaTransaction(
+    from = from,
+    chainId = chainId,
+    versionedTransaction = transaction
+)
+
 @JvmSynthetic
 fun Wallet.Model.Transaction.toYttrium(): Transaction = Transaction(
     from = from,
@@ -406,13 +453,23 @@ fun Wallet.Model.Transaction.toYttrium(): Transaction = Transaction(
 )
 
 @JvmSynthetic
-private fun Wallet.Model.FundingMetadata.toYttrium(): FundingMetadata = FundingMetadata(chainId, tokenContract, symbol, amount = amount, bridgingFee = bridgingFee, decimals = decimals.toUByte())
+fun Wallet.Model.SolanaTransaction.toYttrium(): SolanaTransaction = SolanaTransaction(
+    from = from,
+    chainId = chainId,
+    transaction = versionedTransaction
+)
+
+@JvmSynthetic
+private fun Wallet.Model.FundingMetadata.toYttrium(): FundingMetadata =
+    FundingMetadata(chainId, tokenContract, symbol, amount = amount, bridgingFee = bridgingFee, decimals = decimals.toUByte())
 
 @JvmSynthetic
-private fun FundingMetadata.toWallet(): Wallet.Model.FundingMetadata = Wallet.Model.FundingMetadata(chainId, tokenContract, symbol, amount, bridgingFee, 1)
+private fun FundingMetadata.toWallet(): Wallet.Model.FundingMetadata =
+    Wallet.Model.FundingMetadata(chainId, tokenContract, symbol, amount, bridgingFee, 1)
 
 @JvmSynthetic
-internal fun Eip1559Estimation.toWallet(): Wallet.Model.EstimatedFees = Wallet.Model.EstimatedFees(maxFeePerGas = maxFeePerGas, maxPriorityFeePerGas = maxPriorityFeePerGas)
+internal fun Eip1559Estimation.toWallet(): Wallet.Model.EstimatedFees =
+    Wallet.Model.EstimatedFees(maxFeePerGas = maxFeePerGas, maxPriorityFeePerGas = maxPriorityFeePerGas)
 
 @JvmSynthetic
 internal fun Amount.toWallet(): Wallet.Model.Amount = Wallet.Model.Amount(
@@ -438,12 +495,22 @@ private fun TxnDetails.toWallet(): Wallet.Model.TransactionDetails = Wallet.Mode
     transactionHashToSign = transactionHashToSign
 )
 
+private fun SolanaTxnDetails.toWallet(): Wallet.Model.SolanaTransactionDetails = Wallet.Model.SolanaTransactionDetails(
+    transaction = transaction.toWallet(),
+    transactionHashToSign = transactionHashToSign
+)
+
 private fun Wallet.Model.TransactionDetails.toYttrium(): TxnDetails = TxnDetails(
     transaction = feeEstimatedTransaction.toWallet(),
     fee = transactionFee.toYttrium(),
     transactionHashToSign = transactionHashToSign
 )
 
+private fun Wallet.Model.SolanaTransactionDetails.toYttrium(): SolanaTxnDetails = SolanaTxnDetails(
+    transaction = SolanaTransaction(chainId = transaction.chainId, from = transaction.from, transaction = transaction.versionedTransaction),
+    transactionHashToSign = transactionHashToSign
+)
+
 fun FeeEstimatedTransaction.toWallet(): Wallet.Model.FeeEstimatedTransaction = Wallet.Model.FeeEstimatedTransaction(
     from = from,
     to = to,

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

@@ -91,6 +91,17 @@ object Wallet {
             var chainId: String
         ) : Model()
 
+        data class SolanaTransaction(
+            val from: String,
+            val chainId: String,
+            val versionedTransaction: String
+        ) : Model()
+
+        sealed class Transactions : Model() {
+            data class Eip155(val transactions: List<Transaction>) : Transactions()
+            data class Solana(val transactions: List<SolanaTransaction>) : Transactions()
+        }
+
         data class InitialTransaction(
             var from: String,
             var to: String,
@@ -128,7 +139,6 @@ object Wallet {
             var transferTo: String
         ) : Model()
 
-
         data class EstimatedFees(
             val maxFeePerGas: String,
             val maxPriorityFeePerGas: String
@@ -138,7 +148,7 @@ object Wallet {
             data class Available(
                 val orchestratorId: String,
                 val checkIn: Long,
-                val transactions: List<Transaction>,
+                val transactions: List<Transactions>,
                 val initialTransaction: Transaction,
                 val initialTransactionMetadata: InitialTransactionMetadata,
                 val funding: List<FundingMetadata>,
@@ -166,14 +176,29 @@ object Wallet {
             var localFee: Amount
         ) : Model()
 
+        sealed class Route : Model() {
+            data class Eip155(val transactionDetails: List<TransactionDetails>) : Route()
+            data class Solana(val solanaTransactionDetails: List<SolanaTransactionDetails>) : Route()
+        }
+
+        sealed class RouteSig : Model() {
+            data class Eip155(val signatures: List<String>) : RouteSig()
+            data class Solana(val signatures: List<String>) : RouteSig()
+        }
+
         data class TransactionDetails(
             var feeEstimatedTransaction: FeeEstimatedTransaction,
             var transactionFee: TransactionFee,
             val transactionHashToSign: String
         ) : Model()
 
+        data class SolanaTransactionDetails(
+            var transaction: SolanaTransaction,
+            val transactionHashToSign: String
+        ) : Model()
+
         data class TransactionsDetails(
-            var details: List<TransactionDetails>,
+            var route: List<Route>,
             var initialDetails: TransactionDetails,
             var bridgeFees: List<TransactionFee>,
             var localBridgeTotal: Amount,
@@ -182,9 +207,10 @@ object Wallet {
         ) : Model()
 
         sealed class PrepareError : Model() {
-            data object NoRoutesAvailable : PrepareError()
-            data object InsufficientFunds : PrepareError()
-            data object InsufficientGasFunds : PrepareError()
+            data class NoRoutesAvailable(val message: String) : PrepareError()
+            data class InsufficientFunds(val message: String) : PrepareError()
+            data class InsufficientGasFunds(val message: String) : PrepareError()
+            data class AssetNotSupported(val message: String) : PrepareError()
             data class Unknown(val message: String) : PrepareError()
         }
 

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

@@ -355,11 +355,12 @@ object WalletKit {
         @ChainAbstractionExperimentalApi
         fun prepare(
             initialTransaction: Wallet.Model.InitialTransaction,
+            accounts: List<String>,
             onSuccess: (Wallet.Model.PrepareSuccess) -> Unit,
             onError: (Wallet.Model.PrepareError) -> Unit
         ) {
             try {
-                prepareChainAbstractionUseCase(initialTransaction, onSuccess, onError)
+                prepareChainAbstractionUseCase(initialTransaction, accounts, onSuccess, onError)
             } catch (e: Exception) {
                 onError(Wallet.Model.PrepareError.Unknown(e.message ?: "Unknown error"))
             }
@@ -368,13 +369,13 @@ object WalletKit {
         @ChainAbstractionExperimentalApi
         fun execute(
             prepareAvailable: Wallet.Model.PrepareSuccess.Available,
-            prepareSignedTxs: List<String>,
+            signedTxs: List<Wallet.Model.RouteSig>,
             initSignedTx: String,
             onSuccess: (Wallet.Model.ExecuteSuccess) -> Unit,
             onError: (Wallet.Model.Error) -> Unit
         ) {
             try {
-                executeChainAbstractionUseCase(prepareAvailable, prepareSignedTxs, initSignedTx, onSuccess, onError)
+                executeChainAbstractionUseCase(prepareAvailable, signedTxs, initSignedTx, onSuccess, onError)
             } catch (e: Exception) {
                 onError(Wallet.Model.Error(e))
             }

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

@@ -19,7 +19,6 @@ internal fun walletKitModule() = module {
         ChainAbstractionClient(
             projectId = get<ProjectId>().value,
             pulseMetadata = PulseMetadata(
-                packageName = null,
                 sdkPlatform = "mobile",
                 sdkVersion = "reown-kotlin-${BuildConfig.SDK_VERSION}",
                 bundleId = get(named(AndroidCommonDITags.PACKAGE_NAME)),

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

@@ -8,10 +8,11 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import uniffi.uniffi_yttrium.ChainAbstractionClient
 import uniffi.yttrium.ExecuteDetails
+
 class ExecuteChainAbstractionUseCase(private val chainAbstractionClient: ChainAbstractionClient) {
     operator fun invoke(
         prepareAvailable: Wallet.Model.PrepareSuccess.Available,
-        signedRouteTxs: List<String>,
+        signedRouteTxs: List<Wallet.Model.RouteSig>,
         initSignedTx: String,
         onSuccess: (Wallet.Model.ExecuteSuccess) -> Unit,
         onError: (Wallet.Model.Error) -> Unit
@@ -21,7 +22,7 @@ class ExecuteChainAbstractionUseCase(private val chainAbstractionClient: ChainAb
 
                 val result = async {
                     try {
-                        chainAbstractionClient.execute(prepareAvailable.toYttrium(), signedRouteTxs, initSignedTx)
+                        chainAbstractionClient.execute(prepareAvailable.toYttrium(), signedRouteTxs.map { it.toYttrium() }, initSignedTx)
                     } catch (e: Exception) {
                         return@async onError(Wallet.Model.Error(e))
                     }