Update gemstone

Author: furenster

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/hyper/HyperCoreChainData.kt

@@ -4,21 +4,28 @@ import com.gemwallet.android.model.ChainSignData
 import uniffi.gemstone.GemTransactionLoadMetadata
 
 class HyperCoreChainData(
- val approveAgentRequired: Boolean,
- val approveReferralRequired: Boolean,
- val approveBuilderRequired: Boolean,
- val builderFeeBps: UInt,
- val agentAddress: String,
- val agentPrivateKey: String
-) : ChainSignData
+ val order: Order?
+) : ChainSignData {
+ class Order(
+ val approveAgentRequired: Boolean,
+ val approveReferralRequired: Boolean,
+ val approveBuilderRequired: Boolean,
+ val builderFeeBps: UInt,
+ val agentAddress: String,
+ val agentPrivateKey: String
+ )
+}
 
 fun GemTransactionLoadMetadata.Hyperliquid.toChainData(): HyperCoreChainData {
- return HyperCoreChainData(
- approveAgentRequired = approveAgentRequired,
- approveReferralRequired = approveReferralRequired,
- approveBuilderRequired = approveBuilderRequired,
- builderFeeBps = builderFeeBps,
- agentAddress = agentAddress,
- agentPrivateKey = agentPrivateKey,
- )
+ val order = order?.let {
+ HyperCoreChainData.Order(
+ approveAgentRequired = it.approveAgentRequired,
+ approveReferralRequired = it.approveReferralRequired,
+ approveBuilderRequired = it.approveBuilderRequired,
+ builderFeeBps = it.builderFeeBps,
+ agentAddress = it.agentAddress,
+ agentPrivateKey = it.agentPrivateKey,
+ )
+ }
+ return HyperCoreChainData(order)
 }

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/services/SignerPreloaderProxy.kt

@@ -8,7 +8,6 @@ import com.gemwallet.android.blockchain.clients.cardano.CardanoGatewayEstimateFe
 import com.gemwallet.android.blockchain.clients.cardano.toChainData
 import com.gemwallet.android.blockchain.clients.cosmos.toChainData
 import com.gemwallet.android.blockchain.clients.ethereum.toChainData
-import com.gemwallet.android.blockchain.clients.hyper.HyperCoreChainData
 import com.gemwallet.android.blockchain.clients.hyper.toChainData
 import com.gemwallet.android.blockchain.clients.near.toChainData
 import com.gemwallet.android.blockchain.clients.polkadot.PolkadotGatewayEstimateFee
@@ -45,6 +44,7 @@ import uniffi.gemstone.GemTransactionLoadMetadata
 import uniffi.gemstone.GemTransactionPreloadInput
 import uniffi.gemstone.GemTransferDataExtra
 import uniffi.gemstone.GemWalletConnectionSessionAppMetadata
+import uniffi.gemstone.SwapperException
 import uniffi.gemstone.TransferDataOutputAction
 import uniffi.gemstone.TransferDataOutputType
 
@@ -328,12 +328,5 @@ private fun GemTransactionLoadMetadata.toChainData() = when (this) {
  is GemTransactionLoadMetadata.Tron -> toChainData()
  is GemTransactionLoadMetadata.Xrp -> toChainData()
  is GemTransactionLoadMetadata.Hyperliquid -> toChainData()
- GemTransactionLoadMetadata.None -> HyperCoreChainData(
- approveAgentRequired = true,
- approveReferralRequired = true,
- approveBuilderRequired = true,
- builderFeeBps = 0U,
- agentAddress = "",
- agentPrivateKey = "",
- )// TODO: throw SwapperException.NotSupportedChain()
+ GemTransactionLoadMetadata.None -> throw SwapperException.NotSupportedChain()
 }

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/services/TransactionStatusService.kt

@@ -7,8 +7,8 @@ import com.gemwallet.android.model.TransactionChanges
 import com.wallet.core.primitives.TransactionState
 import okhttp3.internal.toLongOrDefault
 import uniffi.gemstone.GemGateway
-import uniffi.gemstone.GemTransactionChange
 import uniffi.gemstone.GemTransactionStateRequest
+import uniffi.gemstone.TransactionChange
 
 class TransactionStatusService(
  private val gateway: GemGateway,
@@ -24,9 +24,9 @@ class TransactionStatusService(
  blockNumber = request.block.toLongOrDefault(0L) ,
  )
  )
- val fee = result.changes.firstNotNullOfOrNull { it as? GemTransactionChange.NetworkFee }
+ val fee = result.changes.firstNotNullOfOrNull { it as? TransactionChange.NetworkFee }
  ?.v1?.toBigIntegerOrNull()
- val hashChanges = result.changes.firstNotNullOfOrNull { it as? GemTransactionChange.HashChange }
+ val hashChanges = result.changes.firstNotNullOfOrNull { it as? TransactionChange.HashChange }
 
  TransactionChanges(
  state = TransactionState.entries.firstOrNull { it.string == result.state } ?: throw ServiceUnavailable,

gradle/libs.versions.toml

@@ -46,7 +46,7 @@ reorderable = "3.0.0"
 mockkVersion = "1.14.5"
 datastore = "1.1.7"
 wallet-core = "4.3.5"
-gemstone = "0.33.8"
+gemstone = "0.33.9"
 ktor = "3.3.0"
 appcompat = "1.7.1"
 material = "1.13.0"