diff --git a/app/src/androidTest/kotlin/wallet/android/app/tokens/TestValidateTokenAddress.kt b/app/src/androidTest/kotlin/wallet/android/app/tokens/TestValidateTokenAddress.kt
index cecc6e3fe..60cf99fe8 100644
--- a/app/src/androidTest/kotlin/wallet/android/app/tokens/TestValidateTokenAddress.kt
+++ b/app/src/androidTest/kotlin/wallet/android/app/tokens/TestValidateTokenAddress.kt
@@ -1,11 +1,5 @@
package wallet.android.app.tokens
-import com.gemwallet.android.blockchain.clients.aptos.AptosGetTokenClient
-import com.gemwallet.android.blockchain.clients.ethereum.EvmGetTokenClient
-import com.gemwallet.android.blockchain.clients.solana.SolanaTokenClient
-import com.gemwallet.android.blockchain.clients.sui.SuiGetTokenClient
-import com.gemwallet.android.blockchain.clients.ton.TonGetTokenClient
-import com.gemwallet.android.blockchain.clients.tron.TronGetTokenClient
import junit.framework.TestCase.assertFalse
import junit.framework.TestCase.assertTrue
import org.junit.Test
diff --git a/app/src/main/assets/swap/orca.svg b/app/src/main/assets/swap/orca.svg
deleted file mode 100644
index 21fcf7fdd..000000000
--- a/app/src/main/assets/swap/orca.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/app/src/main/kotlin/com/gemwallet/android/data/password/PreferencePasswordStore.kt b/app/src/main/kotlin/com/gemwallet/android/data/password/PreferencePasswordStore.kt
index a558e23f5..69091f677 100644
--- a/app/src/main/kotlin/com/gemwallet/android/data/password/PreferencePasswordStore.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/data/password/PreferencePasswordStore.kt
@@ -8,6 +8,7 @@ import androidx.security.crypto.MasterKey
import com.gemwallet.android.blockchain.operators.PasswordStore
import com.gemwallet.android.math.toHexString
import java.security.SecureRandom
+import androidx.core.content.edit
class PreferencePasswordStore(
private val context: Context,
@@ -18,10 +19,9 @@ class PreferencePasswordStore(
override fun createPassword(walletId: String): String {
val key = ByteArray(16)
random.nextBytes(key)
- getStore()
- .edit()
- .putString(walletId, key.toHexString())
- .commit()
+ getStore().edit(commit = true) {
+ putString(walletId, key.toHexString())
+ }
return key.toHexString()
}
diff --git a/app/src/main/kotlin/com/gemwallet/android/di/DataModule.kt b/app/src/main/kotlin/com/gemwallet/android/di/DataModule.kt
index 7c3d026c9..55d662bc0 100644
--- a/app/src/main/kotlin/com/gemwallet/android/di/DataModule.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/di/DataModule.kt
@@ -1,83 +1,32 @@
package com.gemwallet.android.di
-import com.gemwallet.android.blockchain.RpcClientAdapter
-import com.gemwallet.android.blockchain.clients.ActivationTransactionPreloader
-import com.gemwallet.android.blockchain.clients.ApprovalTransactionPreloader
-import com.gemwallet.android.blockchain.clients.BroadcastClientProxy
-import com.gemwallet.android.blockchain.clients.GenericTransferPreloader
-import com.gemwallet.android.blockchain.clients.NftTransactionPreloader
-import com.gemwallet.android.blockchain.clients.NodeStatusClientProxy
-import com.gemwallet.android.blockchain.clients.SignClientProxy
-import com.gemwallet.android.blockchain.clients.StakeTransactionPreloader
-import com.gemwallet.android.blockchain.clients.SwapTransactionPreloader
-import com.gemwallet.android.blockchain.clients.TokenTransferPreloader
-import com.gemwallet.android.blockchain.clients.algorand.AlgorandBroadcastClient
-import com.gemwallet.android.blockchain.clients.algorand.AlgorandNodeStatusClient
import com.gemwallet.android.blockchain.clients.algorand.AlgorandSignClient
-import com.gemwallet.android.blockchain.clients.algorand.AlgorandSignPreloadClient
-import com.gemwallet.android.blockchain.clients.aptos.AptosBroadcastClient
-import com.gemwallet.android.blockchain.clients.aptos.AptosNodeStatusClient
import com.gemwallet.android.blockchain.clients.aptos.AptosSignClient
-import com.gemwallet.android.blockchain.clients.aptos.AptosSignerPreloader
-import com.gemwallet.android.blockchain.clients.bitcoin.BitcoinBroadcastClient
-import com.gemwallet.android.blockchain.clients.bitcoin.BitcoinNodeStatusClient
import com.gemwallet.android.blockchain.clients.bitcoin.BitcoinSignClient
-import com.gemwallet.android.blockchain.clients.bitcoin.BitcoinSignerPreloader
-import com.gemwallet.android.blockchain.clients.cardano.CardanoBroadcastClient
-import com.gemwallet.android.blockchain.clients.cardano.CardanoNodeStatusClient
import com.gemwallet.android.blockchain.clients.cardano.CardanoSignClient
-import com.gemwallet.android.blockchain.clients.cardano.CardanoSignerPreloaderClient
-import com.gemwallet.android.blockchain.clients.cosmos.CosmosBroadcastClient
-import com.gemwallet.android.blockchain.clients.cosmos.CosmosNodeStatusClient
import com.gemwallet.android.blockchain.clients.cosmos.CosmosSignClient
-import com.gemwallet.android.blockchain.clients.cosmos.CosmosSignerPreloader
-import com.gemwallet.android.blockchain.clients.ethereum.EvmBroadcastClient
-import com.gemwallet.android.blockchain.clients.ethereum.EvmNodeStatusClient
import com.gemwallet.android.blockchain.clients.ethereum.EvmSignClient
-import com.gemwallet.android.blockchain.clients.ethereum.EvmSignerPreloader
-import com.gemwallet.android.blockchain.clients.near.NearBroadcastClient
-import com.gemwallet.android.blockchain.clients.near.NearNodeStatusClient
+import com.gemwallet.android.blockchain.clients.hyper.HyperCoreSignClient
import com.gemwallet.android.blockchain.clients.near.NearSignClient
-import com.gemwallet.android.blockchain.clients.near.NearSignerPreloader
-import com.gemwallet.android.blockchain.clients.polkadot.PolkadotBroadcastClient
-import com.gemwallet.android.blockchain.clients.polkadot.PolkadotNodeStatusClient
import com.gemwallet.android.blockchain.clients.polkadot.PolkadotSignClient
-import com.gemwallet.android.blockchain.clients.polkadot.PolkadotSignerPreloaderClient
-import com.gemwallet.android.blockchain.clients.solana.SolanaBroadcastClient
-import com.gemwallet.android.blockchain.clients.solana.SolanaNodeStatusClient
import com.gemwallet.android.blockchain.clients.solana.SolanaSignClient
-import com.gemwallet.android.blockchain.clients.solana.SolanaSignerPreloader
-import com.gemwallet.android.blockchain.clients.stellar.StellarBroadcastClient
-import com.gemwallet.android.blockchain.clients.stellar.StellarNodeStatusClient
import com.gemwallet.android.blockchain.clients.stellar.StellarSignClient
-import com.gemwallet.android.blockchain.clients.stellar.StellarSignPreloadClient
-import com.gemwallet.android.blockchain.clients.sui.SuiBroadcastClient
-import com.gemwallet.android.blockchain.clients.sui.SuiNodeStatusClient
import com.gemwallet.android.blockchain.clients.sui.SuiSignClient
-import com.gemwallet.android.blockchain.clients.sui.SuiSignerPreloader
-import com.gemwallet.android.blockchain.clients.ton.TonBroadcastClient
-import com.gemwallet.android.blockchain.clients.ton.TonNodeStatusClient
import com.gemwallet.android.blockchain.clients.ton.TonSignClient
-import com.gemwallet.android.blockchain.clients.ton.TonSignerPreloader
-import com.gemwallet.android.blockchain.clients.tron.TronBroadcastClient
-import com.gemwallet.android.blockchain.clients.tron.TronNodeStatusClient
import com.gemwallet.android.blockchain.clients.tron.TronSignClient
-import com.gemwallet.android.blockchain.clients.tron.TronSignerPreloader
-import com.gemwallet.android.blockchain.clients.xrp.XrpBroadcastClient
-import com.gemwallet.android.blockchain.clients.xrp.XrpNodeStatusClient
import com.gemwallet.android.blockchain.clients.xrp.XrpSignClient
-import com.gemwallet.android.blockchain.clients.xrp.XrpSignerPreloader
-import com.gemwallet.android.cases.device.GetDeviceIdCase
+import com.gemwallet.android.blockchain.services.BroadcastService
+import com.gemwallet.android.blockchain.services.NodeStatusService
+import com.gemwallet.android.blockchain.services.SignClientProxy
+import com.gemwallet.android.blockchain.services.SignerPreloaderProxy
import com.gemwallet.android.cases.device.SyncSubscription
import com.gemwallet.android.cases.transactions.SyncTransactions
import com.gemwallet.android.data.repositoreis.assets.AssetsRepository
import com.gemwallet.android.data.repositoreis.buy.BuyRepository
import com.gemwallet.android.data.repositoreis.session.SessionRepository
import com.gemwallet.android.data.repositoreis.wallets.WalletsRepository
-import com.gemwallet.android.data.services.gemapi.GemApiClient
import com.gemwallet.android.ext.available
import com.gemwallet.android.ext.toChainType
-import com.gemwallet.android.services.SignerPreloaderProxy
import com.gemwallet.android.services.SyncService
import com.wallet.core.primitives.Chain
import com.wallet.core.primitives.ChainType
@@ -85,6 +34,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
+import uniffi.gemstone.GemGateway
import javax.inject.Singleton
@InstallIn(SingletonComponent::class)
@@ -94,66 +44,18 @@ object DataModule {
@Provides
@Singleton
fun providesBroadcastProxy(
- rpcClients: RpcClientAdapter,
- ): BroadcastClientProxy = BroadcastClientProxy(
- Chain.available().map {
- when (it.toChainType()) {
- ChainType.Bitcoin -> BitcoinBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Ethereum -> EvmBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Solana -> SolanaBroadcastClient(it, rpcClients.getClient(Chain.Solana))
- ChainType.Cosmos -> CosmosBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Ton -> TonBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Tron -> TronBroadcastClient(it, rpcClients.getClient(Chain.Tron))
- ChainType.Aptos -> AptosBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Sui -> SuiBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Xrp -> XrpBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Near -> NearBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Algorand -> AlgorandBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Stellar -> StellarBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Polkadot -> PolkadotBroadcastClient(it, rpcClients.getClient(it))
- ChainType.Cardano -> CardanoBroadcastClient(it, rpcClients.getClient(it))
- }
- },
+ gateway: GemGateway,
+ ): BroadcastService = BroadcastService(
+ gateway = gateway,
)
@Provides
@Singleton
fun provideSignerPreloader(
- rpcClients: RpcClientAdapter,
- gemApiClient: GemApiClient,
- sessionRepository: SessionRepository,
- getDeviceIdCase: GetDeviceIdCase,
+ gateway: GemGateway,
): SignerPreloaderProxy {
- val preloaders = Chain.available().map {
- when (it.toChainType()) {
- ChainType.Bitcoin -> BitcoinSignerPreloader(it, rpcClients.getClient(it), rpcClients.getClient(it))
- ChainType.Ethereum -> EvmSignerPreloader(it, rpcClients.getClient(it), rpcClients.getClient(it))
- ChainType.Solana -> SolanaSignerPreloader(it, rpcClients.getClient(Chain.Solana), rpcClients.getClient(Chain.Solana), rpcClients.getClient(Chain.Solana))
- ChainType.Cosmos -> CosmosSignerPreloader(it, rpcClients.getClient(it))
- ChainType.Ton -> TonSignerPreloader(it, rpcClients.getClient(it))
- ChainType.Tron -> TronSignerPreloader(it, rpcClients.getClient(it), rpcClients.getClient(it), rpcClients.getClient(it))
- ChainType.Aptos -> AptosSignerPreloader(it, rpcClients.getClient(it), rpcClients.getClient(it))
- ChainType.Sui -> SuiSignerPreloader(it, rpcClients.getClient(it))
- ChainType.Xrp -> XrpSignerPreloader(it, rpcClients.getClient(it))
- ChainType.Near -> NearSignerPreloader(it, rpcClients.getClient(it))
- ChainType.Algorand -> AlgorandSignPreloadClient(it, rpcClients.getClient(it))
- ChainType.Stellar -> StellarSignPreloadClient(it, rpcClients.getClient(it), rpcClients.getClient(it))
- ChainType.Polkadot -> PolkadotSignerPreloaderClient(it, rpcClients.getClient(it), rpcClients.getClient(it), rpcClients.getClient(it))
- ChainType.Cardano -> CardanoSignerPreloaderClient(it, rpcClients.getClient(it))
- }
- }
return SignerPreloaderProxy(
- gemApiClient = gemApiClient,
- sessionRepository = sessionRepository,
- getDeviceIdCase = getDeviceIdCase,
- nativeTransferClients = preloaders,
- tokenTransferClients = preloaders.mapNotNull { it as? TokenTransferPreloader },
- stakeTransactionClients = preloaders.mapNotNull { it as? StakeTransactionPreloader },
- swapTransactionClients = preloaders.mapNotNull { it as? SwapTransactionPreloader },
- approvalTransactionClients = preloaders.mapNotNull { it as? ApprovalTransactionPreloader },
- activatePreloaderClients = preloaders.mapNotNull { it as? ActivationTransactionPreloader },
- genericPreloaderClients = preloaders.mapNotNull { it as? GenericTransferPreloader },
- nftPreloadClients = preloaders.mapNotNull { it as? NftTransactionPreloader },
+ gateway = gateway,
)
}
@@ -178,6 +80,7 @@ object DataModule {
ChainType.Stellar -> StellarSignClient(it)
ChainType.Polkadot -> PolkadotSignClient(it)
ChainType.Cardano -> CardanoSignClient(it)
+ ChainType.HyperCore -> HyperCoreSignClient(it)
}
},
)
@@ -185,28 +88,9 @@ object DataModule {
@Singleton
@Provides
fun provideNodeStatusClient(
- rpcClients: RpcClientAdapter,
- ): NodeStatusClientProxy {
- return NodeStatusClientProxy(
- Chain.available().map {
- when (it.toChainType()) {
- ChainType.Ethereum -> EvmNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Bitcoin -> BitcoinNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Solana -> SolanaNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Cosmos -> CosmosNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Ton -> TonNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Tron -> TronNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Aptos -> AptosNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Sui -> SuiNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Xrp -> XrpNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Near -> NearNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Algorand -> AlgorandNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Stellar -> StellarNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Polkadot -> PolkadotNodeStatusClient(it, rpcClients.getClient(it))
- ChainType.Cardano -> CardanoNodeStatusClient(it, rpcClients.getClient(it))
- }
- }
- )
+ gateway: GemGateway,
+ ): NodeStatusService {
+ return NodeStatusService(gateway)
}
@Singleton
diff --git a/app/src/main/kotlin/com/gemwallet/android/di/GatewayModule.kt b/app/src/main/kotlin/com/gemwallet/android/di/GatewayModule.kt
new file mode 100644
index 000000000..2b0299cb8
--- /dev/null
+++ b/app/src/main/kotlin/com/gemwallet/android/di/GatewayModule.kt
@@ -0,0 +1,32 @@
+package com.gemwallet.android.di
+
+import android.content.Context
+import com.gemwallet.android.data.repositoreis.config.SecurityGemPreferences
+import com.gemwallet.android.data.repositoreis.config.SharedGemPreferences
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import uniffi.gemstone.AlienProvider
+import uniffi.gemstone.GemGateway
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+object GatewayModule {
+ @Provides
+ @Singleton
+ fun provideGateway(
+ alienProvider: AlienProvider,
+ @ApplicationContext context: Context,
+ ): GemGateway {
+ return GemGateway(
+ alienProvider,
+ SharedGemPreferences(
+ context.getSharedPreferences("gateway_preferences", Context.MODE_PRIVATE)
+ ),
+ SecurityGemPreferences(context)
+ )
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestScene.kt b/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestScene.kt
index f6b9169d8..e86f09d04 100644
--- a/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestScene.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestScene.kt
@@ -126,7 +126,7 @@ private fun Render(
}
item { PropertyItem("Method", request.method) }
when (request.method) {
- WalletConnectionMethods.solana_sign_transaction.string -> {}
+ WalletConnectionMethods.SolanaSignTransaction.string -> {}
else -> item {
Spacer(modifier = Modifier.size(24.dp))
Surface(shadowElevation = 16.dp, color = MaterialTheme.colorScheme.background) {
diff --git a/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestViewModel.kt b/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestViewModel.kt
index c9dda162f..d0fed1c9f 100644
--- a/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestViewModel.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/features/bridge/request/RequestViewModel.kt
@@ -3,9 +3,9 @@ package com.gemwallet.android.features.bridge.request
import androidx.core.net.toUri
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.gemwallet.android.blockchain.clients.SignClientProxy
import com.gemwallet.android.blockchain.operators.LoadPrivateKeyOperator
import com.gemwallet.android.blockchain.operators.PasswordStore
+import com.gemwallet.android.blockchain.services.SignClientProxy
import com.gemwallet.android.data.repositoreis.bridge.BridgesRepository
import com.gemwallet.android.data.repositoreis.bridge.getNamespace
import com.gemwallet.android.data.repositoreis.wallets.WalletsRepository
@@ -70,8 +70,8 @@ class RequestViewModel @Inject constructor(
}
val params = when (request.request.method) {
- WalletConnectionMethods.solana_sign_message.string,
- WalletConnectionMethods.eth_sign.string -> {
+ WalletConnectionMethods.SolanaSignMessage.string,
+ WalletConnectionMethods.EthSign.string -> {
val data = JSONArray(request.request.params).getString(1)
String(data.decodeHex())
}
@@ -80,7 +80,7 @@ class RequestViewModel @Inject constructor(
val data = JSONArray(request.request.params).getString(1)
data
}
- WalletConnectionMethods.personal_sign.string -> {
+ WalletConnectionMethods.PersonalSign.string -> {
val data = JSONArray(request.request.params).getString(0)
try {
String(data.decodeHex())
@@ -88,9 +88,9 @@ class RequestViewModel @Inject constructor(
data
}
}
- WalletConnectionMethods.eth_send_transaction.string -> request.request.params
- WalletConnectionMethods.solana_sign_and_send_transaction.string,
- WalletConnectionMethods.solana_sign_transaction.string -> {
+ WalletConnectionMethods.EthSendTransaction.string -> request.request.params
+ WalletConnectionMethods.SolanaSignAndSendTransaction.string,
+ WalletConnectionMethods.SolanaSignTransaction.string -> {
val params = JSONObject(request.request.params).getString("transaction")
params
}
@@ -109,7 +109,7 @@ class RequestViewModel @Inject constructor(
fun onSent(hash: String) {
val sessionRequest = state.value.sessionRequest ?: return
val data = when (state.value.sessionRequest?.request?.method) {
- WalletConnectionMethods.solana_sign_transaction.string -> jsonEncoder.encodeToString(WCSolanaSignMessageResult(signature = hash))
+ WalletConnectionMethods.SolanaSignTransaction.string -> jsonEncoder.encodeToString(WCSolanaSignMessageResult(signature = hash))
else -> hash
}
@@ -153,8 +153,8 @@ class RequestViewModel @Inject constructor(
val sign = try {
when (method) {
- WalletConnectionMethods.eth_sign,
- WalletConnectionMethods.personal_sign -> {
+ WalletConnectionMethods.EthSign,
+ WalletConnectionMethods.PersonalSign -> {
val data = state.value.params.toByteArray()
val decoder = SignMessageDecoder(SignMessage(SignDigestType.EIP191, data))
@@ -164,11 +164,11 @@ class RequestViewModel @Inject constructor(
val param = decoder.hash()
signClient.signMessage(chain, param, privateKey).toHexString()
}
- WalletConnectionMethods.eth_sign_typed_data,
- WalletConnectionMethods.eth_sign_typed_data_v4 -> {
+ WalletConnectionMethods.EthSignTypedData,
+ WalletConnectionMethods.EthSignTypedDataV4 -> {
signClient.signTypedMessage(chain, state.value.params.toByteArray(), privateKey).toHexString()
}
- WalletConnectionMethods.solana_sign_message -> {
+ WalletConnectionMethods.SolanaSignMessage -> {
val param = state.value.params.toByteArray()
signClient.signMessage(chain, param, privateKey).toHexString()
}
@@ -255,7 +255,7 @@ private data class RequestViewModelState(
),
params = params,
)
- WalletConnectionMethods.eth_send_transaction.string -> {
+ WalletConnectionMethods.EthSendTransaction.string -> {
try {
val jObj = JSONArray(params).getJSONObject(0)
val to = jObj.getString("to")
@@ -271,19 +271,35 @@ private data class RequestViewModelState(
RequestSceneState.Error("Argument error: ${err.message}")
}
}
- WalletConnectionMethods.solana_sign_transaction.string -> RequestSceneState.SignGeneric(
+ WalletConnectionMethods.SolanaSignTransaction.string -> RequestSceneState.SignGeneric(
ConfirmParams.TransferParams.Generic(
asset = chain.asset(),
from = account,
memo = params,
+ name = sessionRequest.peerMetaData?.name ?: "",
+ description = sessionRequest.peerMetaData?.description ?: "",
+ url = sessionRequest.peerMetaData?.url ?: "",
+ icon = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
+ redirectNative = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
+ redirectUniversal = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
+ gasLimit = "",
+ gasPrice = "",
inputType = ConfirmParams.TransferParams.InputType.Signature
)
)
- WalletConnectionMethods.solana_sign_and_send_transaction.string -> RequestSceneState.SignGeneric(
+ WalletConnectionMethods.SolanaSignAndSendTransaction.string -> RequestSceneState.SignGeneric(
ConfirmParams.TransferParams.Generic(
asset = chain.asset(),
from = account,
memo = params,
+ name = sessionRequest.peerMetaData?.name ?: "",
+ description = sessionRequest.peerMetaData?.description ?: "",
+ url = sessionRequest.peerMetaData?.url ?: "",
+ icon = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
+ redirectNative = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
+ redirectUniversal = sessionRequest.peerMetaData?.icons?.firstOrNull() ?: "",
+ gasLimit = "",
+ gasPrice = "",
inputType = ConfirmParams.TransferParams.InputType.EncodeTransaction
)
)
diff --git a/app/src/main/kotlin/com/gemwallet/android/features/confirm/viewmodels/ConfirmViewModel.kt b/app/src/main/kotlin/com/gemwallet/android/features/confirm/viewmodels/ConfirmViewModel.kt
index 827996f86..ee0f58d17 100644
--- a/app/src/main/kotlin/com/gemwallet/android/features/confirm/viewmodels/ConfirmViewModel.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/features/confirm/viewmodels/ConfirmViewModel.kt
@@ -3,10 +3,11 @@ package com.gemwallet.android.features.confirm.viewmodels
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.gemwallet.android.blockchain.clients.BroadcastClientProxy
-import com.gemwallet.android.blockchain.clients.SignClientProxy
import com.gemwallet.android.blockchain.operators.LoadPrivateKeyOperator
import com.gemwallet.android.blockchain.operators.PasswordStore
+import com.gemwallet.android.blockchain.services.BroadcastService
+import com.gemwallet.android.blockchain.services.SignClientProxy
+import com.gemwallet.android.blockchain.services.SignerPreloaderProxy
import com.gemwallet.android.cases.transactions.CreateTransaction
import com.gemwallet.android.data.repositoreis.assets.AssetsRepository
import com.gemwallet.android.data.repositoreis.session.SessionRepository
@@ -26,7 +27,6 @@ import com.gemwallet.android.model.Session
import com.gemwallet.android.model.SignerParams
import com.gemwallet.android.model.format
import com.gemwallet.android.serializer.jsonEncoder
-import com.gemwallet.android.services.SignerPreloaderProxy
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.CellEntity
import com.gemwallet.android.ui.components.InfoSheetEntity
@@ -74,7 +74,7 @@ class ConfirmViewModel @Inject constructor(
private val passwordStore: PasswordStore,
private val loadPrivateKeyOperator: LoadPrivateKeyOperator,
private val signClient: SignClientProxy,
- private val broadcastClientProxy: BroadcastClientProxy,
+ private val broadcastService: BroadcastService,
private val createTransactionsCase: CreateTransaction,
private val stakeRepository: StakeRepository,
private val savedStateHandle: SavedStateHandle,
@@ -95,7 +95,7 @@ class ConfirmViewModel @Inject constructor(
private val assetsInfo = request.filterNotNull().mapNotNull {
if (it is ConfirmParams.SwapParams) {
- listOf(it.fromAsset.id, it.toAssetId)
+ listOf(it.fromAsset.id, it.toAsset.id)
} else {
listOf(it.assetId)
}
@@ -111,14 +111,7 @@ class ConfirmViewModel @Inject constructor(
}
val preload = try {
- val result = signerPreload.preload(params = request)
- when (request) {
- is ConfirmParams.SwapParams -> if (result.scanTransaction?.isMalicious != false) {
- throw Exception("Transaction payload error")
- }
- else -> {}
- }
- result
+ signerPreload.preload(params = request)
} catch (err: Throwable) {
state.update { ConfirmState.Error(ConfirmError.PreloadError(err.message ?: "Preload error")) }
return@map null
@@ -129,8 +122,8 @@ class ConfirmViewModel @Inject constructor(
params.input is ConfirmParams.Stake.RewardsParams -> stakeRepository.getRewards(params.input.assetId, params.input.from.address)
.map { BigInteger(it.base.rewards) }
.fold(BigInteger.ZERO) { acc, value -> acc + value }
- params.input.isMax() && params.input.assetId == params.chainData.fee(feePriority).feeAssetId ->
- params.input.amount - params.chainData.fee(feePriority).amount
+ params.input.isMax() && params.input.assetId == params.fee(feePriority).feeAssetId ->
+ params.input.amount - params.fee(feePriority).amount
else -> params.input.amount
}
state.update { ConfirmState.Ready }
@@ -145,7 +138,7 @@ class ConfirmViewModel @Inject constructor(
.stateIn(viewModelScope, SharingStarted.Eagerly, null)
private val feeAssetInfo = preloadData.filterNotNull().flatMapLatest { signerParams ->
- assetsRepository.getAssetInfo(signerParams.chainData.fee().feeAssetId)
+ assetsRepository.getAssetInfo(signerParams.fee().feeAssetId)
}
.stateIn(viewModelScope, SharingStarted.Eagerly, null)
@@ -153,7 +146,7 @@ class ConfirmViewModel @Inject constructor(
val fromAssetId = request?.assetId ?: return@combine null
val assetInfo = assetsInfo?.getByAssetId(fromAssetId) ?: return@combine null
val toAssetInfo = if (request is ConfirmParams.SwapParams) {
- assetsInfo.getByAssetId(request.toAssetId) ?: return@combine null
+ assetsInfo.getByAssetId(request.toAsset.id) ?: return@combine null
} else {
null
}
@@ -192,8 +185,8 @@ class ConfirmViewModel @Inject constructor(
.flowOn(Dispatchers.Default)
.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
- val feeValue = combine(preloadData, feeAssetInfo, state, feePriority) { signerParams, feeAssetInfo, state, speed ->
- val amount = signerParams?.chainData?.fee(speed)?.amount
+ val feeValue = combine(preloadData, feeAssetInfo, state, feePriority) { signerParams, feeAssetInfo, state, feePriority ->
+ val amount = signerParams?.fee(feePriority)?.amount
if (amount == null || feeAssetInfo == null) {
return@combine ""
}
@@ -203,8 +196,8 @@ class ConfirmViewModel @Inject constructor(
.flowOn(Dispatchers.Default)
.stateIn(viewModelScope, SharingStarted.Eagerly, "")
- val feeUIModel = combine(preloadData, feeAssetInfo, state, feePriority) { signerParams, feeAssetInfo, state, speed ->
- val amount = signerParams?.chainData?.fee(speed)?.amount
+ val feeUIModel = combine(preloadData, feeAssetInfo, state, feePriority) { signerParams, feeAssetInfo, state, priority ->
+ val amount = signerParams?.fee(priority)?.amount
val result = if (amount == null || feeAssetInfo == null) {
CellEntity(
label = R.string.transfer_network_fee,
@@ -255,7 +248,7 @@ class ConfirmViewModel @Inject constructor(
.flowOn(Dispatchers.Default)
.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
- val allFee = preloadData.filterNotNull().map { it.chainData.allFee() }
+ val allFee = preloadData.filterNotNull().map { it.allFee() }
.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
fun init(params: ConfirmParams) {
@@ -285,7 +278,7 @@ class ConfirmViewModel @Inject constructor(
val account = assetInfo?.owner
val feeAssetInfo = feeAssetInfo.value
val session = sessionRepository.getSession()
- val txSpeed = feePriority.value
+ val feePriority = this@ConfirmViewModel.feePriority.value
try {
if (assetInfo == null || account == null || session == null || feeAssetInfo == null) {
@@ -293,12 +286,12 @@ class ConfirmViewModel @Inject constructor(
}
validateBalance(
signerParams,
- txSpeed,
+ feePriority,
assetInfo,
feeAssetInfo,
getBalance(assetInfo, signerParams.input),
)
- val signs = sign(signerParams, session, assetInfo, txSpeed)
+ val signs = sign(signerParams, session, assetInfo, feePriority)
when (signerParams.input) {
is ConfirmParams.TransferParams.Generic -> {
when ((signerParams.input as ConfirmParams.TransferParams.Generic).inputType) {
@@ -316,8 +309,8 @@ class ConfirmViewModel @Inject constructor(
else -> {}
}
for (sign in signs) {
- val txHash = broadcastClientProxy.send(account, sign, signerParams.input.getTxType())
- if (sign != signs.last()) {
+ val txHash = broadcastService.send(account, sign, signerParams.input.getTxType())
+ if (!sign.contentEquals(signs.last())) {
delay(500)
} else {
addTransaction(txHash)
@@ -367,9 +360,9 @@ class ConfirmViewModel @Inject constructor(
is ConfirmParams.Activate,
is ConfirmParams.NftParams,
is ConfirmParams.Stake.DelegateParams -> assetInfo.balance.balance.available.toBigInteger()
- is ConfirmParams.Stake.RedelegateParams -> BigInteger(stakeRepository.getDelegation(params.srcValidatorId).firstOrNull()?.base?.balance ?: "0")
- is ConfirmParams.Stake.UndelegateParams -> BigInteger(stakeRepository.getDelegation(params.validatorId, params.delegationId).firstOrNull()?.base?.balance ?: "0")
- is ConfirmParams.Stake.WithdrawParams -> BigInteger(stakeRepository.getDelegation(params.validatorId, params.delegationId).firstOrNull()?.base?.balance ?: "0")
+ is ConfirmParams.Stake.RedelegateParams -> BigInteger(stakeRepository.getDelegation(params.delegation.validator.id).firstOrNull()?.base?.balance ?: "0")
+ is ConfirmParams.Stake.UndelegateParams -> BigInteger(stakeRepository.getDelegation(params.delegation.validator.id, params.delegation.base.delegationId).firstOrNull()?.base?.balance ?: "0")
+ is ConfirmParams.Stake.WithdrawParams -> BigInteger(stakeRepository.getDelegation(params.delegation.validator.id, params.delegation.base.delegationId).firstOrNull()?.base?.balance ?: "0")
is ConfirmParams.Stake.RewardsParams -> stakeRepository.getRewards(assetInfo.asset.id, assetInfo.owner?.address ?: "")
.fold(BigInteger.ZERO) { acc, delegation -> acc + BigInteger(delegation.base.balance) }
}
@@ -377,10 +370,10 @@ class ConfirmViewModel @Inject constructor(
private suspend fun getValidator(params: ConfirmParams): DelegationValidator? {
val validatorId = when (params) {
- is ConfirmParams.Stake.DelegateParams -> params.validatorId
- is ConfirmParams.Stake.RedelegateParams -> params.dstValidatorId
- is ConfirmParams.Stake.UndelegateParams -> params.validatorId
- is ConfirmParams.Stake.WithdrawParams -> params.validatorId
+ is ConfirmParams.Stake.DelegateParams -> params.validator.id
+ is ConfirmParams.Stake.RedelegateParams -> params.dstValidator.id
+ is ConfirmParams.Stake.UndelegateParams -> params.delegation.base.validatorId
+ is ConfirmParams.Stake.WithdrawParams -> params.delegation.base.validatorId
is ConfirmParams.Activate,
is ConfirmParams.Stake.RewardsParams,
is ConfirmParams.SwapParams,
@@ -456,7 +449,7 @@ class ConfirmViewModel @Inject constructor(
jsonEncoder.encodeToString(
TransactionSwapMetadata(
fromAsset = input.fromAsset.id,
- toAsset = input.toAssetId,
+ toAsset = input.toAsset.id,
fromValue = input.fromAmount.toString(),
toValue = input.toAmount.toString(),
provider = input.protocolId,
@@ -472,7 +465,7 @@ class ConfirmViewModel @Inject constructor(
val assetInfo = assetsInfo.value?.getByAssetId(signerParams?.input?.assetId ?: return) ?: return
val session = sessionRepository.getSession()
val destinationAddress = signerParams.input.destination()?.address ?: ""
- val txSpeed = feePriority.value
+ val priority = feePriority.value
createTransactionsCase.createTransaction(
hash = txHash,
@@ -481,7 +474,7 @@ class ConfirmViewModel @Inject constructor(
owner = assetInfo.owner!!,
to = destinationAddress,
state = TransactionState.Pending,
- fee = signerParams.chainData.fee(txSpeed),
+ fee = signerParams.fee(priority),
amount = signerParams.finalAmount,
memo = signerParams.input.memo() ?: "",
type = signerParams.input.getTxType(),
@@ -491,7 +484,7 @@ class ConfirmViewModel @Inject constructor(
} else {
TransactionDirection.Outgoing
},
- blockNumber = signerParams.chainData.blockNumber()
+ blockNumber = signerParams.data(feePriority.value).chainData.blockNumber()
)
}
@@ -504,7 +497,7 @@ class ConfirmViewModel @Inject constructor(
assetBalance: BigInteger,
) {
val amount = signerParams.finalAmount
- val feeAmount = signerParams.chainData.fee(feePriority).amount
+ val feeAmount = signerParams.fee(feePriority).amount
val totalAmount = when (signerParams.input.getTxType()) {
TransactionType.Transfer,
@@ -518,6 +511,10 @@ class ConfirmViewModel @Inject constructor(
TransactionType.StakeWithdraw,
TransactionType.TransferNFT -> amount
TransactionType.SmartContractCall -> TODO()
+ TransactionType.PerpetualOpenPosition -> TODO()
+ TransactionType.PerpetualClosePosition -> TODO()
+ TransactionType.StakeFreeze -> TODO()
+ TransactionType.StakeUnfreeze -> TODO()
}
if (assetBalance < totalAmount) {
@@ -525,7 +522,6 @@ class ConfirmViewModel @Inject constructor(
throw ConfirmError.InsufficientBalance(label)
}
if (feeAssetInfo.balance.balance.available.toBigInteger() < feeAmount) {
- val label = "${feeAssetInfo.id().chain.asset().name} (${feeAssetInfo.asset.symbol})"
throw ConfirmError.InsufficientFee(chain = feeAssetInfo.asset.chain)
}
}
diff --git a/app/src/main/kotlin/com/gemwallet/android/features/import_wallet/navigation/ImportWalletNavigation.kt b/app/src/main/kotlin/com/gemwallet/android/features/import_wallet/navigation/ImportWalletNavigation.kt
index 9717b6b81..8f37f12ee 100644
--- a/app/src/main/kotlin/com/gemwallet/android/features/import_wallet/navigation/ImportWalletNavigation.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/features/import_wallet/navigation/ImportWalletNavigation.kt
@@ -8,10 +8,10 @@ import androidx.navigation.compose.composable
import androidx.navigation.navArgument
import androidx.navigation.navOptions
import androidx.navigation.navigation
+import com.gemwallet.android.ext.toChain
import com.gemwallet.android.features.import_wallet.views.ImportScreen
import com.gemwallet.android.features.import_wallet.views.SelectImportTypeScreen
import com.gemwallet.android.model.ImportType
-import com.wallet.core.primitives.Chain
import com.wallet.core.primitives.WalletType
internal const val walletTypeArg = "wallet_type"
@@ -56,7 +56,7 @@ fun NavGraphBuilder.importWalletScreen(
val walletTypeString = entry.arguments?.getString(walletTypeArg)
val chainString = entry.arguments?.getString(chainArg)
val walletType = WalletType.entries.firstOrNull { it.string == walletTypeString }
- val chain = Chain.entries.firstOrNull { it.string == chainString }
+ val chain = chainString?.toChain()
if (walletType == null || (walletType != WalletType.multicoin && chain == null)) {
onSelectType(null)
} else {
diff --git a/app/src/main/kotlin/com/gemwallet/android/services/SignerPreloaderProxy.kt b/app/src/main/kotlin/com/gemwallet/android/services/SignerPreloaderProxy.kt
deleted file mode 100644
index cc0ec6d92..000000000
--- a/app/src/main/kotlin/com/gemwallet/android/services/SignerPreloaderProxy.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.gemwallet.android.services
-
-import com.gemwallet.android.blockchain.clients.ActivationTransactionPreloader
-import com.gemwallet.android.blockchain.clients.ApprovalTransactionPreloader
-import com.gemwallet.android.blockchain.clients.GenericTransferPreloader
-import com.gemwallet.android.blockchain.clients.NativeTransferPreloader
-import com.gemwallet.android.blockchain.clients.NftTransactionPreloader
-import com.gemwallet.android.blockchain.clients.StakeTransactionPreloader
-import com.gemwallet.android.blockchain.clients.SwapTransactionPreloader
-import com.gemwallet.android.blockchain.clients.TokenTransferPreloader
-import com.gemwallet.android.blockchain.clients.getClient
-import com.gemwallet.android.cases.device.GetDeviceIdCase
-import com.gemwallet.android.data.repositoreis.session.SessionRepository
-import com.gemwallet.android.data.services.gemapi.GemApiClient
-import com.gemwallet.android.ext.getAccount
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.SignerParams
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.ScanAddressTarget
-import com.wallet.core.primitives.ScanTransaction
-import com.wallet.core.primitives.ScanTransactionPayload
-import com.wallet.core.primitives.Wallet
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-
-class SignerPreloaderProxy(
- private val gemApiClient: GemApiClient,
- private val sessionRepository: SessionRepository,
- private val getDeviceIdCase: GetDeviceIdCase,
- private val nativeTransferClients: List,
- private val tokenTransferClients: List,
- private val stakeTransactionClients: List,
- private val swapTransactionClients: List,
- private val approvalTransactionClients: List,
- private val activatePreloaderClients: List,
- private val genericPreloaderClients: List,
- private val nftPreloadClients: List,
-) : GenericTransferPreloader, NativeTransferPreloader, TokenTransferPreloader, StakeTransactionPreloader,
- SwapTransactionPreloader, ApprovalTransactionPreloader, ActivationTransactionPreloader, NftTransactionPreloader {
-
- suspend fun preload(params: ConfirmParams): SignerParams = withContext(Dispatchers.IO) {
-
- val isValidTransactionJob = async {
- isValidTransaction(
- getScanTransactionPayload(
- params,
- sessionRepository.getSession()?.wallet ?: throw IllegalStateException("Session isn't available"),
- getDeviceIdCase.getDeviceId()
- )
- )
- }
-
- val preloadJob = async {
- when (params) {
- is ConfirmParams.Stake -> preloadStake(params)
- is ConfirmParams.SwapParams -> preloadSwap(params)
- is ConfirmParams.TokenApprovalParams -> preloadApproval(params)
- is ConfirmParams.TransferParams.Native -> preloadNativeTransfer(params)
- is ConfirmParams.TransferParams.Token -> preloadTokenTransfer(params)
- is ConfirmParams.Activate -> preloadActivate(params)
- is ConfirmParams.TransferParams.Generic -> preloadGeneric(params)
- is ConfirmParams.NftParams -> preloadNft(params)
- }
- }
-
- val isValidTransaction = isValidTransactionJob.await()
- val preload = preloadJob.await()
- preload.copy(scanTransaction = isValidTransaction)
- }
-
- override fun supported(chain: Chain): Boolean {
- return (nativeTransferClients
- + tokenTransferClients
- + stakeTransactionClients
- + swapTransactionClients
- + approvalTransactionClients).getClient(chain) != null
- }
-
- override suspend fun preloadNativeTransfer(params: ConfirmParams.TransferParams.Native): SignerParams {
- return nativeTransferClients.getClient(params.from.chain)?.preloadNativeTransfer(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadTokenTransfer(params: ConfirmParams.TransferParams.Token): SignerParams {
- return tokenTransferClients.getClient(params.from.chain)?.preloadTokenTransfer(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadStake(params: ConfirmParams.Stake): SignerParams {
- return stakeTransactionClients.getClient(params.from.chain)?.preloadStake(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadSwap(params: ConfirmParams.SwapParams): SignerParams {
- return swapTransactionClients.getClient(params.from.chain)?.preloadSwap(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadApproval(params: ConfirmParams.TokenApprovalParams): SignerParams {
- return approvalTransactionClients.getClient(params.from.chain)?.preloadApproval(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadActivate(params: ConfirmParams.Activate): SignerParams {
- return activatePreloaderClients.getClient(params.from.chain)?.preloadActivate(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadGeneric(params: ConfirmParams.TransferParams.Generic): SignerParams {
- return genericPreloaderClients.getClient(params.from.chain)?.preloadGeneric(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- override suspend fun preloadNft(params: ConfirmParams.NftParams): SignerParams {
- return nftPreloadClients.getClient(params.from.chain)?.preloadNft(params = params)
- ?: throw IllegalArgumentException("Chain isn't support")
- }
-
- private suspend fun isValidTransaction(payload: ScanTransactionPayload): ScanTransaction? {
- return try {
- gemApiClient.getScanTransaction(payload).data
- } catch (_: Throwable) {
- null
- }
- }
-
- private fun getScanTransactionPayload(params: ConfirmParams, wallet: Wallet, deviceId: String): ScanTransactionPayload {
- val chain = params.assetId.chain
- val origin = ScanAddressTarget(
- chain = chain,
- address = params.from.address,
- )
- val target = when (params) {
- is ConfirmParams.SwapParams -> ScanAddressTarget(
- params.toAssetId.chain,
- address = wallet.getAccount(params.toAssetId.chain)?.address ?: throw IllegalArgumentException("Account isn't available")
- )
- is ConfirmParams.Stake -> ScanAddressTarget(chain, params.validatorId)
- is ConfirmParams.TokenApprovalParams -> ScanAddressTarget(chain, params.contract)
- is ConfirmParams.TransferParams.Native,
- is ConfirmParams.TransferParams.Generic,
- is ConfirmParams.TransferParams.Token -> ScanAddressTarget(chain, params.destination().address)
- is ConfirmParams.Activate -> ScanAddressTarget(chain, params.from.address)
- is ConfirmParams.NftParams -> ScanAddressTarget(chain, params.from.address)
- }
-
- return ScanTransactionPayload(
- deviceId = deviceId,
- walletIndex = wallet.index.toUInt(),
- origin = origin,
- target = target,
- type = params.getTxType(),
- )
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/TestFormatter.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/TestFormatter.kt
index 4facd9ddf..e735af02c 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/TestFormatter.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/TestFormatter.kt
@@ -9,8 +9,8 @@ import java.util.Locale
class TestFormatter {
@Test
fun testCompactFormat_Italy() {
- assertEquals("5,00 Mio €", Currency.EUR.compactFormatter(5_000_000.0, Locale.ITALY))
- assertEquals("7,89 Mrd €", Currency.EUR.compactFormatter(7_890_000_000.0, Locale.ITALY))
+ assertEquals("5,00 Mln €", Currency.EUR.compactFormatter(5_000_000.0, Locale.ITALY))
+ assertEquals("7,89 Mld €", Currency.EUR.compactFormatter(7_890_000_000.0, Locale.ITALY))
assertEquals("1,20 Bln €", Currency.EUR.compactFormatter(1_200_000_000_000.0, Locale.ITALY))
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/algorand/TestAlgorandSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/algorand/TestAlgorandSigner.kt
index 9dbb4ccf3..7e6c8cff4 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/algorand/TestAlgorandSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/algorand/TestAlgorandSigner.kt
@@ -3,7 +3,6 @@ package com.gemwallet.android.blockchain.clients.algorand
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
-import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ConfirmParams
import com.gemwallet.android.model.DestinationAddress
import com.gemwallet.android.model.Fee
@@ -39,28 +38,27 @@ class TestAlgorandSigner {
BigInteger.valueOf(10_000_000),
DestinationAddress("GOZOAE6SH6XGGDRBQLZEDRITKMF5OLVJNACVRQBUEGFLBBR5I64A7QN63E"),
),
- chainData = AlgorandSignPreloadClient.AlgorandChainData(
- sequence = 46932581,
+ chainData = AlgorandChainData(
+ sequence = 46932581UL,
block = "wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=",
chainId = "mainnet-v1.0",
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Algorand),
- amount = BigInteger.TEN
- )
),
finalAmount = BigInteger.valueOf(10_000_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Algorand),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
- assertEquals("0x82a3736967c44049c1faef9ca28e835bb980e84e2d6f6eaf866828abf8ce51f1820d04ea" +
+ assertEquals("82a3736967c44049c1faef9ca28e835bb980e84e2d6f6eaf866828abf8ce51f1820d04ea" +
"87623069603104aaadcdea598dd6e77f8dbe40c7f9638485cfeda1609b810e23ce1604a374786e8" +
"9a3616d74ce00989680a36665650aa26676ce02cc2265a367656eac6d61696e6e65742d76312e30" +
"a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c7" +
"6ce02cc264da3726376c42033b2e013d23fae630e2182f241c513530bd72ea9680558c034218ab0" +
"863d47b8a3736e64c42033b2e013d23fae630e2182f241c513530bd72ea9680558c034218ab0863" +
- "d47b8a474797065a3706179", sign.first().toHexString())
+ "d47b8a474797065a3706179", String(sign.first()))
}
}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosBalance.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosBalance.kt
deleted file mode 100644
index 13c47e1b4..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosBalance.kt
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.ext.toIdentifier
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TestAptosBalance {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testAptosBalance() {
- val balancesService = TestAptosBalancesService(nativeBalance = "100000000")
- val client = AptosBalanceClient(
- chain = Chain.Aptos,
- balanceService = balancesService
- )
-
- val result = runBlocking {
- client.getNativeBalance(Chain.Aptos, "0x80c3cca35602e4568a7ac88d4d91110f8efa6c45c659439c2b4ed04033059c6f")
- }
- assertNotNull(result)
- assertEquals("0x80c3cca35602e4568a7ac88d4d91110f8efa6c45c659439c2b4ed04033059c6f", balancesService.nativeRequest)
- assertEquals("100000000", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(1.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(1.0, result.totalAmount)
- assertEquals(AssetId(Chain.Aptos).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testAptosBalanceFail() {
- val balanceService = TestAptosBalancesService()
- val client = AptosBalanceClient(
- chain = Chain.Aptos,
- balanceService = balanceService
- )
-
- runBlocking {
- val result = client.getNativeBalance(Chain.Aptos, "0x80c3cca35602e4568a7ac88d4d91110f8efa6c45c659439c2b4ed04033059c6f")
- assertNull(result)
- }
- }
-
- @Test
- fun testAptosBalanceBadValue() {
- val balanceService = TestAptosBalancesService(nativeBalance = "0abcde")
- val client = AptosBalanceClient(
- chain = Chain.Aptos,
- balanceService = balanceService
- )
-
- runBlocking {
- val result = client.getNativeBalance(Chain.Aptos, "0x80c3cca35602e4568a7ac88d4d91110f8efa6c45c659439c2b4ed04033059c6f")
- assertNull(result)
- }
- }
-
- @Test
- fun testAptosBalanceEmpty() {
- val balanceService = TestAptosBalancesService(nativeBalance = "0")
- val client = AptosBalanceClient(
- chain = Chain.Aptos,
- balanceService = balanceService
- )
-
- val result = runBlocking {
- client.getNativeBalance(
- Chain.Aptos,
- "0x80c3cca35602e4568a7ac88d4d91110f8efa6c45c659439c2b4ed04033059c6f"
- )
- }
- assertNotNull(result)
- assertEquals("0", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(0.0, result.totalAmount)
- assertEquals(AssetId(Chain.Aptos).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testAptos_tokens_balance() {
- val balanceService = TestAptosBalancesService(
- nativeBalance = "0",
- )
- val assets = listOf(
- Asset(
- AssetId(Chain.Aptos, "0xe4ccb6d39136469f376242c31b34d10515c8eaaa38092f804db8e08a8f53c5b2::assets_v1::EchoCoin002"),
- decimals = 6,
- name = "Gui Inu",
- symbol = "GUI",
- type = AssetType.TOKEN
- ),
- Asset(
- AssetId(Chain.Aptos, "0x159df6b7689437016108a019fd5bef736bac692b6d4a1f10c941f6fbb9a74ca6::oft::CakeOFT"),
- decimals = 8,
- name = "PancakeSwap Token",
- symbol = "CAKE",
- type = AssetType.TOKEN
- ),
- )
- val client = AptosBalanceClient(
- chain = Chain.Aptos,
- balanceService = balanceService
- )
-
- val result = runBlocking {
- client.getTokenBalances(
- Chain.Aptos,
- "0x80c3cca35602e4568a7ac88d4d91110f8efa6c45c659439c2b4ed04033059c6f",
- assets,
- )
- }
- assertNotNull(result)
- assertTrue(result.isNotEmpty())
- assertEquals(assets[0].id.toIdentifier(), result[0].asset.id.toIdentifier())
- assertEquals("30000000", result[0].balance.available)
- assertEquals(30.0, result[0].balanceAmount.available)
- assertEquals(assets[1].id.toIdentifier(), result[1].asset.id.toIdentifier())
- assertEquals("50000000", result[1].balance.available)
- assertEquals(0.5, result[1].balanceAmount.available)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosBalancesService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosBalancesService.kt
deleted file mode 100644
index cf5c78cb2..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosBalancesService.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosBalancesService
-import com.wallet.core.blockchain.aptos.AptosResource
-import com.wallet.core.blockchain.aptos.AptosResourceBalanceOptional
-import com.wallet.core.blockchain.aptos.AptosResourceCoin
-import okhttp3.ResponseBody
-import okhttp3.ResponseBody.Companion.toResponseBody
-
-class TestAptosBalancesService(
- val nativeBalance: String? = null,
-) : AptosBalancesService {
-
- var nativeRequest: String? = null
- var tokenRequest: String? = null
-
- override suspend fun balance(address: String, assetType: String): ResponseBody {
- nativeRequest = address
- nativeBalance ?: throw Exception()
- return nativeBalance.toResponseBody()
- }
- override suspend fun resources(address: String): List> {
- tokenRequest = address
- return listOf(
- AptosResource(
- type = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>",
- AptosResourceBalanceOptional(
- AptosResourceCoin(
- "10000000"
- )
- )
- ),
- AptosResource(
- type = "0x1::coin::CoinStore<0xe4ccb6d39136469f376242c31b34d10515c8eaaa38092f804db8e08a8f53c5b2::assets_v1::EchoCoin002>",
- AptosResourceBalanceOptional(
- AptosResourceCoin(
- "30000000"
- )
- )
- ),
- AptosResource(
- type = "0x1::coin::CoinStore<0x159df6b7689437016108a019fd5bef736bac692b6d4a1f10c941f6fbb9a74ca6::oft::CakeOFT>",
- AptosResourceBalanceOptional(
- AptosResourceCoin(
- "50000000"
- )
- )
- ),
- )
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosSigner.kt
index 14e9dce40..9ebc45f8a 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/aptos/TestAptosSigner.kt
@@ -44,17 +44,16 @@ class TestAptosSigner {
BigInteger.valueOf(10_000_000_000),
DestinationAddress("0x82111f2975a0f6080d178236369b7479f6aed1203ef4a23f8205e4b91716b783"),
),
- chainData = AptosSignerPreloader.AptosChainData(
- 8L,
- listOf(GasFee(
- AssetId(Chain.Aptos),
- priority = FeePriority.Normal,
- maxGasPrice = BigInteger.valueOf(150L),
- limit = BigInteger.valueOf(18L)
- ))
+ chainData = AptosChainData(
+ 8UL,
),
finalAmount = BigInteger.valueOf(10_000_000_000),
- FeePriority.Normal,
+ GasFee(
+ AssetId(Chain.Aptos),
+ priority = FeePriority.Normal,
+ maxGasPrice = BigInteger.valueOf(150L),
+ limit = BigInteger.valueOf(18L)
+ ),
privateKey.data(),
)
}
@@ -91,18 +90,17 @@ class TestAptosSigner {
BigInteger.valueOf(10_000_000_000),
DestinationAddress("0x82111f2975a0f6080d178236369b7479f6aed1203ef4a23f8205e4b91716b783"),
),
- chainData = AptosSignerPreloader.AptosChainData(
- 8L,
- listOf(GasFee(
- AssetId(Chain.Aptos),
- priority = FeePriority.Normal,
- maxGasPrice = BigInteger.valueOf(150L),
- limit = BigInteger.valueOf(18L)
- ))
+ chainData = AptosChainData(
+ 8UL,
+ ),
+ fee = GasFee(
+ AssetId(Chain.Aptos),
+ priority = FeePriority.Normal,
+ maxGasPrice = BigInteger.valueOf(150L),
+ limit = BigInteger.valueOf(18L)
),
finalAmount = BigInteger.valueOf(10_000_000_000),
- FeePriority.Normal,
- privateKey.data(),
+ privateKey = privateKey.data(),
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinBalance.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinBalance.kt
deleted file mode 100644
index f6437ae33..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinBalance.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinBalancesService
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.ext.toIdentifier
-import com.wallet.core.blockchain.bitcoin.BitcoinAccount
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TestBitcoinBalance {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testBitcoinBalance() {
- val client = BitcoinBalanceClient(
- chain = Chain.Bitcoin,
- balanceService = object : BitcoinBalancesService {
- override suspend fun balance(address: String): Result {
- assertEquals("bc1qqypy0q4uwk8h845j8qc5r76zyk2fwdtvqy4s4x", address)
- return Result.success(BitcoinAccount(balance = "100000000"))
- }
- }
- )
-
- val result = runBlocking {
- client.getNativeBalance(Chain.Bitcoin, "bc1qqypy0q4uwk8h845j8qc5r76zyk2fwdtvqy4s4x")
- }
- assertNotNull(result)
- assertEquals("100000000", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(1.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(1.0, result.totalAmount)
- assertEquals(AssetId(Chain.Bitcoin).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testBitcoincacheBalance() {
- var requestAddress: String? = null
- val client = BitcoinBalanceClient(
- chain = Chain.Bitcoin,
- balanceService = object : BitcoinBalancesService {
- override suspend fun balance(address: String): Result {
- requestAddress = address
- return Result.success(BitcoinAccount(balance = "100000000"))
- }
- }
- )
-
- runBlocking {
- client.getNativeBalance(Chain.BitcoinCash, "qq29xrkkd68alnrca375qlfyhwdqdkevsvmgkq9cmw")
- }
- assertEquals("bitcoincash:qq29xrkkd68alnrca375qlfyhwdqdkevsvmgkq9cmw", requestAddress)
- }
-
- @Test
- fun testBitcoinBalanceFail() {
- val client = BitcoinBalanceClient(
- chain = Chain.Bitcoin,
- balanceService = object : BitcoinBalancesService {
- override suspend fun balance(address: String): Result {
- return Result.failure(Exception())
- }
- }
- )
-
- runBlocking {
- val result = client.getNativeBalance(Chain.Bitcoin, "bc1qqypy0q4uwk8h845j8qc5r76zyk2fwdtvqy4s4x")
- assertNull(result)
- }
- }
-
- @Test
- fun testBitcoinBalanceBadValue() {
- val client = BitcoinBalanceClient(
- chain = Chain.Bitcoin,
- balanceService = object : BitcoinBalancesService {
- override suspend fun balance(address: String): Result {
- return Result.success(BitcoinAccount("0abcdesdf"))
- }
- }
- )
-
- runBlocking {
- val result = client.getNativeBalance(Chain.Bitcoin, "bc1qqypy0q4uwk8h845j8qc5r76zyk2fwdtvqy4s4x")
- assertNull(result)
- }
- }
-
- @Test
- fun testBitcoinBalanceEmpty() {
- val client = BitcoinBalanceClient(
- chain = Chain.Bitcoin,
- balanceService = object : BitcoinBalancesService {
- override suspend fun balance(address: String): Result {
- return Result.success(BitcoinAccount("0"))
- }
-
- }
- )
-
- runBlocking {
- val result = client.getNativeBalance(Chain.Bitcoin, "bc1qqypy0q4uwk8h845j8qc5r76zyk2fwdtvqy4s4x")
- assertNotNull(result)
- assertEquals("0", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(0.0, result.totalAmount)
- assertEquals(AssetId(Chain.Bitcoin).toIdentifier(), result.asset.id.toIdentifier())
- }
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSIgnerPreloader.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSIgnerPreloader.kt
deleted file mode 100644
index 27f7ed693..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSIgnerPreloader.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinFeeService
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinUTXOService
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.ext.toIdentifier
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.DestinationAddress
-import com.wallet.core.blockchain.bitcoin.BitcoinFeeResult
-import com.wallet.core.blockchain.bitcoin.BitcoinUTXO
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import java.math.BigInteger
-
-class TestBitcoinSignerPreloader {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testBitcoinMinimumByteFee() {
- assertEquals(BitcoinFeeCalculator.getMinimumByteFee(Chain.Bitcoin), BigInteger.ONE)
- assertEquals(BitcoinFeeCalculator.getMinimumByteFee(Chain.Litecoin), BigInteger.valueOf(5))
- assertEquals(BitcoinFeeCalculator.getMinimumByteFee(Chain.Doge), BigInteger.valueOf(1000))
- }
-
- @Test
- fun testBitcoinPreloader() {
- var requestAddress = ""
- val preloader = BitcoinSignerPreloader(
- Chain.Bitcoin,
- object : BitcoinUTXOService {
- override suspend fun getUTXO(address: String): Result> {
- requestAddress = address
-
- return Result.success(
- listOf(
- BitcoinUTXO(
- txid = "9f47e5d5ae3dac0662766f95d0cdda9c242c08d6baac4ce5d82464cf948abd53",
- vout = 1,
- value = "86055170",
- )
- )
- )
- }
-
- },
- object : BitcoinFeeService {
- override suspend fun estimateFee(priority: String): Result {
- val value = when (priority) {
- "8" -> "0.17457567"
- "4" -> "0.17457567"
- "2" -> "0.60356369"
- else -> return Result.failure(Exception("Incorrect priority"))
- }
- return Result.success(BitcoinFeeResult(value))
- }
- }
- )
- val result = runBlocking {
- preloader.preloadNativeTransfer(
- params = ConfirmParams.TransferParams.Native(
- asset = Chain.Bitcoin.asset(),
- from = Account(
- Chain.Doge,
- "DDyZeg24eU3csLa7LMWrZEoqnHXccz6c94",
- "",
- "dgub8rNuTi8ofZu1jVDKpBxW9VFo62kjjx3b6CcameEZnrNNHJ3sKCnWBxQSv6qAP6jrwZEpfT1ZdKsrcBFKGTMV8zgBtjZmvQt29VPnLzbHjjD"
- ),
- amount = BigInteger.valueOf(10_000_000_000),
- destination = DestinationAddress("D8UBj4EfNfNWNCdnCSgpY48yZDqPdTZXWW"),
- isMaxAmount = false
- )
- )
- }
- assertEquals("DDyZeg24eU3csLa7LMWrZEoqnHXccz6c94", requestAddress)
- assertEquals(BigInteger.valueOf(10_000_000_000), result.input.amount)
- assertEquals("DDyZeg24eU3csLa7LMWrZEoqnHXccz6c94", result.input.from.address)
- assertEquals(AssetId(Chain.Bitcoin).toIdentifier(), result.input.assetId.toIdentifier())
- assertEquals(false, result.input.isMax())
- assertEquals("D8UBj4EfNfNWNCdnCSgpY48yZDqPdTZXWW", result.input.destination()?.address)
- assertEquals(null, result.input.memo())
- assertEquals(BigInteger.valueOf(3351936), result.chainData.fee().amount)
- assertEquals(BigInteger.valueOf(17458), result.chainData.gasFee().maxGasPrice)
- assertEquals(BigInteger.valueOf(192), result.chainData.gasFee().limit)
- assertEquals(AssetId(Chain.Doge).toIdentifier(), result.chainData.fee().feeAssetId.toIdentifier())
- assertEquals(FeePriority.Normal, result.chainData.fee().priority)
- assertEquals("9f47e5d5ae3dac0662766f95d0cdda9c242c08d6baac4ce5d82464cf948abd53", (result.chainData as BitcoinSignerPreloader.BitcoinChainData).utxo[0].txid)
- assertEquals(1, (result.chainData as BitcoinSignerPreloader.BitcoinChainData).utxo[0].vout)
- assertEquals("86055170", (result.chainData as BitcoinSignerPreloader.BitcoinChainData).utxo[0].value)
- assertEquals(3, result.chainData.allFee().size)
- assertEquals(BigInteger.valueOf(192), result.chainData.gasFee(FeePriority.Fast).limit)
- assertEquals(BigInteger.valueOf(60357), result.chainData.gasFee(FeePriority.Fast).maxGasPrice)
- assertEquals(BigInteger.valueOf(11588544), result.chainData.gasFee(FeePriority.Fast).amount)
- assertEquals(BigInteger.valueOf(192), result.chainData.gasFee(FeePriority.Slow).limit)
- assertEquals(BigInteger.valueOf(17458), result.chainData.gasFee(FeePriority.Slow).maxGasPrice)
- assertEquals(BigInteger.valueOf(3351936), result.chainData.gasFee(FeePriority.Slow).amount)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSigner.kt
index 0a55fb97b..1ace606fa 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/TestBitcoinSigner.kt
@@ -4,15 +4,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
-import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ConfirmParams
import com.gemwallet.android.model.DestinationAddress
import com.gemwallet.android.model.GasFee
-import com.wallet.core.blockchain.bitcoin.BitcoinUTXO
import com.wallet.core.primitives.Account
import com.wallet.core.primitives.AssetId
import com.wallet.core.primitives.Chain
import com.wallet.core.primitives.FeePriority
+import com.wallet.core.primitives.UTXO
import junit.framework.TestCase.assertEquals
import kotlinx.coroutines.runBlocking
import org.junit.Test
@@ -25,7 +24,7 @@ import java.math.BigInteger
class TestBitcoinSigner {
companion object {
- const val SIGN_RESULT = "0x010000000153bd8a94cf6424d8e54cacbad6082c249cdacdd0956f766206a" +
+ const val SIGN_RESULT = "010000000153bd8a94cf6424d8e54cacbad6082c249cdacdd0956f766206a" +
"c3daed5e5479f010000006b483045022100ead2b7637532b167e66ddf76eafd032ada898c8719a" +
"680de8183b71fb3086a3e022055a073be9148cb8b9dc71de04755dbf11f140fee167ed0d4b44d6" +
"a54a829e75e012102fd6585adc0e86019abf00e83552d054cb5f4359ad4db8ca338099381f43e2" +
@@ -49,29 +48,27 @@ class TestBitcoinSigner {
BigInteger.valueOf(10_000_000_000),
DestinationAddress("D8UBj4EfNfNWNCdnCSgpY48yZDqPdTZXWW"),
),
- chainData = BitcoinSignerPreloader.BitcoinChainData(
+ chainData = BitcoinChainData(
listOf(
- BitcoinUTXO(
- txid = "9f47e5d5ae3dac0662766f95d0cdda9c242c08d6baac4ce5d82464cf948abd53",
+ UTXO(
+ transaction_id = "9f47e5d5ae3dac0662766f95d0cdda9c242c08d6baac4ce5d82464cf948abd53",
vout = 1,
value = "86055170",
+ address = ""
)
),
- listOf(
- GasFee(
- AssetId(Chain.Doge),
- priority = FeePriority.Normal,
- maxGasPrice = BigInteger.valueOf(150L),
- limit = BigInteger.valueOf(18L)
- )
- )
),
finalAmount = BigInteger.valueOf(10_000_000_000),
- FeePriority.Normal,
+ fee = GasFee(
+ AssetId(Chain.Doge),
+ priority = FeePriority.Normal,
+ maxGasPrice = BigInteger.valueOf(150L),
+ limit = BigInteger.valueOf(18L)
+ ),
privateKey.data()
)
}
- assertEquals(SIGN_RESULT, sign.first().toHexString())
+ assertEquals(SIGN_RESULT, String(sign.first()))
}
}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cardano/TestCardanoSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cardano/TestCardanoSigner.kt
index 750f21742..8119071e8 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cardano/TestCardanoSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cardano/TestCardanoSigner.kt
@@ -1,10 +1,8 @@
package com.gemwallet.android.blockchain.clients.cardano
-import com.gemwallet.android.blockchain.clients.cardano.CardanoSignerPreloaderClient.CardanoChainData
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
-import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ConfirmParams
import com.gemwallet.android.model.DestinationAddress
import com.gemwallet.android.model.Fee
@@ -41,11 +39,6 @@ class TestCardanoSigner {
DestinationAddress("addr1q9d2dxen8ywvs9yzxxn2w4mvffn797fquauvugt2ug7mfsuqj3lzdq9h0rsketzszrnfm930658swmpe7kpq53c2tmwql4rvtq"),
),
chainData = CardanoChainData(
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Cardano),
- amount = BigInteger.TEN
- ),
utxos = listOf(
UTXO(
address = "addr1q9d2dxen8ywvs9yzxxn2w4mvffn797fquauvugt2ug7mfsuqj3lzdq9h0rsketzszrnfm930658swmpe7kpq53c2tmwql4rvtq",
@@ -56,18 +49,22 @@ class TestCardanoSigner {
)
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Cardano),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
- assertEquals("0x83a40081825820412c5a964cf4515210bf4b82f45df6521c38e1e5381f27638fc509bef66" +
+ assertEquals("83a40081825820412c5a964cf4515210bf4b82f45df6521c38e1e5381f27638fc509bef66" +
"79378010182825839015aa69b33391cc8148231a6a7576c4a67e2f920e778ce216ae23db4c380947" +
"e2680b778e16cac5010e69d962fd50f076c39f5820a470a5edc192710825839015aa69b33391cc81" +
"48231a6a7576c4a67e2f920e778ce216ae23db4c380947e2680b778e16cac5010e69d962fd50f076" +
"c39f5820a470a5edc1a0076859c021a0002924b031a0b532b80a10081825820878150b7cb71f9406" +
"e36dcdd250e22dc943ec4525233581536497acb4f13e670584004bf4935e4dcc7f54947c4eb0b9cd" +
"d24880b168138af31b394ee0e7fe935900383822f432a1c2b533ea54f8ef12f1758b30a045f3918e" +
- "f25a51dad762d071b0af6", sign.first().toHexString())
+ "f25a51dad762d071b0af6", String(sign.first()))
}
}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosBalances.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosBalances.kt
deleted file mode 100644
index 8b93e4f3d..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosBalances.kt
+++ /dev/null
@@ -1,328 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosBalancesService
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosStakeService
-import com.gemwallet.android.ext.toIdentifier
-import com.wallet.core.blockchain.cosmos.CosmosBalance
-import com.wallet.core.blockchain.cosmos.CosmosBalances
-import com.wallet.core.blockchain.cosmos.CosmosDelegation
-import com.wallet.core.blockchain.cosmos.CosmosDelegationData
-import com.wallet.core.blockchain.cosmos.CosmosDelegations
-import com.wallet.core.blockchain.cosmos.CosmosReward
-import com.wallet.core.blockchain.cosmos.CosmosRewards
-import com.wallet.core.blockchain.cosmos.CosmosUnboudingDelegationEntry
-import com.wallet.core.blockchain.cosmos.CosmosUnboundingDelegation
-import com.wallet.core.blockchain.cosmos.CosmosUnboundingDelegations
-import com.wallet.core.blockchain.cosmos.CosmosValidators
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TestCosmosBalances {
-
- private class TestCosmosStakeService(
- val delegations: List = emptyList(),
- val unboundings: List = emptyList(),
- val rewards: List = emptyList(),
- ) : CosmosStakeService {
-
- var delegationsAddressRequest: String = ""
- var unboundingAddressRequest: String = ""
- var rewardsAddressRequest: String = ""
-
- override suspend fun validators(): Result {
- return Result.success(CosmosValidators(emptyList()))
- }
-
- override suspend fun delegations(address: String): Result {
- delegationsAddressRequest = address
- return Result.success(CosmosDelegations(delegations))
- }
-
- override suspend fun undelegations(address: String): Result {
- unboundingAddressRequest = address
- return Result.success(CosmosUnboundingDelegations(unboundings))
- }
-
- override suspend fun rewards(address: String): Result {
- rewardsAddressRequest = address
- return Result.success(CosmosRewards(rewards))
- }
-
- }
-
- @Test
- fun testCosmosBalance() {
- var ownerRequest: String = ""
- val balanceService = object : CosmosBalancesService {
- override suspend fun getBalance(owner: String): Result {
- ownerRequest = owner
- return Result.success(
- CosmosBalances(
- listOf(
- CosmosBalance(denom = "uosmo", amount = "5272821")
- )
- )
- )
- }
- }
-
- val result = runBlocking {
- CosmosBalanceClient(
- Chain.Osmosis,
- balancesService = balanceService,
- stakeService = TestCosmosStakeService(),
- ).getNativeBalance(Chain.Osmosis, "osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v")
- }
- assertEquals("osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v", ownerRequest)
- assertNotNull(result)
- assertEquals("5272821", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(5.272821, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(5.272821, result.totalAmount)
- assertEquals(AssetId(Chain.Osmosis).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testCosmosBalanceStakeOnly() {
- var ownerRequest: String = ""
- val balanceService = object : CosmosBalancesService {
- override suspend fun getBalance(owner: String): Result {
- ownerRequest = owner
- return Result.success(CosmosBalances(listOf()))
- }
- }
-
- val stakeService = TestCosmosStakeService(
- delegations = listOf(
- CosmosDelegation(
- CosmosDelegationData("osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm"),
- CosmosBalance("uosmo", "1000000")
- ),
- CosmosDelegation(
- CosmosDelegationData("osmovaloper1z0sh4s80u99l6y9d3vfy582p8jejeeu6tcucs2"),
- CosmosBalance("uosmo", "1000000")
- ),
- CosmosDelegation(
- CosmosDelegationData("osmovaloper1wgmdcxzp49vjgrqusgcagq6qefk4mtjv5c0k7q"),
- CosmosBalance("uosmo", "721000000")
- )
- )
- )
-
- val result = runBlocking {
- CosmosBalanceClient(
- Chain.Osmosis,
- balancesService = balanceService,
- stakeService = stakeService,
- ).getNativeBalance(Chain.Osmosis, "osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v")
- }
- assertEquals("osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v", ownerRequest)
- assertNotNull(result)
- assertEquals("0", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("723000000", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(723.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(723.0, result.totalAmount)
- assertEquals(AssetId(Chain.Osmosis).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testCosmosBalanceUnboundingOnly() {
- var ownerRequest: String = ""
- val balanceService = object : CosmosBalancesService {
- override suspend fun getBalance(owner: String): Result {
- ownerRequest = owner
- return Result.success(CosmosBalances(listOf()))
- }
- }
- val stakeService = TestCosmosStakeService(
- unboundings = listOf(
- CosmosUnboundingDelegation(
- "osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm",
- entries = listOf(
- CosmosUnboudingDelegationEntry(
- creation_height = "25053096",
- completion_time = "2024-12-18T02:11:27.650773866Z",
- balance = "2000000",
- )
- )
- ),
- )
- )
-
- val result = runBlocking {
- CosmosBalanceClient(
- Chain.Osmosis,
- balancesService = balanceService,
- stakeService = stakeService,
- ).getNativeBalance(Chain.Osmosis, "osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v")
- }
- assertEquals("osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v", ownerRequest)
- assertNotNull(result)
- assertEquals("0", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("2000000", result.balance.pending)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(2.0, result.balanceAmount.pending)
- assertEquals(2.0, result.totalAmount)
- assertEquals(AssetId(Chain.Osmosis).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testCosmosBalanceRewardsOnly() {
- var ownerRequest: String = ""
- val balanceService = object : CosmosBalancesService {
- override suspend fun getBalance(owner: String): Result {
- ownerRequest = owner
- return Result.success(CosmosBalances(listOf()))
- }
- }
- val stakeService = TestCosmosStakeService(
- rewards = listOf(
- CosmosReward("osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm", listOf(CosmosBalance(denom = "uosmo", amount = "808.015913259210000000"))),
- CosmosReward("osmovaloper1z0sh4s80u99l6y9d3vfy582p8jejeeu6tcucs2", listOf(CosmosBalance(denom = "uosmo", amount = "808.009961413523000000"))),
- CosmosReward("osmovaloper1wgmdcxzp49vjgrqusgcagq6qefk4mtjv5c0k7q", listOf(CosmosBalance(denom = "uosmo", amount = "582579.692713670953000000"))),
- )
- )
-
- val result = runBlocking {
- CosmosBalanceClient(
- Chain.Osmosis,
- balancesService = balanceService,
- stakeService = stakeService,
- ).getNativeBalance(Chain.Osmosis, "osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v")
- }
- assertEquals("osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v", ownerRequest)
- assertNotNull(result)
- assertEquals("0", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("584195", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.584195, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(0.584195, result.totalAmount)
- assertEquals(AssetId(Chain.Osmosis).toIdentifier(), result.asset.id.toIdentifier())
- }
-
- @Test
- fun testCosmosBalanceFull() {
- var ownerRequest: String = ""
- val balanceService = object : CosmosBalancesService {
- override suspend fun getBalance(owner: String): Result {
- ownerRequest = owner
- return Result.success(
- CosmosBalances(
- listOf(
- CosmosBalance(denom = "uosmo", amount = "5272821")
- )
- )
- )
- }
- }
-
- val stakeService = TestCosmosStakeService(
- delegations = listOf(
- CosmosDelegation(
- CosmosDelegationData("osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm"),
- CosmosBalance("uosmo", "1000000")
- ),
- CosmosDelegation(
- CosmosDelegationData("osmovaloper1z0sh4s80u99l6y9d3vfy582p8jejeeu6tcucs2"),
- CosmosBalance("uosmo", "1000000")
- ),
- CosmosDelegation(
- CosmosDelegationData("osmovaloper1wgmdcxzp49vjgrqusgcagq6qefk4mtjv5c0k7q"),
- CosmosBalance("uosmo", "721000000")
- )
- ),
- unboundings = listOf(
- CosmosUnboundingDelegation(
- "osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm",
- entries = listOf(
- CosmosUnboudingDelegationEntry(
- creation_height = "25053096",
- completion_time = "2024-12-18T02:11:27.650773866Z",
- balance = "2000000",
- )
- )
- ),
- ),
- rewards = listOf(
- CosmosReward("osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm", listOf(CosmosBalance(denom = "uosmo", amount = "808.015913259210000000"))),
- CosmosReward("osmovaloper1z0sh4s80u99l6y9d3vfy582p8jejeeu6tcucs2", listOf(CosmosBalance(denom = "uosmo", amount = "808.009961413523000000"))),
- CosmosReward("osmovaloper1wgmdcxzp49vjgrqusgcagq6qefk4mtjv5c0k7q", listOf(CosmosBalance(denom = "uosmo", amount = "582579.692713670953000000"))),
- )
- )
-
- val result = runBlocking {
- CosmosBalanceClient(
- Chain.Osmosis,
- balancesService = balanceService,
- stakeService = stakeService,
- ).getNativeBalance(Chain.Osmosis, "osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v")
- }
- assertEquals("osmo1ac4ns740p4v78n4wr7j3t3s79jjjre6udx7n2v", ownerRequest)
- assertNotNull(result)
- assertEquals("5272821", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("723000000", result.balance.staked)
- assertEquals("584195", result.balance.rewards)
- assertEquals("0", result.balance.reserved)
- assertEquals("2000000", result.balance.pending)
- assertEquals(5.272821, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(723.0, result.balanceAmount.staked)
- assertEquals(0.584195, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(2.0, result.balanceAmount.pending)
- assertEquals(730.857016, result.totalAmount)
- assertEquals(AssetId(Chain.Osmosis).toIdentifier(), result.asset.id.toIdentifier())
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosSigner.kt
index 1105ba766..14b8da275 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/cosmos/TestCosmosSigner.kt
@@ -39,21 +39,26 @@ class TestCosmosSigner {
fun testSignNativeTransfer() {
val transfer = ConfirmParams.Builder(Chain.Osmosis.asset(), osmoAccount, BigInteger.TEN)
.transfer(DestinationAddress("osmo1rcjvzz8wzktqfz8qjf0l9q45kzxvd0z0n7l5cf")) as ConfirmParams.TransferParams.Native
- val chainData = CosmosSignerPreloader.CosmosChainData(
+ val chainData = CosmosChainData(
chainId = "osmosis-1",
- accountNumber = 2913388L,
- sequence = 10L,
- fee = GasFee(
- feeAssetId = AssetId(Chain.Osmosis),
- maxGasPrice = BigInteger.valueOf(10000L),
- limit = BigInteger.valueOf(200000L),
- amount = BigInteger.valueOf(10000L),
- priority = FeePriority.Normal,
- )
+ accountNumber = 2913388UL,
+ sequence = 10UL,
)
val finalAmount = BigInteger.TEN
val result = runBlocking {
- signer.signNativeTransfer(transfer, chainData, finalAmount, FeePriority.Normal, privateKey)
+ signer.signNativeTransfer(
+ transfer,
+ chainData,
+ finalAmount,
+ fee = GasFee(
+ feeAssetId = AssetId(Chain.Osmosis),
+ maxGasPrice = BigInteger.valueOf(10000L),
+ limit = BigInteger.valueOf(200000L),
+ amount = BigInteger.valueOf(10000L),
+ priority = FeePriority.Normal,
+ ),
+ privateKey
+ )
}.first().toHexString()
assertEquals(
"0x7b226d6f6465223a2242524f4144434153545f4d4f44455f53594e43222c2274785f6279746573223" +
@@ -77,21 +82,26 @@ class TestCosmosSigner {
fun testSignStake() {
val transfer = ConfirmParams.Builder(Chain.Osmosis.asset(), osmoAccount, BigInteger.TEN)
.delegate("osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm")
- val chainData = CosmosSignerPreloader.CosmosChainData(
+ val chainData = CosmosChainData(
chainId = "osmosis-1",
- accountNumber = 2913388L,
- sequence = 10L,
- fee = GasFee(
- feeAssetId = AssetId(Chain.Osmosis),
- maxGasPrice = BigInteger.valueOf(10000L),
- limit = BigInteger.valueOf(200000L),
- amount = BigInteger.valueOf(10000L),
- priority = FeePriority.Normal,
- )
+ accountNumber = 2913388UL,
+ sequence = 10UL,
)
val finalAmount = BigInteger.TEN
val result = runBlocking {
- signer.signDelegate(transfer, chainData, finalAmount, FeePriority.Normal, privateKey)
+ signer.signDelegate(
+ transfer,
+ chainData,
+ finalAmount,
+ fee = GasFee(
+ feeAssetId = AssetId(Chain.Osmosis),
+ maxGasPrice = BigInteger.valueOf(10000L),
+ limit = BigInteger.valueOf(200000L),
+ amount = BigInteger.valueOf(10000L),
+ priority = FeePriority.Normal,
+ ),
+ privateKey
+ )
}.first().toHexString()
assertEquals(
"0x7b226d6f6465223a2242524f4144434153545f4d4f44455f53594e43222c2274785f6279746573223" +
@@ -137,21 +147,26 @@ class TestCosmosSigner {
)
)
)
- val chainData = CosmosSignerPreloader.CosmosChainData(
+ val chainData = CosmosChainData(
chainId = "osmosis-1",
- accountNumber = 2913388L,
- sequence = 10L,
- fee = GasFee(
- feeAssetId = AssetId(Chain.Osmosis),
- maxGasPrice = BigInteger.valueOf(10000L),
- limit = BigInteger.valueOf(200000L),
- amount = BigInteger.valueOf(10000L),
- priority = FeePriority.Normal,
- )
+ accountNumber = 2913388UL,
+ sequence = 10UL,
)
val finalAmount = BigInteger.TEN
val result = runBlocking {
- signer.signUndelegate(transfer, chainData, finalAmount, FeePriority.Normal, privateKey)
+ signer.signUndelegate(
+ transfer,
+ chainData,
+ finalAmount,
+ fee = GasFee(
+ feeAssetId = AssetId(Chain.Osmosis),
+ maxGasPrice = BigInteger.valueOf(10000L),
+ limit = BigInteger.valueOf(200000L),
+ amount = BigInteger.valueOf(10000L),
+ priority = FeePriority.Normal,
+ ),
+ privateKey
+ )
}.first().toHexString()
assertEquals(
"0x7b226d6f6465223a2242524f4144434153545f4d4f44455f53594e43222c2274785f6279746573223" +
@@ -199,21 +214,26 @@ class TestCosmosSigner {
)
)
)
- val chainData = CosmosSignerPreloader.CosmosChainData(
+ val chainData = CosmosChainData(
chainId = "osmosis-1",
- accountNumber = 2913388L,
- sequence = 10L,
- fee = GasFee(
- feeAssetId = AssetId(Chain.Osmosis),
- maxGasPrice = BigInteger.valueOf(10000L),
- limit = BigInteger.valueOf(200000L),
- amount = BigInteger.valueOf(10000L),
- priority = FeePriority.Normal,
- )
+ accountNumber = 2913388UL,
+ sequence = 10UL,
)
val finalAmount = BigInteger.TEN
val result = runBlocking {
- signer.signRedelegate(transfer, chainData, finalAmount, FeePriority.Normal, privateKey)
+ signer.signRedelegate(
+ transfer,
+ chainData,
+ finalAmount,
+ fee = GasFee(
+ feeAssetId = AssetId(Chain.Osmosis),
+ maxGasPrice = BigInteger.valueOf(10000L),
+ limit = BigInteger.valueOf(200000L),
+ amount = BigInteger.valueOf(10000L),
+ priority = FeePriority.Normal,
+ ),
+ privateKey
+ )
}.first().toHexString()
assertEquals(
"0x7b226d6f6465223a2242524f4144434153545f4d4f44455f53594e43222c2274785f6279746573223" +
@@ -245,21 +265,26 @@ class TestCosmosSigner {
"osmovaloper1pxphtfhqnx9ny27d53z4052e3r76e7qq495ehm",
),
)
- val chainData = CosmosSignerPreloader.CosmosChainData(
+ val chainData = CosmosChainData(
chainId = "osmosis-1",
- accountNumber = 2913388L,
- sequence = 10L,
- fee = GasFee(
- feeAssetId = AssetId(Chain.Osmosis),
- maxGasPrice = BigInteger.valueOf(10000L),
- limit = BigInteger.valueOf(200000L),
- amount = BigInteger.valueOf(10000L),
- priority = FeePriority.Normal,
- )
+ accountNumber = 2913388UL,
+ sequence = 10UL,
)
val finalAmount = BigInteger.TEN
val result = runBlocking {
- signer.signRewards(transfer, chainData, finalAmount, FeePriority.Normal, privateKey)
+ signer.signRewards(
+ transfer,
+ chainData,
+ finalAmount,
+ fee = GasFee(
+ feeAssetId = AssetId(Chain.Osmosis),
+ maxGasPrice = BigInteger.valueOf(10000L),
+ limit = BigInteger.valueOf(200000L),
+ amount = BigInteger.valueOf(10000L),
+ priority = FeePriority.Normal,
+ ),
+ privateKey
+ )
}.first().toHexString()
assertEquals(
"0x7b226d6f6465223a2242524f4144434153545f4d4f44455f53594e43222c2274785f6279746573223" +
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEthSign.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEthSign.kt
index 4a15d3ad9..ee7b98019 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEthSign.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEthSign.kt
@@ -1,8 +1,8 @@
package com.gemwallet.android.blockchain.clients.evm
import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.gemwallet.android.blockchain.clients.ethereum.EvmChainData
import com.gemwallet.android.blockchain.clients.ethereum.EvmSignClient
-import com.gemwallet.android.blockchain.clients.ethereum.EvmSignerPreloader
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
@@ -46,22 +46,19 @@ class TestEthSign {
destination = DestinationAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7"),
from = Account(Chain.Ethereum, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", "")
),
- chainData = EvmSignerPreloader.EvmChainData(
+ chainData = EvmChainData(
chainId = 1,
nonce = BigInteger.ONE,
- fees = listOf(
- GasFee(
- maxGasPrice = BigInteger.TEN,
- limit = BigInteger("21000"),
- minerFee = BigInteger.TEN,
- relay = BigInteger.TEN,
- priority = FeePriority.Normal,
- feeAssetId = Chain.Ethereum.asset().id,
- )
- )
),
finalAmount = BigInteger.TEN.pow(Chain.Ethereum.asset().decimals),
- feePriority = FeePriority.Normal,
+ fee = GasFee(
+ maxGasPrice = BigInteger.TEN,
+ limit = BigInteger("21000"),
+ minerFee = BigInteger.TEN,
+ relay = BigInteger.TEN,
+ priority = FeePriority.Normal,
+ feeAssetId = Chain.Ethereum.asset().id,
+ ),
privateKey,
)
}
@@ -89,22 +86,19 @@ class TestEthSign {
destination = DestinationAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7"),
from = Account(Chain.Ethereum, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", "")
),
- chainData = EvmSignerPreloader.EvmChainData(
+ chainData = EvmChainData(
chainId = 1,
nonce = BigInteger.ONE,
- fees = listOf(
- GasFee(
- maxGasPrice = BigInteger.TEN,
- limit = BigInteger("91000"),
- minerFee = BigInteger.TEN,
- relay = BigInteger.TEN,
- priority = FeePriority.Normal,
- feeAssetId = Chain.Ethereum.asset().id,
- )
- )
),
finalAmount = BigInteger.TEN.pow(Chain.Ethereum.asset().decimals),
- feePriority = FeePriority.Normal,
+ fee = GasFee(
+ maxGasPrice = BigInteger.TEN,
+ limit = BigInteger("91000"),
+ minerFee = BigInteger.TEN,
+ relay = BigInteger.TEN,
+ priority = FeePriority.Normal,
+ feeAssetId = Chain.Ethereum.asset().id,
+ ),
privateKey,
)
}
@@ -140,22 +134,19 @@ class TestEthSign {
value = "10",
from = Account(Chain.Ethereum, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", "")
),
- chainData = EvmSignerPreloader.EvmChainData(
+ chainData = EvmChainData(
chainId = 1,
nonce = BigInteger.ONE,
- fees = listOf(
- GasFee(
- maxGasPrice = BigInteger.TEN,
- limit = BigInteger("91000"),
- minerFee = BigInteger.TEN,
- relay = BigInteger.TEN,
- priority = FeePriority.Normal,
- feeAssetId = Chain.Ethereum.asset().id,
- )
- )
),
finalAmount = BigInteger.TEN.pow(Chain.Ethereum.asset().decimals),
- feePriority = FeePriority.Normal,
+ fee = GasFee(
+ maxGasPrice = BigInteger.TEN,
+ limit = BigInteger("91000"),
+ minerFee = BigInteger.TEN,
+ relay = BigInteger.TEN,
+ priority = FeePriority.Normal,
+ feeAssetId = Chain.Ethereum.asset().id,
+ ),
privateKey,
)
}
@@ -177,22 +168,19 @@ class TestEthSign {
from = Account(Chain.Ethereum, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
validatorId = "0x9941BCe2601fC93478DF9f5F6Cc83F4FFC1D71d8"
),
- chainData = EvmSignerPreloader.EvmChainData(
+ chainData = EvmChainData(
chainId = 1,
nonce = BigInteger.ONE,
- fees = listOf(
- GasFee(
- maxGasPrice = BigInteger.TEN,
- limit = BigInteger("91000"),
- minerFee = BigInteger.TEN,
- relay = BigInteger.TEN,
- priority = FeePriority.Normal,
- feeAssetId = Chain.Ethereum.asset().id,
- )
- )
),
finalAmount = BigInteger.TEN.pow(Chain.Ethereum.asset().decimals),
- feePriority = FeePriority.Normal,
+ fee = GasFee(
+ maxGasPrice = BigInteger.TEN,
+ limit = BigInteger("91000"),
+ minerFee = BigInteger.TEN,
+ relay = BigInteger.TEN,
+ priority = FeePriority.Normal,
+ feeAssetId = Chain.Ethereum.asset().id,
+ ),
privateKey,
)
}
@@ -220,22 +208,19 @@ class TestEthSign {
share = "991645728829172501",
balance = "1002901689671695193",
),
- chainData = EvmSignerPreloader.EvmChainData(
+ chainData = EvmChainData(
chainId = 1,
nonce = BigInteger.ONE,
- fees = listOf(
- GasFee(
- maxGasPrice = BigInteger.TEN,
- limit = BigInteger("91000"),
- minerFee = BigInteger.TEN,
- relay = BigInteger.TEN,
- priority = FeePriority.Normal,
- feeAssetId = Chain.Ethereum.asset().id,
- )
- )
),
finalAmount = BigInteger.TEN.pow(Chain.Ethereum.asset().decimals),
- feePriority = FeePriority.Normal,
+ fee = GasFee(
+ maxGasPrice = BigInteger.TEN,
+ limit = BigInteger("91000"),
+ minerFee = BigInteger.TEN,
+ relay = BigInteger.TEN,
+ priority = FeePriority.Normal,
+ feeAssetId = Chain.Ethereum.asset().id,
+ ),
privateKey,
)
}
@@ -268,22 +253,19 @@ class TestEthSign {
provider = "Uniswap v3",
contract = "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
),
- chainData = EvmSignerPreloader.EvmChainData(
+ chainData = EvmChainData(
chainId = 1,
nonce = BigInteger.ONE,
- fees = listOf(
- GasFee(
- maxGasPrice = BigInteger.TEN,
- limit = BigInteger("91000"),
- minerFee = BigInteger.TEN,
- relay = BigInteger.TEN,
- priority = FeePriority.Normal,
- feeAssetId = Chain.SmartChain.asset().id,
- )
- )
),
finalAmount = BigInteger.ZERO,
- feePriority = FeePriority.Normal,
+ fee = GasFee(
+ maxGasPrice = BigInteger.TEN,
+ limit = BigInteger("91000"),
+ minerFee = BigInteger.TEN,
+ relay = BigInteger.TEN,
+ priority = FeePriority.Normal,
+ feeAssetId = Chain.SmartChain.asset().id,
+ ),
privateKey,
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmBalance.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmBalance.kt
deleted file mode 100644
index 7cd17da45..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmBalance.kt
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.gemwallet.android.blockchain.clients.evm
-
-import com.gemwallet.android.blockchain.clients.ethereum.EvmBalanceClient
-import com.gemwallet.android.blockchain.clients.ethereum.SmartchainStakeClient
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmBalancesService
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmCallService
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmRpcClient
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.gemwallet.android.model.getTotalAmount
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import java.math.BigInteger
-
-class TestEvmBalance {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- class CallService : EvmCallService {
- override suspend fun callString(request: JSONRpcRequest>): Result> {
- return Result.success(JSONRpcResponse("0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000"))
- }
-
- override suspend fun callNumber(request: JSONRpcRequest>): Result> {
- return Result.success(JSONRpcResponse(null))
- }
-
- override suspend fun callBatch(request: List>>): Result>> {
- return Result.success(
- listOf(
- JSONRpcResponse(
- result = "0x00000000000000000000000000000000000000000000000000000000001fdcf1",
- )
- )
- )
- }
-
- }
- class BalanceService : EvmBalancesService {
- var nativeBalanceParam: String = ""
-
- override suspend fun getBalance(request: JSONRpcRequest>): Result> {
- nativeBalanceParam = request.params[0]
- return Result.success(JSONRpcResponse(EvmRpcClient.EvmNumber(BigInteger.TEN.pow(16))))
- }
-
- }
-
- @Test
- fun testNativeBalance() {
- val balanceService = BalanceService()
- val balanceClient = EvmBalanceClient(Chain.Ethereum, CallService(), balanceService, SmartchainStakeClient(Chain.Ethereum, CallService()))
-
- val result = runBlocking {
- balanceClient.getNativeBalance(Chain.Ethereum, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- }
- assertEquals("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", balanceService.nativeBalanceParam)
- assertNotNull(result)
- assertEquals("10000000000000000", result!!.balance.available)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.reserved)
- assertEquals(BigInteger.valueOf(10_000_000_000_000_000), result.balance.getTotalAmount())
- assertEquals(0.01, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.reserved)
- assertEquals(0.01, result.balanceAmount.getTotalAmount())
- }
-
- @Test
- fun testNativeBalanceBadResponse() {
- var nativeBalanceParam: String = ""
- val balancesService = object : EvmBalancesService {
- override suspend fun getBalance(request: JSONRpcRequest>): Result> {
- nativeBalanceParam = request.params[0]
- return Result.success(JSONRpcResponse(EvmRpcClient.EvmNumber(null)))
- }
-
- }
- val balanceClient = EvmBalanceClient(Chain.Ethereum, CallService(), balancesService, SmartchainStakeClient(Chain.Ethereum, CallService()))
-
- val result = runBlocking {
- balanceClient.getNativeBalance(Chain.Ethereum, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- }
- assertEquals("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", nativeBalanceParam)
- assertNull(result)
- }
-
- @Test
- fun test_native_balance_on_SmartChain_without_delegations() {
- val balanceService = BalanceService()
- val balanceClient = EvmBalanceClient(Chain.SmartChain, CallService(), balanceService, SmartchainStakeClient(Chain.SmartChain, CallService()))
-
- val result = runBlocking {
- balanceClient.getNativeBalance(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- }
- assertNotNull(result)
- assertEquals("10000000000000000", result!!.balance.available)
- assertEquals("0", result.balance.rewards)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.reserved)
- assertEquals(BigInteger.valueOf(10_000_000_000_000_000), result.balance.getTotalAmount())
- }
-
- @Test
- fun test_native_balance_on_SmartChain_with_delegations() {
- val balanceService = BalanceService()
- val callService = object : EvmCallService {
- override suspend fun callString(request: JSONRpcRequest>): Result> {
- val data = when ((request.params[0] as Map<*, *>)["data"]) {
- "0xced0e70e000000000000000000000000ee7e9ccfb529f2c1cc02c0aea8aced7ec7e98b5e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d" -> {
- "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000ee7e9ccfb529f2c1cc02c0aea8aced7ec7e98b5e0000000000000000000000009941bce2601fc93478df9f5f6cc83f4ffc1d71d80000000000000000000000000000000000000000000000000deacafbb23d1ee90000000000000000000000000000000000000000000000000dc3088951e56b15"
- }
- "0xd9d4c020000000000000000000000000ee7e9ccfb529f2c1cc02c0aea8aced7ec7e98b5e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d" -> {
- "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000"
- }
- "0xc473318f" -> "0x000000000000000000000000000000000000000000000000000000000000002d"
- else -> "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000"
- }
- return Result.success(JSONRpcResponse(data))
- }
-
- override suspend fun callNumber(request: JSONRpcRequest>): Result> {
- TODO("Not yet implemented")
- }
-
- override suspend fun callBatch(request: List>>): Result>> {
- return Result.success(
- listOf(
- JSONRpcResponse(
- result = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000ee7e9ccfb529f2c1cc02c0aea8aced7ec7e98b5e0000000000000000000000009941bce2601fc93478df9f5f6cc83f4ffc1d71d80000000000000000000000000000000000000000000000000deacafbb23d1ee90000000000000000000000000000000000000000000000000dc3088951e56b15",
- ),
- JSONRpcResponse(
- result = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
- ),
- )
- )
- }
- }
- val balanceClient = EvmBalanceClient(
- Chain.SmartChain,
- callService,
- balanceService,
- SmartchainStakeClient(Chain.SmartChain, callService)
- )
-
- val result = runBlocking {
- balanceClient.getDelegationBalances(Chain.SmartChain, "0xEe7E9CcFb529f2c1Cc02C0Aea8aCed7Ec7e98B5e")
- }
- assertNotNull(result)
- assertEquals("0", result!!.balance.available)
- assertEquals("0", result.balance.rewards)
- assertEquals("1002837049419308777", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.reserved)
- assertEquals(BigInteger.valueOf(1002837049419308777), result.balance.getTotalAmount())
- }
-
- @Test
- fun testTokenBalance() {
- val balanceService = BalanceService()
- val callService = object : EvmCallService {
- override suspend fun callString(request: JSONRpcRequest>): Result> {
- TODO("Not yet implemented")
- }
-
- override suspend fun callNumber(request: JSONRpcRequest>): Result> {
- val result = when ((request.params[0] as Map<*, *>)["to"]) {
- "0x76A797A59Ba2C17726896976B7B3747BfD1d220f" -> "0x00000000000000000000000000000000000000000000000000000002eedef652"
- "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c" -> "0x000000000000000000000000000000000000000000000000006a94d74f430000"
- else -> "0x"
- }
- return Result.success(JSONRpcResponse(EvmRpcClient.EvmNumber(BigInteger(result.removePrefix("0x"), 16))))
- }
-
- override suspend fun callBatch(request: List>>): Result>> {
- return Result.success(
- listOf(
- JSONRpcResponse(
- result = "0x00000000000000000000000000000000000000000000000000000002eedef652",
- ),
- JSONRpcResponse(
- result = "0x000000000000000000000000000000000000000000000000006a94d74f430000",
- ),
- )
- )
- }
- }
- val balanceClient = EvmBalanceClient(Chain.SmartChain, callService, balanceService, SmartchainStakeClient(Chain.SmartChain, CallService()))
-
- val result = runBlocking {
- balanceClient.getTokenBalances(
- Chain.SmartChain,
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- listOf(
- Asset(
- AssetId(Chain.SmartChain, "0x76A797A59Ba2C17726896976B7B3747BfD1d220f"),
- name = "ton",
- symbol = "ton",
- decimals = 9,
- type = AssetType.ERC20
- ),
- Asset(
- AssetId(Chain.SmartChain, "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"),
- name = "Wrapped BNB",
- symbol = "WBNB",
- decimals = 18,
- type = AssetType.ERC20
- ),
- )
- )
- }
- assertNotNull(result)
- assertEquals("12597524050", result[0].balance.available)
- assertEquals("0", result[0].balance.rewards)
- assertEquals("0", result[0].balance.staked)
- assertEquals("0", result[0].balance.pending)
- assertEquals("0", result[0].balance.frozen)
- assertEquals("0", result[0].balance.locked)
- assertEquals("0", result[0].balance.reserved)
- assertEquals(BigInteger.valueOf(12597524050), result[0].balance.getTotalAmount())
- assertEquals("30000000000000000", result[1].balance.available)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmEncodeApprove.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmEncodeApprove.kt
deleted file mode 100644
index e84ee2cab..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmEncodeApprove.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.gemwallet.android.blockchain.clients.evm
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.gemwallet.android.blockchain.clients.ethereum.encodeApprove
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.math.toHexString
-import junit.framework.TestCase.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-import wallet.core.jni.AnyAddress
-import wallet.core.jni.CoinType
-
-@RunWith(AndroidJUnit4::class)
-class TestEvmEncodeApprove {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testEncodeApprove() {
- assertEquals(
- "0x095ea7b30000000000000000000000009b1db81180c31b1b428572be105e209b5a6222b77fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- encodeApprove(AnyAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", CoinType.ETHEREUM).data()).toHexString()
- )
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmExtentions.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmExtentions.kt
deleted file mode 100644
index 993bbc677..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmExtentions.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.gemwallet.android.blockchain.clients.evm
-
-import com.gemwallet.android.blockchain.clients.ethereum.encodeTransactionData
-import com.gemwallet.android.blockchain.clients.ethereum.getDestinationAddress
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.math.toHexString
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.EVMChain
-import junit.framework.TestCase.assertEquals
-import org.junit.Test
-import java.math.BigInteger
-
-class TestEvmExtentions {
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testEncodeTransactionData() {
- val result = EVMChain.encodeTransactionData(
- AssetId(Chain.SmartChain, "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"),
- null,
- BigInteger.TEN,
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- )
- assertEquals(
- "0xa9059cbb0000000000000000000000009b1db81180c31b1b428572be105e209b5a6222b7000000000" +
- "000000000000000000000000000000000000000000000000000000a",
- result.toHexString()
- )
- }
-
- @Test
- fun testEncodeTransactionData_with_memo() {
- val result = EVMChain.encodeTransactionData(
- AssetId(Chain.SmartChain, "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"),
- "0x00000000000000000000000000000000000000000000000000000002eedef652",
- BigInteger.TEN,
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- )
- assertEquals("0x00000000000000000000000000000000000000000000000000000002eedef652", result.toHexString())
- }
-
- @Test
- fun testGetDestinationAddress_token() {
- val result = EVMChain.getDestinationAddress(
- AssetId(Chain.SmartChain, "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"),
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7"
- )
- assertEquals(result, "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c")
- }
-
- @Test
- fun testGetDestinationAddress_native() {
- val result = EVMChain.getDestinationAddress(
- AssetId(Chain.SmartChain),
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7"
- )
- assertEquals(result, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmTransactionStatusClient.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmTransactionStatusClient.kt
deleted file mode 100644
index ef02627be..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestEvmTransactionStatusClient.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gemwallet.android.blockchain.clients.evm
-
-import com.gemwallet.android.blockchain.clients.TransactionStateRequest
-import com.gemwallet.android.blockchain.clients.ethereum.EvmTransactionStatusClient
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmTransactionsService
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.wallet.core.blockchain.ethereum.EthereumTransactionReciept
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionState
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import java.math.BigInteger
-
-class TestEvmTransactionStatusClient {
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testEvm_transaction_tastus_confirm() {
- val client = EvmTransactionStatusClient(
- chain = Chain.SmartChain,
- transactionsService = object : EvmTransactionsService {
- override suspend fun transaction(request: JSONRpcRequest>): JSONRpcResponse {
- return JSONRpcResponse(
- EthereumTransactionReciept(
- status = "0x1",
- gasUsed = "10",
- effectiveGasPrice = "2",
- l1Fee = "1"
- )
- )
- }
-
- }
- )
- val resullt = runBlocking {
- client.getStatus(
- TransactionStateRequest(
- Chain.SmartChain,
- "0xe84b29d6f06aeb00ba071a409ff057649f19ebbc209114a6a8135a68af589e22",
- "",
- "0x502aECFE253E6AA0e8D2A06E12438FFeD0Fe16a0",
- )
- )
- }
- assertNotNull(resullt)
- assertEquals(TransactionState.Confirmed, resullt.state)
- assertEquals(BigInteger("21"), resullt.fee)
- }
-
- @Test
- fun testEvm_transaction_tastus_fail() {
- val client = EvmTransactionStatusClient(
- chain = Chain.SmartChain,
- transactionsService = object : EvmTransactionsService {
- override suspend fun transaction(request: JSONRpcRequest>): JSONRpcResponse {
- return JSONRpcResponse(
- EthereumTransactionReciept(
- status = "0x0",
- gasUsed = "10",
- effectiveGasPrice = "2",
- l1Fee = "1"
- )
- )
- }
- }
- )
- val resullt = runBlocking {
- client.getStatus(
- TransactionStateRequest(
- Chain.SmartChain,
- "0xe84b29d6f06aeb00ba071a409ff057649f19ebbc209114a6a8135a68af589e22",
- "",
- "0x502aECFE253E6AA0e8D2A06E12438FFeD0Fe16a0",
- )
-
- )
- }
- assertNotNull(resullt)
- assertEquals(TransactionState.Reverted, resullt.state)
- assertEquals(BigInteger("21"), resullt.fee)
- }
-
- @Test
- fun testEvm_transaction_tastus_pending() {
- val client = EvmTransactionStatusClient(
- chain = Chain.SmartChain,
- transactionsService = object : EvmTransactionsService {
- override suspend fun transaction(request: JSONRpcRequest>): JSONRpcResponse {
- return JSONRpcResponse(
- EthereumTransactionReciept(
- status = "0x2",
- gasUsed = "10",
- effectiveGasPrice = "2",
- l1Fee = "1"
- )
- )
- }
-
- }
- )
- val resullt = runBlocking {
- client.getStatus(
- TransactionStateRequest(
- Chain.SmartChain,
- "0xe84b29d6f06aeb00ba071a409ff057649f19ebbc209114a6a8135a68af589e22",
- "",
- "0x502aECFE253E6AA0e8D2A06E12438FFeD0Fe16a0",
- )
- )
- }
- assertNotNull(resullt)
- assertEquals(TransactionState.Pending, resullt.state)
- assertNull(resullt.fee)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestFeeCalculator.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestFeeCalculator.kt
deleted file mode 100644
index 2023c7f38..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/evm/TestFeeCalculator.kt
+++ /dev/null
@@ -1,421 +0,0 @@
-package com.gemwallet.android.blockchain.clients.evm
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.gemwallet.android.blockchain.clients.ethereum.EvmFeeCalculator
-import com.gemwallet.android.blockchain.clients.ethereum.StakeHub
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmCallService
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmFeeService
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmRpcClient
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.DestinationAddress
-import com.wallet.core.blockchain.ethereum.EthereumFeeHistory
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import org.junit.runner.RunWith
-import uniffi.gemstone.Config
-import wallet.core.jni.CoinType
-import java.math.BigInteger
-
-@RunWith(AndroidJUnit4::class)
-class TestFeeCalculator {
- companion object {
- init {
- includeLibs()
- }
- }
-
- private class FeeService(
- private val feeHistory: EthereumFeeHistory? = null,
- private val gasLimit: BigInteger = BigInteger.valueOf(21_000),
- ) : EvmFeeService {
-
- var feeHistoryRequest: List = emptyList()
- var gasLimitRequest: List = emptyList()
-
- override suspend fun getFeeHistory(request: JSONRpcRequest>): Result> {
- feeHistoryRequest = request.params
- return Result.success(JSONRpcResponse(feeHistory ?: throw Exception("Fee history fail")))
- }
-
- override suspend fun getGasLimit(request: JSONRpcRequest>): Result> {
- gasLimitRequest = request.params
- return Result.success(JSONRpcResponse(EvmRpcClient.EvmNumber(gasLimit)))
- }
-
- override suspend fun getNonce(request: JSONRpcRequest>): Result> {
- return Result.success(JSONRpcResponse(EvmRpcClient.EvmNumber(BigInteger.ZERO)))
- }
- }
-
- private class CallService : EvmCallService {
- override suspend fun callString(request: JSONRpcRequest>): Result> {
- throw Exception("Call string fail")
- }
-
- override suspend fun callNumber(request: JSONRpcRequest>): Result> {
- return Result.success(JSONRpcResponse(EvmRpcClient.EvmNumber(BigInteger.ONE)))
- }
-
- override suspend fun callBatch(request: List>>): Result>> {
- TODO("Not yet implemented")
- }
- }
-
- @Test
- fun testEvm_transfer_fee_calculation_network_fail_gas_limit() {
- val feeService = object : EvmFeeService {
- override suspend fun getFeeHistory(request: JSONRpcRequest>): Result> {
- return Result.failure(Exception("Fee history fail"))
- }
-
- override suspend fun getGasLimit(request: JSONRpcRequest>): Result> {
- return Result.failure(Exception("Gas limit fail"))
- }
-
- override suspend fun getNonce(request: JSONRpcRequest>): Result> {
- return Result.failure(Exception("Nonce fail"))
- }
- }
- val callService = object : EvmCallService {
- override suspend fun callString(request: JSONRpcRequest>): Result> {
- throw Exception("Call string fail")
- }
-
- override suspend fun callNumber(request: JSONRpcRequest>): Result> {
- throw Exception("Call number fail")
- }
-
- override suspend fun callBatch(request: List>>): Result>> {
- throw Exception("Call number fail")
- }
- }
- try {
- runBlocking {
- EvmFeeCalculator(
- feeService = feeService,
- callService = callService,
- coinType = CoinType.SMARTCHAIN,
- ).calculate(
- ConfirmParams.Builder(
- Chain.SmartChain.asset(),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- DestinationAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- ),
- AssetId(Chain.SmartChain),
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertTrue(false)
- } catch (err: Throwable) {
- assertTrue("Unable to calculate base fee" == err.message || "Fail calculate gas limit" == err.message)
- }
- }
-
- @Test
- fun test_Evm_fee_transfer_calculation() {
- val feeService = FeeService(
- EthereumFeeHistory(
- reward = listOf(listOf("0x3b9aca00")),
- baseFeePerGas = listOf("0xa", "0xc"),
- oldestBlock = "",
- gasUsedRatio = emptyList()
- ),
- gasLimit = BigInteger.valueOf(25_000)
- )
- val feeCalculator = EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- )
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- Chain.SmartChain.asset(),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- DestinationAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- ),
- AssetId(Chain.SmartChain),
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertEquals(FeePriority.Normal, result[1].priority)
- assertEquals(BigInteger("37500000450000"), result[1].amount)
- assertEquals(BigInteger("1000000000"), result[1].minerFee)
- assertEquals(BigInteger("1000000012"), result[1].maxGasPrice)
- assertEquals(BigInteger("37500"), result[1].limit)
- }
-
- @Test
- fun test_Evm_fee_transfer_max_amount_calculation() {
- val feeService = FeeService(
- EthereumFeeHistory(
- reward = listOf(listOf("0x3b9aca00")),
- baseFeePerGas = listOf("0xa", "0xc"),
- oldestBlock = "",
- gasUsedRatio = emptyList()
- ),
- gasLimit = BigInteger.valueOf(25_000)
- )
- val feeCalculator = EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- )
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- Chain.SmartChain.asset(),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- destination = DestinationAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7"),
- isMax = true
- ),
- AssetId(Chain.SmartChain),
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertEquals(FeePriority.Normal, result[1].priority)
- assertEquals(BigInteger("37500000450000"), result[1].amount)
- assertEquals(BigInteger("1000000012"), result[1].minerFee)
- assertEquals(BigInteger("1000000012"), result[1].maxGasPrice)
- assertEquals(BigInteger("37500"), result[1].limit)
- }
-
-
- @Test
- fun test_Evm_gas_limit_native_transfer_calculation() {
- val feeService = FeeService(
- EthereumFeeHistory(
- reward = listOf(listOf("0x3b9aca00")),
- baseFeePerGas = listOf("0x0", "0x0"),
- oldestBlock = "",
- gasUsedRatio = emptyList()
- ),
- gasLimit = BigInteger.valueOf(21_000)
- )
- val feeCalculator = EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- )
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- Chain.SmartChain.asset(),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- DestinationAddress("0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A")
- ),
- AssetId(Chain.SmartChain),
- "0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertEquals(FeePriority.Normal, result[1].priority)
- assertEquals(BigInteger("21000000000000"), result[1].amount)
- assertEquals(BigInteger.valueOf(21_000), result[1].limit)
- assertEquals("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", (feeService.gasLimitRequest[0] as Map<*, *>)["from"])
- assertEquals("0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A", (feeService.gasLimitRequest[0] as Map<*, *>)["to"])
- assertEquals("0xa", (feeService.gasLimitRequest[0] as Map<*, *>)["value"])
- assertEquals("0x", (feeService.gasLimitRequest[0] as Map<*, *>)["data"])
- }
-
- @Test
- fun test_Evm_Oracle() {
- val feeService = FeeService(
- EthereumFeeHistory(
- reward = listOf(listOf("0x3b9aca00")),
- baseFeePerGas = listOf("0x0", "0x0"),
- oldestBlock = "",
- gasUsedRatio = emptyList()
- ),
- gasLimit = BigInteger.valueOf(21_000)
- )
- val feeCalculator = EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- )
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- Chain.OpBNB.asset(),
- Account(Chain.OpBNB, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- DestinationAddress("0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A")
- ),
- AssetId(Chain.OpBNB),
- "0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.OpBNB.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertEquals(FeePriority.Normal, result[1].priority)
- assertEquals(BigInteger("21000000001"), result[1].amount)
- assertEquals(BigInteger.valueOf(21_000), result[1].limit)
- assertEquals("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", (feeService.gasLimitRequest[0] as Map<*, *>)["from"])
- assertEquals("0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A", (feeService.gasLimitRequest[0] as Map<*, *>)["to"])
- assertEquals("0xa", (feeService.gasLimitRequest[0] as Map<*, *>)["value"])
- assertEquals("0x", (feeService.gasLimitRequest[0] as Map<*, *>)["data"])
- }
-
- @Test
- fun test_Evm_gas_limit_token_transfer_calculation() {
- val feeService = FeeService(
- EthereumFeeHistory(
- reward = listOf(listOf("0x3b9aca00")),
- baseFeePerGas = listOf("0x0", "0x0"),
- oldestBlock = "",
- gasUsedRatio = emptyList()
- ),
- gasLimit = BigInteger.valueOf(21_000)
- )
- val feeCalculator = EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- )
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- Asset(AssetId(Chain.SmartChain, "0x2170Ed0880ac9A755fd29B2688956BD959F933F8"), name = "usdt", symbol = "usdt", decimals = 8, type = AssetType.TOKEN),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- DestinationAddress("0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A")
- ),
- AssetId(Chain.SmartChain, "0x2170Ed0880ac9A755fd29B2688956BD959F933F8"),
- "0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertEquals(FeePriority.Normal, result[1].priority)
- assertEquals(BigInteger("21000000000000"), result[1].amount)
- assertEquals(BigInteger.valueOf(21_000), result[1].limit)
- assertEquals("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", (feeService.gasLimitRequest[0] as Map<*, *>)["from"])
- assertEquals("0x2170ed0880ac9a755fd29b2688956bd959f933f8", (feeService.gasLimitRequest[0] as Map<*, *>)["to"])
- assertEquals("0x0", (feeService.gasLimitRequest[0] as Map<*, *>)["value"])
- assertEquals(
- "0xa9059cbb000000000000000000000000a857a4e4b3f7c0eb7e132a7a4abca287225ddb2a000000000000000000000000000000000000000000000000000000000000000a",
- (feeService.gasLimitRequest[0] as Map<*, *>)["data"]
- )
- }
-
- @Test
- fun test_Evm_gas_limit_delegate_calculation() {
- val feeService = FeeService(
- EthereumFeeHistory(
- reward = listOf(listOf("0x3b9aca00")),
- baseFeePerGas = listOf("0x0", "0x0"),
- oldestBlock = "",
- gasUsedRatio = emptyList()
- ),
- gasLimit = BigInteger.valueOf(21_000)
- )
- val feeCalculator = EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- )
- val params = ConfirmParams.Builder(
- Chain.SmartChain.asset(),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).delegate("0xa857a4E4B3f7C0eb7e132A7A4abcA287225dDB2A")
- val result = runBlocking {
- feeCalculator.calculate(
- params = params,
- assetId = AssetId(Chain.SmartChain),
- recipient = StakeHub.address,
- outputAmount = BigInteger.TEN,
- payload = "0xb",
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertEquals(FeePriority.Normal, result[1].priority)
- assertEquals(BigInteger("21000000000000"), result[1].amount)
- assertEquals(BigInteger.valueOf(21_000), result[1].limit)
- assertEquals("0x9b1DB81180c31B1b428572Be105E209b5A6222b7", (feeService.gasLimitRequest[0] as Map<*, *>)["from"])
- assertEquals("0x0000000000000000000000000000000000002002", (feeService.gasLimitRequest[0] as Map<*, *>)["to"])
- assertEquals("0xa", (feeService.gasLimitRequest[0] as Map<*, *>)["value"])
- assertEquals("0xb", (feeService.gasLimitRequest[0] as Map<*, *>)["data"])
- }
-
- @Test
- fun testEvm_transfer_fee_calculation_network_fail_fee_history() {
- val feeService = FeeService(
- gasLimit = BigInteger.valueOf(21_000)
- )
- try {
- runBlocking {
- EvmFeeCalculator(
- feeService = feeService,
- callService = CallService(),
- coinType = CoinType.SMARTCHAIN,
- ).calculate(
- ConfirmParams.Builder(
- Chain.SmartChain.asset(),
- Account(Chain.SmartChain, "0x9b1DB81180c31B1b428572Be105E209b5A6222b7", ""),
- amount = BigInteger.TEN,
- ).transfer(
- DestinationAddress("0x9b1DB81180c31B1b428572Be105E209b5A6222b7")
- ),
- AssetId(Chain.SmartChain),
- "0x9b1DB81180c31B1b428572Be105E209b5A6222b7",
- outputAmount = BigInteger.TEN,
- null,
- chainId = Config().getChainConfig(Chain.SmartChain.string).networkId.toInt(),
- BigInteger.ZERO,
- )
- }
- assertTrue(false)
- } catch (err: Throwable) {
- assertEquals("Fee history fail", err.message)
- }
- }
-
- @Test
- fun testEvm_transfer_fee_calculation_network_fail_L1Fee() {
-
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/near/TestNearSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/near/TestNearSigner.kt
index 1db53eab5..599bf0690 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/near/TestNearSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/near/TestNearSigner.kt
@@ -1,6 +1,5 @@
package com.gemwallet.android.blockchain.clients.near
-import com.gemwallet.android.blockchain.clients.near.NearSignerPreloader.NearChainData
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
@@ -43,15 +42,14 @@ class TestNearSigner {
),
chainData = NearChainData(
block = "2ADR7pgpkd2uFFkQcAyCxL5YB4d9SewALTLEuFbUUJLe",
- sequence = 134180900000002,
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Near),
- amount = BigInteger.TEN
- ),
+ sequence = 134180900000002UL,
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Near),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/polkadot/TestPolkadotSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/polkadot/TestPolkadotSigner.kt
index 8f77cd239..5c9a4faad 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/polkadot/TestPolkadotSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/polkadot/TestPolkadotSigner.kt
@@ -1,10 +1,8 @@
package com.gemwallet.android.blockchain.clients.polkadot
-import com.gemwallet.android.blockchain.clients.polkadot.models.PolkadotSigningData
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
-import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ConfirmParams
import com.gemwallet.android.model.DestinationAddress
import com.gemwallet.android.model.Fee
@@ -41,33 +39,31 @@ class TestPolkadotSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = PolkadotSignerPreloaderClient.PolkadotChainData(
- sequence = 0,
- data = PolkadotSigningData(
- genesisHash = "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3",
- blockHash = "0x6e3ffeaa3be9d19bd110e5b6e7cbbc92cceed0d2ec557276c296bf7970ace2e5",
- blockNumber = BigInteger.valueOf(24666537),
- specVersion = BigInteger.valueOf(1003004),
- transactionVersion = BigInteger.valueOf(26),
- period = 64,
- ),
- blockNumber = 24666537,
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Polkadot),
- amount = BigInteger.TEN
- ),
+ chainData = PolkadotChainData(
+ sequence = 0UL,
+ genesisHash = "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3",
+ blockHash = "0x6e3ffeaa3be9d19bd110e5b6e7cbbc92cceed0d2ec557276c296bf7970ace2e5",
+ blockNumber = 24666537UL,
+ specVersion = 1003004UL,
+ transactionVersion = 26UL,
+ period = 64,
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Polkadot),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
- assertEquals("0x35028400cd3cfbbaa8f217c2a29ceae4b4063b597b629861916bad98f9826e03d1ab120e0" +
+ assertEquals(
+ "0x35028400cd3cfbbaa8f217c2a29ceae4b4063b597b629861916bad98f9826e03d1ab120e0" +
"0c094fad2608116257a997619a48d172340c69bca386c9f6b352903ee09a349b4ac90bff77872773" +
"1dac78a56b6c5d901af843ca9c9a69b9e46cca042c4f70c099502000000050000cd3cfbbaa8f217c" +
- "2a29ceae4b4063b597b629861916bad98f9826e03d1ab120e419c", sign.first().toHexString()
+ "2a29ceae4b4063b597b629861916bad98f9826e03d1ab120e419c",
+ String(sign.first())
)
}
}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaAccountsService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaAccountsService.kt
deleted file mode 100644
index 5399f416e..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaAccountsService.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.gemwallet.android.blockchain.clients.solana
-
-import com.gemwallet.android.blockchain.clients.solana.models.SolanaArrayData
-import com.gemwallet.android.blockchain.clients.solana.models.SolanaInfo
-import com.gemwallet.android.blockchain.clients.solana.models.SolanaParsedData
-import com.gemwallet.android.blockchain.clients.solana.models.SolanaParsedSplTokenInfo
-import com.gemwallet.android.blockchain.clients.solana.services.SolanaAccountsService
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.wallet.core.blockchain.solana.SolanaAccount
-import com.wallet.core.blockchain.solana.SolanaAccountParsed
-import com.wallet.core.blockchain.solana.SolanaAccountParsedInfo
-import com.wallet.core.blockchain.solana.SolanaTokenAccount
-import com.wallet.core.blockchain.solana.SolanaTokenAmount
-import com.wallet.core.blockchain.solana.SolanaTokenInfo
-import com.wallet.core.blockchain.solana.SolanaValue
-
-internal class TestSolanaAccountsService(
- private val tokenAddress: String? = null,
- private val owner: String = "",
-) : SolanaAccountsService {
- var tokenAccountRequest: JSONRpcRequest>? = null
-
- override suspend fun getTokenAccountByOwner(request: JSONRpcRequest>): JSONRpcResponse>> {
- tokenAccountRequest = request
- return JSONRpcResponse(
- SolanaValue(
- listOf(
- SolanaTokenAccount(
- pubkey = tokenAddress ?: "",
- account = SolanaAccount(
- lamports = 100000,
- space = 10,
- owner = owner,
- SolanaAccountParsed(
- SolanaAccountParsedInfo(
- SolanaTokenInfo(
- SolanaTokenAmount(tokenAddress ?: (request.params[1] as Map<*, *>)["mint"].toString())
- )
- )
- )
- )
- ),
- )
- )
- )
- }
-
- override suspend fun batchAccount(request: List>>): List>>> {
- return request.mapIndexed { index, request ->
- JSONRpcResponse(
- SolanaValue(
- listOf(
- SolanaTokenAccount(
- pubkey = tokenAddress ?: "",
- account = SolanaAccount(
- lamports = 100000,
- space = 10,
- owner = owner,
- data = SolanaAccountParsed(
- SolanaAccountParsedInfo(
- SolanaTokenInfo(
- SolanaTokenAmount(((index + 1) * 10000000).toString())
- )
- )
- )
- )
- )
- )
- )
- )
- }
- }
-
- override suspend fun getAccountInfoSpl(request: JSONRpcRequest>): JSONRpcResponse>>> {
- TODO("Not yet implemented")
- }
-
- override suspend fun getAccountInfoMpl(request: JSONRpcRequest>): JSONRpcResponse>> {
- TODO("Not yet implemented")
- }
-
- override suspend fun getTokenInfo(request: JSONRpcRequest>): JSONRpcResponse> {
- TODO("Not yet implemented")
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaBalances.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaBalances.kt
deleted file mode 100644
index cec76dad0..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaBalances.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.gemwallet.android.blockchain.clients.solana
-
-import com.gemwallet.android.blockchain.clients.solana.services.SolanaBalancesService
-import com.gemwallet.android.blockchain.clients.solana.services.SolanaStakeService
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.gemwallet.android.model.getTotalAmount
-import com.wallet.core.blockchain.solana.SolanaAccount
-import com.wallet.core.blockchain.solana.SolanaAccountParsed
-import com.wallet.core.blockchain.solana.SolanaAccountParsedInfo
-import com.wallet.core.blockchain.solana.SolanaBalance
-import com.wallet.core.blockchain.solana.SolanaBalanceValue
-import com.wallet.core.blockchain.solana.SolanaEpoch
-import com.wallet.core.blockchain.solana.SolanaRentExemptReserve
-import com.wallet.core.blockchain.solana.SolanaStake
-import com.wallet.core.blockchain.solana.SolanaStakeAccount
-import com.wallet.core.blockchain.solana.SolanaStakeDelegation
-import com.wallet.core.blockchain.solana.SolanaStakeInfo
-import com.wallet.core.blockchain.solana.SolanaValidator
-import com.wallet.core.blockchain.solana.SolanaValidators
-import com.wallet.core.blockchain.solana.SolanaValue
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-
-class TestSolanaBalances {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- private class TestBalancesService : SolanaBalancesService {
- var nativeRequest: JSONRpcRequest>? = null
- var tokenRequest: JSONRpcRequest>? = null
-
- override suspend fun getBalance(request: JSONRpcRequest>): Result> {
- nativeRequest = request
- return Result.success(
- JSONRpcResponse(
- SolanaBalance(1_000_000)
- )
- )
- }
-
- override suspend fun getTokenBalance(request: JSONRpcRequest>): Result>> {
- tokenRequest = request
- return Result.success(
- JSONRpcResponse(
- SolanaValue(
- SolanaBalanceValue(
- when (request.params[0]) {
- "HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3" -> "5000000"
- else -> "300000"
- }
- )
- )
- )
- )
- }
- }
-
- private class TestStakeService(
- private val delegationsResponse: JSONRpcResponse> = JSONRpcResponse(emptyList())
- ) : SolanaStakeService {
- var validatorsRequest: JSONRpcRequest>? = null
- var delegationsRequest: JSONRpcRequest>? = null
-
- override suspend fun validators(request: JSONRpcRequest>): Result> {
- validatorsRequest = request
- return Result.success(
- JSONRpcResponse(
- SolanaValidators(
- listOf(
- SolanaValidator("validatorPubKey", 10, true)
- )
- )
- )
- )
- }
-
- override suspend fun delegations(request: JSONRpcRequest>): Result>> {
- delegationsRequest = request
-
- return Result.success(delegationsResponse)
- }
-
- override suspend fun epoch(request: JSONRpcRequest>): Result> {
- return Result.success(
- JSONRpcResponse(
- SolanaEpoch(
- epoch = 10,
- slotsInEpoch = 1,
- slotIndex = 1,
- )
- )
- )
- }
- }
-
- @Test
- fun testSolana_balance_native() {
- val accountsService = TestSolanaAccountsService()
- val balancesService = TestBalancesService()
- val stakeService = TestStakeService()
-
- val balanceClient = SolanaBalanceClient(
- chain = Chain.Solana,
- accountsService = accountsService,
- balancesService = balancesService,
- stakeService = stakeService,
- )
- val result = runBlocking {
- balanceClient.getNativeBalance(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")
- }
- assertEquals("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", balancesService.nativeRequest!!.params[0])
- assertNotNull(result)
- assertEquals(AssetId(Chain.Solana), result!!.asset.id)
- assertEquals("1000000", result.balance.available)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.rewards)
- }
-
- @Test
- fun testSolana_balance_token() {
- val accountsService = TestSolanaAccountsService()
- val balancesService = TestBalancesService()
- val stakeService = TestStakeService()
-
- val balanceClient = SolanaBalanceClient(
- chain = Chain.Solana,
- accountsService = accountsService,
- balancesService = balancesService,
- stakeService = stakeService,
- )
- val result = runBlocking {
- balanceClient.getTokenBalances(
- Chain.Solana,
- "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh",
- listOf(
- Asset(
- id = AssetId(Chain.Solana, "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN"),
- name = "Jupiter",
- symbol = "JUP",
- decimals = 6,
- type = AssetType.TOKEN,
- ),
- Asset(
- id = AssetId(Chain.Solana, "HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3"),
- name = "Pyth Network ",
- symbol = "PYTH",
- decimals = 6,
- type = AssetType.TOKEN,
- ),
- )
- )
- }
- assertNotNull(result)
- assertEquals(2, result.size)
- assertEquals(AssetId(Chain.Solana, "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN"), result[0].asset.id)
- assertEquals(AssetId(Chain.Solana, "HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3"), result[1].asset.id)
- assertEquals("10000000", result[0].balance.available)
- assertEquals("20000000", result[1].balance.available)
- }
-
- @Test
- fun testSolana_balance_native_width_single_stake() {
- val accountsService = TestSolanaAccountsService()
- val balancesService = TestBalancesService()
- val stakeService = TestStakeService(
- delegationsResponse = JSONRpcResponse(
- listOf(
- SolanaStakeAccount(
- pubkey = "",
- account = SolanaAccount(
- lamports = 1000000L,
- space = 10,
- owner = "",
- data = SolanaAccountParsed(
- SolanaAccountParsedInfo(
- SolanaStakeInfo(
- SolanaStake(
- SolanaStakeDelegation("", "", "", ""),
- ),
- SolanaRentExemptReserve("")
- )
- )
- )
- )
- )
- )
-
- )
- )
-
- val balanceClient = SolanaBalanceClient(
- chain = Chain.Solana,
- accountsService = accountsService,
- balancesService = balancesService,
- stakeService = stakeService,
- )
- val result = runBlocking {
- balanceClient.getDelegationBalances(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")
- }
- assertNotNull(result)
- assertEquals(AssetId(Chain.Solana), result!!.asset.id)
- assertEquals("0", result.balance.available)
- assertEquals("1000000", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.rewards)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.001, result.balanceAmount.staked)
- assertEquals(0.001, result.balanceAmount.getTotalAmount())
- }
-
- @Test
- fun testSolana_balance_native_width_multi_stake() {
- val accountsService = TestSolanaAccountsService()
- val balancesService = TestBalancesService()
- val stakeService = TestStakeService(
- delegationsResponse = JSONRpcResponse(
- listOf(
- SolanaStakeAccount(
- pubkey = "",
- account = SolanaAccount(
- lamports = 1000000L,
- space = 10,
- owner = "",
- data = SolanaAccountParsed(
- SolanaAccountParsedInfo(
- SolanaStakeInfo(
- SolanaStake(
- SolanaStakeDelegation("", "", "", ""),
- ),
- SolanaRentExemptReserve("")
- )
- )
- )
- )
- ),
- SolanaStakeAccount(
- pubkey = "",
- account = SolanaAccount(
- lamports = 2000000,
- space = 20,
- owner = "",
- data = SolanaAccountParsed(
- SolanaAccountParsedInfo(
- SolanaStakeInfo(
- SolanaStake(
- SolanaStakeDelegation("", "", "", ""),
- ),
- SolanaRentExemptReserve("")
- )
- )
- )
- )
- )
- )
- )
- )
-
- val balanceClient = SolanaBalanceClient(
- chain = Chain.Solana,
- accountsService = accountsService,
- balancesService = balancesService,
- stakeService = stakeService,
- )
- val result = runBlocking {
- balanceClient.getDelegationBalances(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")
- }
- assertNotNull(result)
- assertEquals(AssetId(Chain.Solana), result!!.asset.id)
- assertEquals("0", result.balance.available)
- assertEquals("3000000", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.rewards)
- assertEquals(0.0, result.balanceAmount.available)
- assertEquals(0.003, result.balanceAmount.staked)
- assertEquals(0.003, result.balanceAmount.getTotalAmount())
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaFeeCalculation.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaFeeCalculation.kt
deleted file mode 100644
index 0c2dc7496..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaFeeCalculation.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.gemwallet.android.blockchain.clients.solana
-
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.DestinationAddress
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import java.math.BigInteger
-
-class TestSolanaFeeCalculation {
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testSolana_calculate_native_fee() {
- val feeCalculator = SolanaFeeCalculator(TestSolanaFeeService())
-
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- asset = Chain.Solana.asset(),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- ).transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh"))
- )
- }
- assertEquals(BigInteger("100005000"), result[1].amount)
- assertEquals(BigInteger("1000000000"), result[1].minerFee)
- assertEquals(BigInteger("5000"), result[1].maxGasPrice)
- assertEquals(BigInteger("100000"), result[1].limit)
- assertEquals(BigInteger("30"), result[1].options["tokenAccountCreation"])
- }
-
- @Test
- fun testSolana_calculate_native_fee_without_priority_fee() {
- val feeCalculator = SolanaFeeCalculator(TestSolanaFeeService(fees = emptyList()))
-
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- asset = Chain.Solana.asset(),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- ).transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh"))
- )
- }
- assertEquals(BigInteger("10000"), result[1].amount)
- assertEquals(BigInteger("50000"), result[1].minerFee)
- assertEquals(BigInteger("5000"), result[1].maxGasPrice)
- assertEquals(BigInteger("100000"), result[1].limit)
- assertEquals(BigInteger("30"), result[1].options["tokenAccountCreation"])
- }
-
- @Test
- fun testSolana_calculate_native_fee_without_create() {
- val feeCalculator = SolanaFeeCalculator(TestSolanaFeeService(fees = emptyList()))
-
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- asset = Chain.Solana.asset(),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- ).transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh"))
- )
- }
- assertEquals(BigInteger("10000"), result[1].amount)
- assertEquals(BigInteger("50000"), result[1].minerFee)
- assertEquals(BigInteger("5000"), result[1].maxGasPrice)
- assertEquals(BigInteger("100000"), result[1].limit)
- assertEquals(BigInteger("0"), result[1].options["tokenAccountCreation"])
- }
-
- @Test
- fun testSolana_calculate_token_fee_without_create() {
- val feeCalculator = SolanaFeeCalculator(TestSolanaFeeService(listOf(100, 200)))
-
- val result = runBlocking {
- feeCalculator.calculate(
- ConfirmParams.Builder(
- asset = Asset(AssetId(Chain.Solana, "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"), name = "usdt", symbol = "usdt", decimals = 8, type = AssetType.TOKEN),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- ).transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh"))
- )
- }
- assertEquals(BigInteger("15000"), result[1].amount)
- assertEquals(BigInteger("100000"), result[1].minerFee)
- assertEquals(BigInteger("5000"), result[1].maxGasPrice)
- assertEquals(BigInteger("100000"), result[1].limit)
- assertEquals(BigInteger("30"), result[1].options["tokenAccountCreation"])
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaFeeService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaFeeService.kt
deleted file mode 100644
index 5ce88aea8..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaFeeService.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gemwallet.android.blockchain.clients.solana
-
-import com.gemwallet.android.blockchain.clients.solana.services.SolanaFeeService
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.wallet.core.blockchain.solana.SolanaPrioritizationFee
-
-internal class TestSolanaFeeService(
- private val fees: List = listOf(100000000, 2000000000),
-) : SolanaFeeService {
-
- override suspend fun getPriorityFees(request: JSONRpcRequest>): Result>> {
- return Result.success(JSONRpcResponse(fees.map { SolanaPrioritizationFee(it) }))
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSignPreloader.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSignPreloader.kt
deleted file mode 100644
index 225f9dfcf..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSignPreloader.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gemwallet.android.blockchain.clients.solana
-
-import com.gemwallet.android.blockchain.clients.solana.services.SolanaNetworkInfoService
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcResponse
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.DestinationAddress
-import com.wallet.core.blockchain.solana.SolanaBlockhash
-import com.wallet.core.blockchain.solana.SolanaBlockhashResult
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.SolanaTokenProgramId
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import java.math.BigInteger
-
-class TestSolanaSignPreloader {
-
- companion object {
- init {
- includeLibs()
- }
- }
-
- private class TestSolanaNetworkInfoService(
- val blockhash: String = "",
- ) : SolanaNetworkInfoService {
-
- override suspend fun getBlockhash(request: JSONRpcRequest>): Result> {
- return Result.success(JSONRpcResponse(SolanaBlockhashResult(SolanaBlockhash(blockhash))))
- }
-
- }
-
- @Test
- fun testSolana_netive_transfer_preload() {
- val preloader = SolanaSignerPreloader(
- chain = Chain.Solana,
- feeService = TestSolanaFeeService(),
- networkInfoService = TestSolanaNetworkInfoService(blockhash = "123"),
- accountsService = TestSolanaAccountsService(),
- )
-
- val result = runBlocking {
- preloader.preloadNativeTransfer(
- ConfirmParams.Builder(
- asset = Chain.Solana.asset(),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- )
- .transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")) as ConfirmParams.TransferParams.Native
- )
- }
- assertEquals(BigInteger("100005000"), result.chainData.gasFee().amount)
- assertEquals("123", (result.chainData as SolanaSignerPreloader.SolanaChainData).blockhash)
- assertEquals(SolanaTokenProgramId.Token, (result.chainData as SolanaSignerPreloader.SolanaChainData).tokenProgram)
- assertEquals(null, (result.chainData as SolanaSignerPreloader.SolanaChainData).recipientTokenAddress)
- assertEquals("", (result.chainData as SolanaSignerPreloader.SolanaChainData).senderTokenAddress)
- }
-
- @Test
- fun testSolana_transfer_token_preload() {
- val preloader = SolanaSignerPreloader(
- chain = Chain.Solana,
- feeService = TestSolanaFeeService(),
- networkInfoService = TestSolanaNetworkInfoService(blockhash = "123"),
- accountsService = TestSolanaAccountsService(
- "DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo",
- "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
- ),
- )
-
- val result = runBlocking {
- preloader.preloadTokenTransfer(
- ConfirmParams.Builder(
- asset = Asset(AssetId(Chain.Solana, "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"), name = "usdt", symbol = "usdt", decimals = 8, type = AssetType.TOKEN),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- )
- .transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")) as ConfirmParams.TransferParams.Token
- )
- }
- assertEquals(BigInteger("100005000"), result.chainData.gasFee().amount)
- assertEquals("123", (result.chainData as SolanaSignerPreloader.SolanaChainData).blockhash)
- assertEquals(SolanaTokenProgramId.Token, (result.chainData as SolanaSignerPreloader.SolanaChainData).tokenProgram)
- assertEquals("DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo", (result.chainData as SolanaSignerPreloader.SolanaChainData).recipientTokenAddress)
- assertEquals("DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo", (result.chainData as SolanaSignerPreloader.SolanaChainData).senderTokenAddress)
- }
-
- @Test
- fun testSolana_transfer_token2022_preload() {
- val preloader = SolanaSignerPreloader(
- chain = Chain.Solana,
- feeService = TestSolanaFeeService(),
- networkInfoService = TestSolanaNetworkInfoService(blockhash = "123"),
- accountsService = TestSolanaAccountsService(
- "87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ",
- "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
- ),
- )
-
- val result = runBlocking {
- preloader.preloadTokenTransfer(
- ConfirmParams.Builder(
- asset = Asset(AssetId(Chain.Solana, "2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo"), name = "smt", symbol = "", decimals = 8, type = AssetType.TOKEN),
- from = Account(Chain.Solana, "AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh", ""),
- amount = BigInteger.valueOf(10_000_000)
- )
- .transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")) as ConfirmParams.TransferParams.Token
- )
- }
- assertEquals(BigInteger("100005000"), result.chainData.gasFee().amount)
- assertEquals("123", (result.chainData as SolanaSignerPreloader.SolanaChainData).blockhash)
- assertEquals(SolanaTokenProgramId.Token2022, (result.chainData as SolanaSignerPreloader.SolanaChainData).tokenProgram)
- assertEquals("87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ", (result.chainData as SolanaSignerPreloader.SolanaChainData).recipientTokenAddress)
- assertEquals("87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ", (result.chainData as SolanaSignerPreloader.SolanaChainData).senderTokenAddress)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSigner.kt
index 144dae779..643bd066d 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/solana/TestSolanaSigner.kt
@@ -46,14 +46,22 @@ class TestSolanaSigner {
}
)
val params = ConfirmParams.Builder(
- asset = Chain.Solana.asset(),
- from = Account(Chain.Solana, "4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S", ""),
- amount = BigInteger.valueOf(10_000_000)
- )
+ asset = Chain.Solana.asset(),
+ from = Account(Chain.Solana, "4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S", ""),
+ amount = BigInteger.valueOf(10_000_000)
+ )
.transfer(destination = DestinationAddress("4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S")) as ConfirmParams.TransferParams.Native
- val chainData = SolanaSignerPreloader.SolanaChainData(
+ val chainData = SolanaChainData(
blockhash = "kiEPF6aKvEsj5nbi4FBvgRRm9ha36Y3cgDU9qnUKt32",
- fees = listOf(
+ recipientTokenAddress = null,
+ senderTokenAddress = "",
+ tokenProgram = SolanaTokenProgramId.Token
+ )
+ val result = runBlocking {
+ signer.signNativeTransfer(
+ params,
+ chainData,
+ BigInteger.ZERO,
GasFee(
amount = BigInteger("105005000"),
minerFee = BigInteger("1050000000"),
@@ -62,22 +70,21 @@ class TestSolanaSigner {
feeAssetId = AssetId(Chain.Solana),
priority = FeePriority.Normal,
),
- ),
- recipientTokenAddress = null,
- senderTokenAddress = "",
- tokenProgram = SolanaTokenProgramId.Token
+ privateKey
+ )
+ }
+ assertEquals(
+ "0x4159436b734f696556323339774436566c6841614a41464844544a647a632f61577a3331" +
+ "6f693676686e783978676d4c544a5372643165504634454e73734a704867667575424e6e55556b3" +
+ "159304a52784e504a59513442414149455365626b44466a2b415242396b4b486b394f4167745057" +
+ "456e614370426a475a3869707a61372f4e43577330767554324f647746546758414767305a61753" +
+ "17474703157354f7153437a77434c53384e5738357a71514d47526d2f6c495263792f2b7974756e" +
+ "4c446d2b65386a4f573778666353617978446d7a704141414141414141414141414141414141414" +
+ "141414141414141414141414141414141414141414141414141414141414c4d706730536d427863" +
+ "684e486e756872566468464259677863634c722b5370616932436959444a4b51514d4341416b446" +
+ "74c71565067414141414143414155436f49594241414d434141454d416741414141414141414141" +
+ "41414141", result.first().toHexString()
)
- val result = runBlocking { signer.signNativeTransfer(params, chainData, BigInteger.ZERO, FeePriority.Normal, privateKey) }
- assertEquals("0x4159436b734f696556323339774436566c6841614a41464844544a647a632f61577a3331" +
- "6f693676686e783978676d4c544a5372643165504634454e73734a704867667575424e6e55556b3" +
- "159304a52784e504a59513442414149455365626b44466a2b415242396b4b486b394f4167745057" +
- "456e614370426a475a3869707a61372f4e43577330767554324f647746546758414767305a61753" +
- "17474703157354f7153437a77434c53384e5738357a71514d47526d2f6c495263792f2b7974756e" +
- "4c446d2b65386a4f573778666353617978446d7a704141414141414141414141414141414141414" +
- "141414141414141414141414141414141414141414141414141414141414c4d706730536d427863" +
- "684e486e756872566468464259677863634c722b5370616932436959444a4b51514d4341416b446" +
- "74c71565067414141414143414155436f49594241414d434141454d416741414141414141414141" +
- "41414141", result.first().toHexString())
}
@Test
@@ -95,14 +102,28 @@ class TestSolanaSigner {
}
)
val params = ConfirmParams.Builder(
- asset = Asset(AssetId(Chain.Solana, "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"), "", "", 8, AssetType.TOKEN),
- from = Account(Chain.Solana, "4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S", ""),
- amount = BigInteger.valueOf(10_000_000)
- )
+ asset = Asset(
+ AssetId(Chain.Solana, "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"),
+ "",
+ "",
+ 8,
+ AssetType.TOKEN
+ ),
+ from = Account(Chain.Solana, "4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S", ""),
+ amount = BigInteger.valueOf(10_000_000)
+ )
.transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")) as ConfirmParams.TransferParams.Token
- val chainData = SolanaSignerPreloader.SolanaChainData(
+ val chainData = SolanaChainData(
blockhash = "kiEPF6aKvEsj5nbi4FBvgRRm9ha36Y3cgDU9qnUKt32",
- fees = listOf(
+ recipientTokenAddress = "DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo",
+ senderTokenAddress = "DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo",
+ tokenProgram = SolanaTokenProgramId.Token
+ )
+ val result = runBlocking {
+ signer.signTokenTransfer(
+ params,
+ chainData,
+ BigInteger.ZERO,
GasFee(
amount = BigInteger("105005000"),
minerFee = BigInteger("1050000000"),
@@ -110,24 +131,23 @@ class TestSolanaSigner {
limit = BigInteger("100000"),
feeAssetId = AssetId(Chain.Solana),
priority = FeePriority.Normal,
- )
- ),
- recipientTokenAddress = "DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo",
- senderTokenAddress = "DVWPV7brSbPDkA7a3qdn6UJsVc3J3DyhQhjNaZeZqwzo",
- tokenProgram = SolanaTokenProgramId.Token
+ ),
+ privateKey
+ )
+ }
+ assertEquals(
+ "0x416238786c7268464374766e72677357477874416f6b6852423654737057545862643066" +
+ "6e31557835466c736b734b317838714d6668326e313662454d384d6b6a4a4d467450664b7046684" +
+ "25a376576716557713051514241414d465365626b44466a2b415242396b4b486b394f4167745057" +
+ "456e614370426a475a3869707a61372f4e435775356d6277492b744e3454586473757149654b725" +
+ "254647a734b644444707a385843635179334a766a50304d3442446d43763762496e4637316a4753" +
+ "395546466f2f6c6c6f7a75344c5378774b657373346549494a6b41775a47622b5568467a4c2f374" +
+ "b323663734f623537794d3562764639784a724c454f624f6b41414141414733666268313257686b" +
+ "396e4c3455624f36336d73484c5346375639624e3545366a50574666763841715173796d44524b5" +
+ "948467945306565364774563245554669444678777576354b6c714c594b4a674d6b704241774d41" +
+ "43514f417570552b4141414141414d4142514b67686745414241514241674541436777414141414" +
+ "1414141414141593d", result.first().toHexString()
)
- val result = runBlocking { signer.signTokenTransfer(params, chainData, BigInteger.ZERO, FeePriority.Normal, privateKey) }
- assertEquals("0x416238786c7268464374766e72677357477874416f6b6852423654737057545862643066" +
- "6e31557835466c736b734b317838714d6668326e313662454d384d6b6a4a4d467450664b7046684" +
- "25a376576716557713051514241414d465365626b44466a2b415242396b4b486b394f4167745057" +
- "456e614370426a475a3869707a61372f4e435775356d6277492b744e3454586473757149654b725" +
- "254647a734b644444707a385843635179334a766a50304d3442446d43763762496e4637316a4753" +
- "395546466f2f6c6c6f7a75344c5378774b657373346549494a6b41775a47622b5568467a4c2f374" +
- "b323663734f623537794d3562764639784a724c454f624f6b41414141414733666268313257686b" +
- "396e4c3455624f36336d73484c5346375639624e3545366a50574666763841715173796d44524b5" +
- "948467945306565364774563245554669444678777576354b6c714c594b4a674d6b704241774d41" +
- "43514f417570552b4141414141414d4142514b67686745414241514241674541436777414141414" +
- "1414141414141593d", result.first().toHexString())
}
@Test
@@ -145,14 +165,28 @@ class TestSolanaSigner {
}
)
val params = ConfirmParams.Builder(
- asset = Asset(AssetId(Chain.Solana, "2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo"), "", "", 8, AssetType.TOKEN),
- from = Account(Chain.Solana, "4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S", ""),
- amount = BigInteger.valueOf(10_000_000)
- )
+ asset = Asset(
+ AssetId(Chain.Solana, "2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo"),
+ "",
+ "",
+ 8,
+ AssetType.TOKEN
+ ),
+ from = Account(Chain.Solana, "4Yu2e1Wz5T1Ci2hAPswDqvMgSnJ1Ftw7ZZh8x7xKLx7S", ""),
+ amount = BigInteger.valueOf(10_000_000)
+ )
.transfer(destination = DestinationAddress("AGkXQZ9qm99xukisDUHvspWHESrcjs8Y4AmQQgef3BRh")) as ConfirmParams.TransferParams.Token
- val chainData = SolanaSignerPreloader.SolanaChainData(
+ val chainData = SolanaChainData(
blockhash = "kiEPF6aKvEsj5nbi4FBvgRRm9ha36Y3cgDU9qnUKt32",
- fees = listOf(
+ recipientTokenAddress = "87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ",
+ senderTokenAddress = "87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ",
+ tokenProgram = SolanaTokenProgramId.Token2022
+ )
+ val result = runBlocking {
+ signer.signTokenTransfer(
+ params,
+ chainData,
+ BigInteger.ZERO,
GasFee(
amount = BigInteger("105005000"),
minerFee = BigInteger("1050000000"),
@@ -161,23 +195,22 @@ class TestSolanaSigner {
feeAssetId = AssetId(Chain.Solana),
priority = FeePriority.Normal,
),
- ),
- recipientTokenAddress = "87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ",
- senderTokenAddress = "87vTugUvkkepa84mBRfENnvkPQRj5EZSkiG8XyFAhbQQ",
- tokenProgram = SolanaTokenProgramId.Token2022
+ privateKey
+ )
+ }
+ assertEquals(
+ "0x4152744d346e59365642416d427563754c675a7759623165304764516d6b782b6251764f" +
+ "6241657558466e6a4b5a4744507930653972305249444f384757705056384439453345754b33416" +
+ "e492b354b6b6d72485667414241414d465365626b44466a2b415242396b4b486b394f4167745057" +
+ "456e614370426a475a3869707a61372f4e43577470783737467363375a7773776d4234324a65393" +
+ "04538487a622b59486131534a74465451777a385351705265535344747369697148743063646755" +
+ "2b566b666b355849514b6e4f505a394e57366654704c696e536541775a47622b5568467a4c2f374" +
+ "b323663734f623537794d3562764639784a724c454f624f6b41414141414733666268376e575033" +
+ "68684358627a6b624d33617468723854594f354453662b76666b6f324b474c2f4173796d44524b5" +
+ "948467945306565364774563245554669444678777576354b6c714c594b4a674d6b704241774d41" +
+ "43514f417570552b4141414141414d4142514b67686745414241514241674541436777414141414" +
+ "1414141414141593d", result.first().toHexString()
)
- val result = runBlocking { signer.signTokenTransfer(params, chainData, BigInteger.ZERO, FeePriority.Normal, privateKey) }
- assertEquals("0x4152744d346e59365642416d427563754c675a7759623165304764516d6b782b6251764f" +
- "6241657558466e6a4b5a4744507930653972305249444f384757705056384439453345754b33416" +
- "e492b354b6b6d72485667414241414d465365626b44466a2b415242396b4b486b394f4167745057" +
- "456e614370426a475a3869707a61372f4e43577470783737467363375a7773776d4234324a65393" +
- "04538487a622b59486131534a74465451777a385351705265535344747369697148743063646755" +
- "2b566b666b355849514b6e4f505a394e57366654704c696e536541775a47622b5568467a4c2f374" +
- "b323663734f623537794d3562764639784a724c454f624f6b41414141414733666268376e575033" +
- "68684358627a6b624d33617468723854594f354453662b76666b6f324b474c2f4173796d44524b5" +
- "948467945306565364774563245554669444678777576354b6c714c594b4a674d6b704241774d41" +
- "43514f417570552b4141414141414d4142514b67686745414241514241674541436777414141414" +
- "1414141414141593d", result.first().toHexString())
}
@Test
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/stellar/TestStellarSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/stellar/TestStellarSigner.kt
index 3c85574ae..0949c1649 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/stellar/TestStellarSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/stellar/TestStellarSigner.kt
@@ -1,7 +1,7 @@
package com.gemwallet.android.blockchain.clients.Stellar
+import com.gemwallet.android.blockchain.clients.stellar.StellarChainData
import com.gemwallet.android.blockchain.clients.stellar.StellarSignClient
-import com.gemwallet.android.blockchain.clients.stellar.StellarSignPreloadClient
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
@@ -42,18 +42,16 @@ class TestStellarSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = StellarSignPreloadClient.StellarChainData(
- sequence = 1,
- fees = listOf(
- Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Stellar),
- amount = BigInteger.TEN
- ),
- ),
+ chainData = StellarChainData(
+ sequence = 1UL,
+ isDestinationAddressExist = true,
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Stellar),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/sui/TestSuiSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/sui/TestSuiSigner.kt
index 11fd6eee3..cbf25edf0 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/sui/TestSuiSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/sui/TestSuiSigner.kt
@@ -42,21 +42,20 @@ class TestSuiSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = SuiSignerPreloader.SuiChainData(
+ chainData = SuiChainData(
messageBytes = "AAACAAgAypo7AAAAAAAgLuHnHoVlKe7YHnpDy6mnmWueg/fpbWoPf2pUAO0b" +
"wWgCAgABAQAAAQEDAAAAAAEBAC7h5x6FZSnu2B56Q8upp5lrnoP36W1qD39qVADtG8F" +
"oAS2bHegcizOpgucdlh7PdMz4cCyV89Xv8+pSQHYdUVM07UIbGgAAAAAgbiAG3TMqRi" +
"5eRLenwRl5FY6EUk6/RG4a4cjnsc8KNU0u4ecehWUp7tgeekPLqaeZa56D9+ltag9/a" +
"lQA7RvBaO4CAAAAAAAAQHh9AQAAAAAA_0xc6af5cd37f2bab89411aff2a642522f88" +
"6e3a8bdfea1d0549729e99f3a241bd5",
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Sui),
- amount = BigInteger.TEN
- ),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Sui),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
@@ -89,7 +88,7 @@ class TestSuiSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = SuiSignerPreloader.SuiChainData(
+ chainData = SuiChainData(
messageBytes = "AAAEAQA+cu/kqxz/pp3Qmo6eoLJz+so76TaSloB1SmEUVhWCaUYoGhwAAAAAI" +
"BtZ+Y3WbB+PQtHrS7YgMDZGLzVxrT20trS/6hpbAEmBAQC01EdV46fEpnMdgod7BT2jJ" +
"F0uO3bB4vxKQwUM5D5LgUYoGhwAAAAAIG7IzS1+nt9AlH/Ky7M7uvu/hnOkXUjbo13FT" +
@@ -99,14 +98,13 @@ class TestSuiSigner {
"+S2gTgAQzNMurZ1aIQOw24OKmyO5LC3mt0mBR+cLuHnHoVlKe7YHnpDy6mnmWueg/fpb" +
"WoPf2pUAO0bwWjuAgAAAAAAAEB4fQEAAAAAAA==_0xd3877ebdd9f50a6d7d919d6e28" +
"a26dd62ec43db0986466a35fa78c84394d3046",
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Sui),
- amount = BigInteger.TEN
- ),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Sui),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/ton/TestTonSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/ton/TestTonSigner.kt
index d2dab1666..530953017 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/ton/TestTonSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/ton/TestTonSigner.kt
@@ -42,17 +42,16 @@ class TestTonSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = TonSignerPreloader.TonChainData(
- sequence = 1,
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Ton),
- amount = BigInteger.TEN
- ),
+ chainData = TonChainData(
+ sequence = 1UL,
expireAt = 1000000000,
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Ton),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
@@ -81,18 +80,17 @@ class TestTonSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = TonSignerPreloader.TonChainData(
- sequence = 1,
+ chainData = TonChainData(
+ sequence = 1UL,
jettonAddress = "EQAlgB03OjJKdXrlwZiGJD5snSzPKF2VL5bErJn_cqJANGH9",
expireAt = 1000000000,
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Ton),
- amount = BigInteger.TEN
- ),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Ton),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronAccountService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronAccountService.kt
deleted file mode 100644
index 68094d89b..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronAccountService.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.gemwallet.android.blockchain.clients.tron
-
-import com.gemwallet.android.blockchain.clients.tron.services.TronAccountsService
-import com.wallet.core.blockchain.tron.TronAccount
-import com.wallet.core.blockchain.tron.TronAccountRequest
-import com.wallet.core.blockchain.tron.TronAccountUsage
-
-class FakeTronAccountService(
- private val tronAccount: TronAccount? = null
-) : TronAccountsService {
- var accountRequest: TronAccountRequest? = null
- var usageRequest: TronAccountRequest? = null
-
- override suspend fun getAccount(addressRequest: TronAccountRequest): Result {
- this.accountRequest = addressRequest
- return Result.success(tronAccount ?: return Result.failure(Exception()))
- }
-
- override suspend fun getAccountUsage(addressRequest: TronAccountRequest): Result {
- this.usageRequest = addressRequest
-
- return Result.success(
- TronAccountUsage(
- freeNetUsed = 1,
- freeNetLimit = 2,
- )
- )
- }
-
-
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronCallService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronCallService.kt
deleted file mode 100644
index daa6a7a0b..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronCallService.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.gemwallet.android.blockchain.clients.tron
-
-import com.gemwallet.android.blockchain.clients.tron.services.TronCallService
-import com.wallet.core.blockchain.tron.TronSmartContractResult
-
-class FakeTronCallService(
- val responses: Map = emptyMap()
-) : TronCallService {
- val requests = mutableListOf>()
-
- override suspend fun triggerSmartContract(request: Any): Result {
- requests.add(request as Map)
- return Result.success(responses[request["contract_address"] ?: throw Exception()]
- ?: return Result.failure(Exception()))
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronNodeStatusService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronNodeStatusService.kt
deleted file mode 100644
index 9afc7fe6f..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronNodeStatusService.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gemwallet.android.blockchain.clients.tron
-
-import com.gemwallet.android.blockchain.clients.tron.services.TronNodeStatusService
-import com.wallet.core.blockchain.tron.TronBlock
-import com.wallet.core.blockchain.tron.TronChainParameter
-import com.wallet.core.blockchain.tron.TronChainParameters
-import com.wallet.core.blockchain.tron.TronHeader
-import com.wallet.core.blockchain.tron.TronHeaderRawData
-import retrofit2.Response
-
-private val chainParamters = TronChainParameters(
- listOf(
- TronChainParameter("getCreateNewAccountFeeInSystemContract", 1000000),
- TronChainParameter("getCreateAccountFee", 100000),
- TronChainParameter("getEnergyFee", 210),
- )
-)
-
-class FakeTronNodeStatusService(
- private val chainParameters: TronChainParameters? = chainParamters,
- private val tronBlock: TronBlock? = TronBlock(
- TronHeaderRawData(
- TronHeader(
- number = 67978303,
- version = 31,
- txTrieRoot = "e02c6d0bab5f0c6d1f61051646535ed76f6e1ef0db5c32069cf612123ce976b3",
- witness_address = "41c05142fd1ca1e03688a43585096866ae658f2cb2",
- parentHash = "00000000040d443e37c9fcdfb11ba6fb9ed08682f0f492b3b4ab6639b9198694",
- timestamp = 1734585603000,
- )
- )
- ),
-) : TronNodeStatusService {
-
- override suspend fun getChainParameters(): Result {
- return Result.success(chainParameters ?: return Result.failure(Exception()))
- }
-
- override suspend fun nowBlock(): Result {
- return Result.success(tronBlock ?: return Result.failure(Exception()))
- }
-
- override suspend fun nowBlock(url: String): Response {
- TODO("Not yet implemented")
- }
-
-
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronStakeService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronStakeService.kt
deleted file mode 100644
index c84a3f286..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/FakeTronStakeService.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gemwallet.android.blockchain.clients.tron
-
-import com.gemwallet.android.blockchain.clients.tron.services.TronStakeService
-import com.wallet.core.blockchain.tron.TronReward
-import com.wallet.core.blockchain.tron.WitnessesList
-
-class FakeTronStakeService(
- private val reward: Long? = null
-) : TronStakeService {
- var addressRequest: String? = null
-
-
- override suspend fun listwitnesses(): Result {
- TODO("Not yet implemented")
- }
-
- override suspend fun getReward(address: String): Result {
- addressRequest = address
- return Result.success(TronReward(reward ?: return Result.failure(Exception())))
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronBalance.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronBalance.kt
deleted file mode 100644
index 642d0fa79..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronBalance.kt
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.gemwallet.android.blockchain.clients.tron
-
-import com.gemwallet.android.blockchain.includeLibs
-import com.wallet.core.blockchain.tron.TronAccount
-import com.wallet.core.blockchain.tron.TronFrozen
-import com.wallet.core.blockchain.tron.TronSmartContractResult
-import com.wallet.core.blockchain.tron.TronSmartContractResultMessage
-import com.wallet.core.blockchain.tron.TronUnfrozen
-import com.wallet.core.blockchain.tron.TronVote
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-
-class TestTronBalance {
- companion object {
- init {
- includeLibs()
- }
- }
-
- val stakeService = FakeTronStakeService(0xF4240)
-
- @Test
- fun testTron_native_balance_success_and_not_empty() {
- val accountService = FakeTronAccountService(
- TronAccount(
- balance = 1_000_000,
- )
- )
- val callService = FakeTronCallService()
- val balanceClient = TronBalanceClient(Chain.Tron, accountService, callService, FakeTronStakeService())
- val result = runBlocking { balanceClient.getNativeBalance(Chain.Tron, "TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU") }
- assertEquals("TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU", accountService.accountRequest?.address)
- assertTrue(accountService.accountRequest!!.visible)
- assertNotNull(result)
- assertEquals(AssetId(Chain.Tron), result!!.asset.id)
- assertEquals("1000000", result.balance.available)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.pending)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.rewards)
- assertEquals(1.0, result.balanceAmount.available)
- assertEquals(1.0, result.totalAmount)
- }
-
- @Test
- fun testTron_native_balance_success_and_empty() {
- val accountService = FakeTronAccountService(
- TronAccount()
- )
- val callService = FakeTronCallService()
- val balanceClient = TronBalanceClient(Chain.Tron, accountService, callService, FakeTronStakeService())
- val result = runBlocking { balanceClient.getNativeBalance(Chain.Tron, "TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU") }
- assertNull(result)
- }
-
- @Test
- fun testTron_native_balance_fail() {
- val accountService = FakeTronAccountService()
- val callService = FakeTronCallService()
- val balanceClient = TronBalanceClient(Chain.Tron, accountService, callService, stakeService)
- val result = runBlocking { balanceClient.getNativeBalance(Chain.Tron, "") }
- assertNull(result)
- }
-
- @Test
- fun testTron_token_balance_success() {
- val assets = listOf(
- Asset(
- id = AssetId(Chain.Tron, "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"),
- decimals = 6,
- name = "Tether USD",
- symbol = "USDT",
- type = AssetType.TRC20,
- ),
- Asset(
- id = AssetId(Chain.Tron, "TAFjULxiVgT4qWk6UZwjqwZXTSaGaqnVp4"),
- decimals = 18,
- name = "BitTorrent",
- symbol = "BTT",
- type = AssetType.TRC20,
- ),
- Asset(
- id = AssetId(Chain.Tron, "TG6jUMfwpwR9QNFsSwCGtLaV2TR2gV8yru"),
- decimals = 6,
- name = "Wrapped TRX",
- symbol = "WTRX",
- type = AssetType.TRC20,
- ),
- )
- val accountService = FakeTronAccountService(TronAccount(balance = 1_000_000))
- val callService = FakeTronCallService(
- mapOf(
- "41a614f803b6fd780986a42c78ec9c7f77e6ded13c" to TronSmartContractResult(
- result = TronSmartContractResultMessage(true),
- constant_result = listOf("F4240"),
- energy_used = 1,
- ),
- "41032017411f4663b317fe77c257d28d5cd1b26e3d" to TronSmartContractResult(
- result = TronSmartContractResultMessage(true),
- constant_result = listOf("DE0B6B3A7640000"),
- energy_used = 1,
- ),
- "41433d1a20a144c3b064e9371bca739f960900f409" to TronSmartContractResult(
- result = TronSmartContractResultMessage(true),
- constant_result = listOf("3000000"),
- energy_used = 1,
- ),
- )
- )
- val balanceClient = TronBalanceClient(Chain.Tron, accountService, callService, stakeService)
- val result = runBlocking { balanceClient.getTokenBalances(Chain.Tron, "TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU", assets) }
- assertEquals("41a614f803b6fd780986a42c78ec9c7f77e6ded13c", callService.requests[0]["contract_address"])
- assertEquals("41032017411f4663b317fe77c257d28d5cd1b26e3d", callService.requests[1]["contract_address"])
- assertEquals("41433d1a20a144c3b064e9371bca739f960900f409", callService.requests[2]["contract_address"])
- assertEquals(false, callService.requests[0]["visible"])
- assertEquals(0L, callService.requests[0]["call_value"])
- assertEquals("4187b59ec7bb58250533fb8235f9a3f8eec9c1bfe8", callService.requests[0]["owner_address"])
- assertEquals(1_000_000L, callService.requests[0]["fee_limit"])
- assertEquals("balanceOf(address)", callService.requests[0]["function_selector"])
- assertEquals("00000000000000000000004187b59ec7bb58250533fb8235f9a3f8eec9c1bfe8", callService.requests[0]["parameter"])
-
- assertNotNull(result)
- assertEquals(3, result.size)
- assertEquals("1000000", result[0].balance.available)
- assertEquals(1.0, result[0].balanceAmount.available)
- assertEquals("1000000000000000000", result[1].balance.available)
- assertEquals(1.0, result[1].balanceAmount.available)
- assertEquals("50331648", result[2].balance.available)
- assertEquals(50.331648, result[2].balanceAmount.available)
- }
-
- @Test
- fun testTron_stake_balance_success() {
- val accountService = FakeTronAccountService(
- TronAccount(
- balance = 1_000_000,
- frozenV2 = listOf(
- TronFrozen(
- amount = 0xF4240,
- ),
- TronFrozen(
- amount = 0x1E8480,
- ),
- ),
- unfrozenV2 = listOf(
- TronUnfrozen(
- unfreeze_amount = 0x2DC6C0
- ),
- TronUnfrozen(
- unfreeze_amount = 0x3D0900
- ),
- ),
- votes = listOf(
- TronVote(
- vote_address = "",
- vote_count = 1,
- ),
- TronVote(
- vote_address = "",
- vote_count = 2,
- ),
- TronVote(
- vote_address = "",
- vote_count = 3,
- ),
- )
- )
- )
- val callService = FakeTronCallService()
- val balanceClient = TronBalanceClient(Chain.Tron, accountService, callService, stakeService)
- val result = runBlocking { balanceClient.getNativeBalance(Chain.Tron, "TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU") }
- assertNotNull(result)
- assertEquals(AssetId(Chain.Tron), result!!.asset.id)
- assertEquals("1000000", result.balance.available)
- assertEquals("6000000", result.balance.staked)
- assertEquals("7000000", result.balance.pending)
- assertEquals("0", result.balance.reserved)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.frozen)
- assertEquals("1000000", result.balance.rewards)
- assertEquals(1.0, result.balanceAmount.available)
- assertEquals(6.0, result.balanceAmount.staked)
- assertEquals(7.0, result.balanceAmount.pending)
- assertEquals(1.0, result.balanceAmount.rewards)
- assertEquals(15.0, result.totalAmount)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronFeeCalculator.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronFeeCalculator.kt
deleted file mode 100644
index 6066fdc3b..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronFeeCalculator.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gemwallet.android.blockchain.clients.tron
-
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.DestinationAddress
-import com.wallet.core.blockchain.tron.TronAccount
-import com.wallet.core.blockchain.tron.TronAccountUsage
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import java.math.BigInteger
-
-class TestTronFeeCalculator {
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testTron_native_transfer_fee() {
- val feeCalculator = TronFeeCalculator(
- chain = Chain.Tron,
- nodeStatusService = FakeTronNodeStatusService(),
- callService = FakeTronCallService()
- )
-
- val params: ConfirmParams.TransferParams.Native = ConfirmParams.Builder(
- Chain.Tron.asset(),
- Account(Chain.Tron, "TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU", ""),
- BigInteger.valueOf(1_000_000)
- ).transfer(destination = DestinationAddress("THdHCD2miVcUdqAt32168a6wiyG5CE6WRY")) as ConfirmParams.TransferParams.Native
- val result = runBlocking {
- feeCalculator.calculate(
- params,
- TronAccount(address = "TNLmo9j9AuGnnxibQUT13xoMGuUmNwxtkU"),
- TronAccountUsage()
- )
- }
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronSigner.kt
index 96a31d1c6..7764ae8f0 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/tron/TestTronSigner.kt
@@ -42,22 +42,21 @@ class TestTronSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = TronSignerPreloader.TronChainData(
- number = 69501435,
- version = 31,
+ chainData = TronChainData(
+ blockNumber = 69501435UL,
+ blockVersion = 31UL,
txTrieRoot = "fe35cfe51299075978398390271d3f09bdc34e6f43fe8b76eb469314b32ceaff",
witnessAddress = "41456798cb4ab28109d8cc643cd7da7bd6069ceae9",
parentHash = "00000000042481fa52ef745a31aa66fc2acf8d156b6116bc5b3ede2aebbb894c",
- timestamp = 1739156280000,
+ blockTimestamp = 1739156280000UL,
votes = emptyMap(),
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Tron),
- amount = BigInteger.TEN
- ),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Tron),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
@@ -96,22 +95,21 @@ class TestTronSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = TronSignerPreloader.TronChainData(
- number = 69501435,
- version = 31,
+ chainData = TronChainData(
+ blockNumber = 69501435UL,
+ blockVersion = 31UL,
txTrieRoot = "fe35cfe51299075978398390271d3f09bdc34e6f43fe8b76eb469314b32ceaff",
witnessAddress = "41456798cb4ab28109d8cc643cd7da7bd6069ceae9",
parentHash = "00000000042481fa52ef745a31aa66fc2acf8d156b6116bc5b3ede2aebbb894c",
- timestamp = 1739156280000,
+ blockTimestamp = 1739156280000UL,
votes = emptyMap(),
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Tron),
- amount = BigInteger.TEN
- ),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Tron),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
@@ -154,25 +152,24 @@ class TestTronSigner {
BigInteger.valueOf(10_000),
validatorId = "TCEo1hMAdaJrQmvnGTCcGT2LqrGU4N7Jqf",
),
- chainData = TronSignerPreloader.TronChainData(
- number = 69501435,
- version = 31,
+ chainData = TronChainData(
+ blockNumber = 69501435UL,
+ blockVersion = 31UL,
txTrieRoot = "fe35cfe51299075978398390271d3f09bdc34e6f43fe8b76eb469314b32ceaff",
witnessAddress = "41456798cb4ab28109d8cc643cd7da7bd6069ceae9",
parentHash = "00000000042481fa52ef745a31aa66fc2acf8d156b6116bc5b3ede2aebbb894c",
- timestamp = 1739156280000,
+ blockTimestamp = 1739156280000UL,
votes = mapOf(
- "TLyqzVGLV1srkB7dToTAEqgDSfPtXRJZYH" to 1,
- "TCEo1hMAdaJrQmvnGTCcGT2LqrGU4N7Jqf" to 1,
- ),
- fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Tron),
- amount = BigInteger.TEN
+ "TLyqzVGLV1srkB7dToTAEqgDSfPtXRJZYH" to 1UL,
+ "TCEo1hMAdaJrQmvnGTCcGT2LqrGU4N7Jqf" to 1UL,
),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Tron),
+ amount = BigInteger.TEN
+ ),
privateKey.data(),
)
}
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpAccountsService.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpAccountsService.kt
deleted file mode 100644
index 66956d129..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpAccountsService.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.gemwallet.android.blockchain.clients.xrp
-
-import com.gemwallet.android.blockchain.clients.xrp.services.XrpAccountsService
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.wallet.core.blockchain.xrp.XRPAccount
-import com.wallet.core.blockchain.xrp.XRPAccountLinesResult
-import com.wallet.core.blockchain.xrp.XRPAccountResult
-import com.wallet.core.blockchain.xrp.XRPResult
-
-internal class TestXrpAccountsService(
- val balance: String = "",
-) : XrpAccountsService {
- var requestAccount: String? = ""
-
- override suspend fun account(request: JSONRpcRequest>>): Result> {
- requestAccount = request.params[0]["account"]
- return Result.success(
- XRPResult(
- XRPAccountResult(
- XRPAccount(
- Balance = balance,
- Sequence = 92788459,
- OwnerCount = 1,
- ),
- ledger_current_index = 1
- )
- )
- )
- }
-
- override suspend fun accountLines(request: JSONRpcRequest>>): Result> {
- return Result.success(
- XRPResult(
- XRPAccountLinesResult(
- listOf()
- )
- )
- )
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpBalanceClient.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpBalanceClient.kt
deleted file mode 100644
index f1147aa8c..000000000
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpBalanceClient.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gemwallet.android.blockchain.clients.xrp
-
-import com.gemwallet.android.blockchain.includeLibs
-import com.gemwallet.android.ext.toIdentifier
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-
-class TestXrpBalanceClient {
- companion object {
- init {
- includeLibs()
- }
- }
-
- @Test
- fun testXrp_native_balance() {
- val accountsService = TestXrpAccountsService("2104374")
- val balanceClient = XrpBalanceClient(
- chain = Chain.Xrp,
- accountsService = accountsService
- )
- val result = runBlocking {
- balanceClient.getNativeBalance(Chain.Xrp, "rwCq6DCHa6HPFyfvabvzcX1y5wABw5KdiN")
- }
- assertEquals("rwCq6DCHa6HPFyfvabvzcX1y5wABw5KdiN", accountsService.requestAccount)
- assertNotNull(result)
- assertEquals("1104374", result!!.balance.available)
- assertEquals("0", result.balance.frozen)
- assertEquals("0", result.balance.locked)
- assertEquals("0", result.balance.staked)
- assertEquals("0", result.balance.rewards)
- assertEquals("1000000", result.balance.reserved)
- assertEquals("0", result.balance.pending)
- assertEquals(1.104374, result.balanceAmount.available)
- assertEquals(0.0, result.balanceAmount.frozen)
- assertEquals(0.0, result.balanceAmount.locked)
- assertEquals(0.0, result.balanceAmount.staked)
- assertEquals(0.0, result.balanceAmount.rewards)
- assertEquals(1.0, result.balanceAmount.reserved)
- assertEquals(0.0, result.balanceAmount.pending)
- assertEquals(1.104374, result.totalAmount)
- assertEquals(AssetId(Chain.Xrp).toIdentifier(), result.asset.id.toIdentifier())
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpSigner.kt b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpSigner.kt
index a7ffac955..b5f4b1eb8 100644
--- a/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpSigner.kt
+++ b/blockchain/src/androidTest/kotlin/com/gemwallet/android/blockchain/clients/xrp/TestXrpSigner.kt
@@ -3,7 +3,6 @@ package com.gemwallet.android.blockchain.clients.xrp
import com.gemwallet.android.blockchain.includeLibs
import com.gemwallet.android.blockchain.testPhrase
import com.gemwallet.android.ext.asset
-import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ConfirmParams
import com.gemwallet.android.model.DestinationAddress
import com.gemwallet.android.model.Fee
@@ -40,19 +39,16 @@ class TestXrpSigner {
BigInteger.valueOf(10_000),
DestinationAddress(from),
),
- chainData = XrpSignerPreloader.XrpChainData(
+ chainData = XrpChainData(
sequence = 1,
blockNumber = 1,
- fees = listOf(
- Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(Chain.Xrp),
- amount = BigInteger.TEN,
- )
- ),
),
finalAmount = BigInteger.valueOf(10_000),
- FeePriority.Normal,
+ fee = Fee(
+ priority = FeePriority.Normal,
+ feeAssetId = AssetId(Chain.Xrp),
+ amount = BigInteger.TEN,
+ ),
privateKey.data(),
)
}
@@ -63,7 +59,7 @@ class TestXrpSigner {
"d5b18dd75818a07d4b4ed5846b07604e48607789d393691334f59d3761f6874c02205ac35c8b" +
"cadb9fdbd81022f3629bfa0aac0b80afa655628c8ddbfee030f1bb178114dd10693e412bff78" +
"9ebf6baa9714036c9ae214bb8314dd10693e412bff789ebf6baa9714036c9ae214bb",
- sign.first().toHexString()
+ String(sign.first())
)
}
}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BalanceClient.kt
deleted file mode 100644
index c051d4970..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BalanceClient.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.Chain
-
-interface BalanceClient : BlockchainClient {
- suspend fun getNativeBalance(chain: Chain, address: String): AssetBalance?
-
- suspend fun getDelegationBalances(chain: Chain, address: String): AssetBalance? = null
-
- suspend fun getTokenBalances(chain: Chain, address: String, tokens: List): List = emptyList()
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BroadcastClient.kt
deleted file mode 100644
index 7420741e2..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BroadcastClient.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.TransactionType
-
-interface BroadcastClient : BlockchainClient {
- suspend fun send(account: Account, signedMessage: ByteArray, type: TransactionType): String
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BroadcastClientProxy.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BroadcastClientProxy.kt
deleted file mode 100644
index 13aed8501..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/BroadcastClientProxy.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-
-class BroadcastClientProxy(
- private val clients: List,
-) : BroadcastClient {
-
- override suspend fun send(
- account: Account,
- signedMessage: ByteArray,
- type: TransactionType
- ): String {
- return clients.getClient(account.chain)?.send(account, signedMessage, type)
- ?: throw Exception("Chain isn't support")
- }
-
- override fun supported(chain: Chain): Boolean {
- return clients.getClient(chain) != null
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/GetTokenClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/GetTokenClient.kt
deleted file mode 100644
index f4ce113ba..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/GetTokenClient.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.wallet.core.primitives.Asset
-
-interface GetTokenClient : BlockchainClient {
- suspend fun getTokenData(tokenId: String): Asset?
-
- suspend fun isTokenQuery(query: String): Boolean
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/NodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/NodeStatusClient.kt
deleted file mode 100644
index fe6bd81c7..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/NodeStatusClient.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-
-interface NodeStatusClient : BlockchainClient {
- suspend fun getNodeStatus(chain: Chain, url: String): NodeStatus?
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/NodeStatusClientProxy.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/NodeStatusClientProxy.kt
deleted file mode 100644
index 0fb3559eb..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/NodeStatusClientProxy.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-
-class NodeStatusClientProxy(
- private val clients: List,
-): NodeStatusClient {
-
- override suspend fun getNodeStatus(chain: Chain, url: String): NodeStatus? {
- return try {
- clients.getClient(chain)?.getNodeStatus(chain, url)
- } catch (_: Throwable) {
- null
- }
- }
-
- override fun supported(chain: Chain): Boolean {
- return clients.getClient(chain) != null
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/SignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/SignClient.kt
index 6e596e0c5..c3ed56192 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/SignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/SignClient.kt
@@ -2,8 +2,8 @@ package com.gemwallet.android.blockchain.clients
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
import java.math.BigInteger
interface SignClient : BlockchainClient {
@@ -20,7 +20,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.TransferParams.Generic,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -28,7 +28,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -36,7 +36,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.TransferParams.Token,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -44,7 +44,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.SwapParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -52,7 +52,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.TokenApprovalParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -60,7 +60,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.Stake.DelegateParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -68,7 +68,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.Stake.UndelegateParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -76,7 +76,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.Stake.RedelegateParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -84,7 +84,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.Stake.RewardsParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -92,7 +92,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.Stake.WithdrawParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -100,7 +100,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.Activate,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
@@ -108,7 +108,7 @@ interface SignClient : BlockchainClient {
params: ConfirmParams.NftParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray,
): List = emptyList()
}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/StakeClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/StakeClient.kt
deleted file mode 100644
index 7c9ad7795..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/StakeClient.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.DelegationBase
-import com.wallet.core.primitives.DelegationValidator
-
-interface StakeClient : BlockchainClient {
- suspend fun getValidators(chain: Chain, apr: Double): List
-
- suspend fun getStakeDelegations(chain: Chain, address: String, apr: Double): List
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/StakeClientProxy.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/StakeClientProxy.kt
deleted file mode 100644
index 28e038b01..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/StakeClientProxy.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.DelegationBase
-import com.wallet.core.primitives.DelegationValidator
-
-class StakeClientProxy(
- private val clients: List
-) : StakeClient {
- override suspend fun getValidators(
- chain: Chain,
- apr: Double
- ): List {
- return clients.getClient(chain)?.getValidators(chain, apr) ?: emptyList()
- }
-
- override suspend fun getStakeDelegations(
- chain: Chain,
- address: String,
- apr: Double
- ): List {
- return clients.getClient(chain)?.getStakeDelegations(chain, address, apr) ?: emptyList()
- }
-
- override fun supported(chain: Chain): Boolean {
- return clients.getClient(chain) != null
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/TransactionStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/TransactionStatusClient.kt
deleted file mode 100644
index d33d5db7c..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/TransactionStatusClient.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gemwallet.android.blockchain.clients
-
-import com.gemwallet.android.model.TransactionChanges
-import com.wallet.core.primitives.Chain
-
-interface TransactionStatusClient : BlockchainClient {
-
- suspend fun getStatus(request: TransactionStateRequest): TransactionChanges
-}
-
-class TransactionStateRequest(
- val chain: Chain,
- val hash: String,
- val block: String,
- val sender: String,
-)
-
-sealed class TransactionStatusError(message: String? = null) : Exception(message)
-
-data object ServiceUnavailable : TransactionStatusError()
-
-class TransactionError(message: String) : TransactionStatusError(message)
-
-class TransactionNotFound(message: String? = null) : TransactionStatusError(message)
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandBalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandBalanceClient.kt
deleted file mode 100644
index 11fbe981e..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandBalanceClient.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand
-
-import com.gemwallet.android.blockchain.clients.BalanceClient
-import com.gemwallet.android.blockchain.clients.algorand.services.AlgorandAccountService
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Chain
-import kotlin.math.max
-
-class AlgorandBalanceClient(
- private val chain: Chain,
- private val accountService: AlgorandAccountService,
-) : BalanceClient {
-
- override suspend fun getNativeBalance(
- chain: Chain,
- address: String
- ): AssetBalance? {
- val response = accountService.accounts(address).getOrNull() ?: return null
- val amount = response.amount
-
- val available = if (amount > 0L) {
- max(amount - response.min_balance, 0L).toString()
- } else {
- "0"
- }
- val reserved = if (response.amount > 0L) {
- response.min_balance.toString()
- } else {
- "0"
- }
- return AssetBalance.create(chain.asset(), available = available, reserved = reserved.toString())
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandBroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandBroadcastClient.kt
deleted file mode 100644
index c84b8e2d1..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandBroadcastClient.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand
-
-import com.gemwallet.android.blockchain.Mime
-import com.gemwallet.android.blockchain.clients.BroadcastClient
-import com.gemwallet.android.blockchain.clients.algorand.services.AlgorandBroadcastService
-import com.gemwallet.android.blockchain.rpc.ServiceError
-import com.gemwallet.android.blockchain.rpc.handleError
-import com.wallet.core.blockchain.algorand.AlgorandTransactionBroadcast
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class AlgorandBroadcastClient(
- private val chain: Chain,
- private val broadcastService: AlgorandBroadcastService,
-) : BroadcastClient {
-
- override suspend fun send(
- account: Account,
- signedMessage: ByteArray,
- type: TransactionType
- ): String {
- val result = broadcastService.broadcast(signedMessage.toRequestBody(Mime.Binary.value))
- return result.getOrNull()?.txId ?: throw
- result.handleError()?.message?.let { Exception(it) }
- ?: ServiceError.BroadCastError()
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandChainData.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandChainData.kt
new file mode 100644
index 000000000..da07ecd8d
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandChainData.kt
@@ -0,0 +1,18 @@
+package com.gemwallet.android.blockchain.clients.algorand
+
+import com.gemwallet.android.model.ChainSignData
+import uniffi.gemstone.GemTransactionLoadMetadata
+
+data class AlgorandChainData(
+ val sequence: ULong,
+ val block: String,
+ val chainId: String,
+) : ChainSignData
+
+fun GemTransactionLoadMetadata.Algorand.toChainData(): AlgorandChainData {
+ return AlgorandChainData(
+ sequence = sequence,
+ block = blockHash,
+ chainId = chainId,
+ )
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandNodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandNodeStatusClient.kt
deleted file mode 100644
index 6e93ab94d..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandNodeStatusClient.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand
-
-import com.gemwallet.android.blockchain.clients.NodeStatusClient
-import com.gemwallet.android.blockchain.clients.algorand.services.AlgorandNodeStatusService
-import com.gemwallet.android.blockchain.rpc.getLatency
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-
-class AlgorandNodeStatusClient(
- private val chain: Chain,
- private val nodeStatusService: AlgorandNodeStatusService,
-) : NodeStatusClient {
-
- override suspend fun getNodeStatus(
- chain: Chain,
- url: String
- ): NodeStatus? {
- val resp = try {
- nodeStatusService.transactionsParams("$url/v2/transactions/params")
- } catch (err: Throwable) {
- throw err
- }
- val result = resp.body()
- return NodeStatus(
- url = url,
- blockNumber = result?.last_round?.toString() ?: return null,
- inSync = true,
- chainId = result.genesis_id,
- latency = resp.getLatency()
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignClient.kt
index 195e16ce2..c90649380 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignClient.kt
@@ -2,11 +2,12 @@ package com.gemwallet.android.blockchain.clients.algorand
import com.gemwallet.android.blockchain.clients.SignClient
import com.gemwallet.android.blockchain.operators.walletcore.WCChainTypeProxy
+import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
import com.google.protobuf.ByteString
import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
import wallet.core.java.AnySigner
import wallet.core.jni.Base64
import wallet.core.jni.proto.Algorand
@@ -20,10 +21,10 @@ class AlgorandSignClient(
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- val chainData = (chainData as? AlgorandSignPreloadClient.AlgorandChainData)
+ val chainData = (chainData as? AlgorandChainData)
?: throw Exception("bad params")
val input = Algorand.SigningInput.newBuilder().apply {
this.genesisId = chainData.chainId
@@ -33,7 +34,7 @@ class AlgorandSignClient(
}
this.firstRound = chainData.sequence.toLong()
this.lastRound = chainData.sequence.toLong() + 1000
- this.fee = chainData.fee().amount.toLong()
+ this.fee = fee.amount.toLong()
this.privateKey = ByteString.copyFrom(privateKey)
this.transfer = Algorand.Transfer.newBuilder().apply {
this.toAddress = params.destination().address
@@ -44,7 +45,7 @@ class AlgorandSignClient(
if (!output.errorMessage.isNullOrEmpty()) {
throw Exception(output.errorMessage)
}
- return listOf(output.encoded.toByteArray())
+ return listOf(output.encoded.toByteArray().toHexString("").toByteArray())
}
override fun supported(chain: Chain): Boolean = this.chain == chain
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignPreloadClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignPreloadClient.kt
deleted file mode 100644
index 9bce5cada..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandSignPreloadClient.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand
-
-import com.gemwallet.android.blockchain.clients.NativeTransferPreloader
-import com.gemwallet.android.blockchain.clients.algorand.services.AlgorandNodeStatusService
-import com.gemwallet.android.model.ChainSignData
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.SignerParams
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-
-class AlgorandSignPreloadClient(
- private val chain: Chain,
- private val feeService: AlgorandNodeStatusService,
-) : NativeTransferPreloader {
-
- override suspend fun preloadNativeTransfer(params: ConfirmParams.TransferParams.Native): SignerParams {
- val txParams = feeService.transactionsParams().getOrNull() ?: throw Exception("fee load error")
- val fee = Fee(
- priority = FeePriority.Normal,
- feeAssetId = AssetId(chain),
- amount = txParams.min_fee.toBigInteger(),
- )
- return SignerParams(
- input = params,
- chainData = AlgorandChainData(
- sequence = txParams.last_round.toInt(),
- block = txParams.genesis_hash,
- chainId = txParams.genesis_id,
- fee = fee
- )
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
- data class AlgorandChainData(
- val sequence: Int,
- val block: String,
- val chainId: String,
- val fee: Fee,
- ) : ChainSignData {
- override fun fee(speed: FeePriority): Fee = fee
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandTransactionStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandTransactionStatusClient.kt
deleted file mode 100644
index 7579e968d..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/AlgorandTransactionStatusClient.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand
-
-import com.gemwallet.android.blockchain.clients.ServiceUnavailable
-import com.gemwallet.android.blockchain.clients.TransactionStateRequest
-import com.gemwallet.android.blockchain.clients.TransactionStatusClient
-import com.gemwallet.android.blockchain.clients.algorand.services.AlgorandTxStatusService
-import com.gemwallet.android.model.TransactionChanges
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionState
-
-class AlgorandTransactionStatusClient(
- private val chain: Chain,
- private val txStatusService: AlgorandTxStatusService,
-) : TransactionStatusClient {
-
- override suspend fun getStatus(request: TransactionStateRequest): TransactionChanges {
- val round = txStatusService.transaction(request.hash).getOrNull()?.confirmed_round ?: throw ServiceUnavailable
- return TransactionChanges(if (round > 0) TransactionState.Confirmed else TransactionState.Failed)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandAccountService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandAccountService.kt
deleted file mode 100644
index 3cf7b0c0b..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandAccountService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand.services
-
-import com.wallet.core.blockchain.algorand.AlgorandAccount
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface AlgorandAccountService {
- @GET("/v2/accounts/{address}")
- suspend fun accounts(@Path("address") address: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandBroadcastService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandBroadcastService.kt
deleted file mode 100644
index db63e7699..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandBroadcastService.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand.services
-
-import com.wallet.core.blockchain.algorand.AlgorandTransactionBroadcast
-import okhttp3.RequestBody
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface AlgorandBroadcastService {
-
- @POST("/v2/transactions")
- suspend fun broadcast(@Body body: RequestBody): Result
-
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandNodeStatusService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandNodeStatusService.kt
deleted file mode 100644
index 573df27e9..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandNodeStatusService.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand.services
-
-import com.wallet.core.blockchain.algorand.AlgorandTransactionParams
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Url
-
-interface AlgorandNodeStatusService {
- @GET("/v2/transactions/params")
- suspend fun transactionsParams(): Result
-
- @GET//("/v2/transactions/params")
- suspend fun transactionsParams(@Url url: String): Response
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandService.kt
deleted file mode 100644
index 92d639c7b..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandService.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand.services
-
-interface AlgorandService : AlgorandAccountService,
- AlgorandBroadcastService,
- AlgorandTxStatusService,
- AlgorandNodeStatusService
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandTxStatusService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandTxStatusService.kt
deleted file mode 100644
index b80e8a23d..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/algorand/services/AlgorandTxStatusService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.algorand.services
-
-import com.wallet.core.blockchain.algorand.AlgorandTransactionStatus
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface AlgorandTxStatusService {
- @GET("/v2/transactions/pending/{id}")
- suspend fun transaction(@Path("id") id: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosBalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosBalanceClient.kt
deleted file mode 100644
index 63d9530c2..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosBalanceClient.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.BalanceClient
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosBalancesService
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.withContext
-
-class AptosBalanceClient(
- private val chain: Chain,
- private val balanceService: AptosBalancesService,
-) : BalanceClient {
- private val aptosCoin = "0x1::aptos_coin::AptosCoin"
-
- override suspend fun getNativeBalance(chain: Chain, address: String): AssetBalance? {
- return try {
- val result = balanceService.balance(address, aptosCoin).string()
- AssetBalance.create(chain.asset(), available = result)
- } catch (_: Throwable) {
- null
- }
- }
-
- override suspend fun getTokenBalances(chain: Chain, address: String, tokens: List): List {
- if (tokens.isEmpty()) {
- return emptyList()
- }
- return withContext(Dispatchers.IO) {
- tokens.map { token ->
- async {
- val tokenId = token.id.tokenId ?: return@async null
- try {
- val result = balanceService.balance(address, tokenId).string()
- AssetBalance.create(token, available = result)
- } catch (_: Throwable) {
- null
- }
- }
- }
- .awaitAll()
- .filterNotNull()
- }
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosBroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosBroadcastClient.kt
deleted file mode 100644
index 0fe9910c0..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosBroadcastClient.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.Mime
-import com.gemwallet.android.blockchain.clients.BroadcastClient
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosBroadcastService
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class AptosBroadcastClient(
- private val chain: Chain,
- private val broadcastService: AptosBroadcastService,
-) : BroadcastClient {
- override suspend fun send(account: Account, signedMessage: ByteArray, type: TransactionType): String {
- return broadcastService.broadcast(String(signedMessage).toRequestBody(Mime.Json.value))
- .getOrThrow()
- .hash
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosChainData.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosChainData.kt
new file mode 100644
index 000000000..827ad1636
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosChainData.kt
@@ -0,0 +1,14 @@
+package com.gemwallet.android.blockchain.clients.aptos
+
+import com.gemwallet.android.model.ChainSignData
+import uniffi.gemstone.GemTransactionLoadMetadata
+
+data class AptosChainData(
+ val sequence: ULong,
+) : ChainSignData
+
+fun GemTransactionLoadMetadata.Aptos.toChainData(): AptosChainData {
+ return AptosChainData(
+ sequence = sequence,
+ )
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosFeeCalculator.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosFeeCalculator.kt
deleted file mode 100644
index 61a77e3b1..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosFeeCalculator.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosFeeService
-import com.gemwallet.android.ext.type
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.GasFee
-import com.wallet.core.blockchain.aptos.AptosSignature
-import com.wallet.core.blockchain.aptos.AptosTransaction
-import com.wallet.core.blockchain.aptos.AptosTransactionPayload
-import com.wallet.core.blockchain.aptos.AptosTransactionSimulation
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetSubtype
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.withContext
-import java.math.BigInteger
-
-internal class AptosFeeCalculator(
- private val chain: Chain,
- private val feeRpcClient: AptosFeeService,
-) {
- private val maxGasAmount = BigInteger.valueOf(1_500)
-
- suspend fun calculate(params: ConfirmParams, sequence: Long): List = withContext(Dispatchers.IO) {
- val feePrice = feeRpcClient.feePrice().getOrThrow()
-
- FeePriority.entries.map {
- async(Dispatchers.IO) {
- val price = when (it) {
- FeePriority.Slow -> feePrice.gas_estimate
- FeePriority.Normal -> feePrice.prioritized_gas_estimate
- FeePriority.Fast -> feePrice.prioritized_gas_estimate * 2
- }.toBigInteger()
-
- val gasLimit = when (params) {
- is ConfirmParams.TransferParams -> {
- val recipient = params.destination().address
- when (params.asset.id.type()) {
- AssetSubtype.NATIVE -> simulateTransactions(
- sender = params.from.address,
- recipient = recipient,
- sequence = sequence,
- value = params.amount,
- gasPrice = price,
- maxGasAmount = maxGasAmount
- ).gas_used.toBigInteger()
-
- AssetSubtype.TOKEN -> maxGasAmount
- }
- }
- is ConfirmParams.SwapParams -> maxGasAmount
- else -> throw IllegalArgumentException("not supported operation")
- }
-
- GasFee(
- feeAssetId = AssetId(chain),
- priority = it,
- maxGasPrice = price,
- limit = gasLimit,
- )
- }
- }.awaitAll()
- }
-
- private suspend fun simulateTransactions(
- sender: String,
- recipient: String,
- sequence: Long,
- value: BigInteger,
- gasPrice: BigInteger,
- maxGasAmount: BigInteger
- ): AptosTransaction {
- val transaction = AptosTransactionSimulation(
- expiration_timestamp_secs = (System.currentTimeMillis() / 1_000 + 1_000_000).toString(),
- gas_unit_price = gasPrice.toString(),
- max_gas_amount = maxGasAmount.toString(),
- payload = AptosTransactionPayload(
- arguments = listOf(
- recipient,
- value.toString(),
- ),
- function = "0x1::aptos_account::transfer",
- type = "entry_function_payload",
- type_arguments = emptyList(),
- ),
- sender = sender,
- sequence_number = sequence.toString(),
- signature = AptosSignature(
- type = "no_account_signature",
- public_key = null,
- signature = null,
- ),
- )
- val response = feeRpcClient.simulate(transaction)
- val simulated = response.getOrNull()?.firstOrNull()
- return simulated ?: throw Exception("No aptos transaction")
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosGetTokenClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosGetTokenClient.kt
deleted file mode 100644
index 1e160a794..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosGetTokenClient.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.GetTokenClient
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosTokensService
-import com.gemwallet.android.math.has0xPrefix
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-
-class AptosGetTokenClient(
- private val chain: Chain,
- private val tokensService: AptosTokensService,
-) : GetTokenClient {
-
- override suspend fun getTokenData(tokenId: String): Asset? {
- val address = tokenId.split("::").firstOrNull() ?: return null
- val resource = "0x1::coin::CoinInfo<$tokenId>"
- val tokenInfo = tokensService.resource(address, resource).getOrNull()?.data ?: return null
- return Asset(
- id = AssetId(chain, tokenId),
- name = tokenInfo.name,
- symbol = tokenInfo.symbol,
- decimals = tokenInfo.decimals,
- type = AssetType.TOKEN
- )
- }
-
- override suspend fun isTokenQuery(query: String): Boolean = isTokenAddress(query)
-
- override fun supported(chain: Chain): Boolean = chain == this.chain
-
- companion object {
- fun isTokenAddress(tokenId: String): Boolean {
- return tokenId.has0xPrefix() && tokenId.contains("::")
- }
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosNodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosNodeStatusClient.kt
deleted file mode 100644
index 56480f75c..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosNodeStatusClient.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.NodeStatusClient
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosNodeStatusService
-import com.gemwallet.android.blockchain.clients.aptos.services.getLedger
-import com.gemwallet.android.blockchain.rpc.getLatency
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-class AptosNodeStatusClient(
- private val chain: Chain,
- private val nodeStatusService: AptosNodeStatusService,
-) : NodeStatusClient {
-
- override suspend fun getNodeStatus(chain: Chain, url: String): NodeStatus? = withContext(Dispatchers.IO) {
- val response = nodeStatusService.getLedger(url)
- val ledger = response.body() ?: return@withContext null
- NodeStatus(
- url = url,
- chainId = ledger.chain_id.toString(),
- blockNumber = ledger.ledger_version,
- inSync = true,
- latency = response.getLatency(),
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignClient.kt
index 621dea295..ef5f8cd4d 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignClient.kt
@@ -4,9 +4,10 @@ import com.gemwallet.android.blockchain.clients.SignClient
import com.gemwallet.android.blockchain.operators.walletcore.WCChainTypeProxy
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
+import com.gemwallet.android.model.GasFee
import com.google.protobuf.ByteString
import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
import wallet.core.java.AnySigner
import wallet.core.jni.proto.Aptos
import wallet.core.jni.proto.Aptos.TokenTransferCoinsMessage
@@ -23,35 +24,34 @@ class AptosSignClient(
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- return sign(params, chainData, privateKey, buildTransferMessage(params, finalAmount))
+ return sign(params, chainData, fee as GasFee, privateKey, buildTransferMessage(params, finalAmount))
}
override suspend fun signTokenTransfer(
params: ConfirmParams.TransferParams.Token,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- return sign(params, chainData, privateKey, buildTokenCoinMessage(params, finalAmount))
+ return sign(params, chainData, fee as GasFee, privateKey, buildTokenCoinMessage(params, finalAmount))
}
override suspend fun signSwap(
params: ConfirmParams.SwapParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- return sign(params, chainData, privateKey, params.swapData)
+ return sign(params, chainData, fee as GasFee, privateKey, params.swapData)
}
- private fun sign(params: ConfirmParams, chainData: ChainSignData, privateKey: ByteArray, message: Any): List {
- val metadata = chainData as AptosSignerPreloader.AptosChainData
- val fee = metadata.gasFee()
+ private fun sign(params: ConfirmParams, chainData: ChainSignData, fee: GasFee, privateKey: ByteArray, message: Any): List {
+ val metadata = chainData as AptosChainData
val signInput = Aptos.SigningInput.newBuilder().apply {
this.chainId = 1
when (message) {
@@ -63,7 +63,7 @@ class AptosSignClient(
this.expirationTimestampSecs = 3664390082
this.gasUnitPrice = fee.maxGasPrice.toLong()
this.maxGasAmount = fee.limit.toLong()
- this.sequenceNumber = metadata.sequence
+ this.sequenceNumber = metadata.sequence.toLong()
this.sender = params.from.address
this.privateKey = ByteString.copyFrom(privateKey)
}.build()
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignerPreloader.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignerPreloader.kt
deleted file mode 100644
index a396aa9cc..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosSignerPreloader.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.NativeTransferPreloader
-import com.gemwallet.android.blockchain.clients.SwapTransactionPreloader
-import com.gemwallet.android.blockchain.clients.TokenTransferPreloader
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosAccountsService
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosFeeService
-import com.gemwallet.android.model.ChainSignData
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.SignerParams
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-
-class AptosSignerPreloader(
- private val chain: Chain,
- private val accountsService: AptosAccountsService,
- feeService: AptosFeeService,
-) : NativeTransferPreloader, TokenTransferPreloader, SwapTransactionPreloader {
-
- private val feeCalculator = AptosFeeCalculator(chain, feeService)
-
- override suspend fun preloadNativeTransfer(params: ConfirmParams.TransferParams.Native): SignerParams {
- return preloadTransfer(params)
- }
-
- override suspend fun preloadTokenTransfer(params: ConfirmParams.TransferParams.Token): SignerParams {
- return preloadTransfer(params)
- }
-
- override suspend fun preloadSwap(params: ConfirmParams.SwapParams): SignerParams {
- return preloadTransfer(params)
- }
-
- private suspend fun preloadTransfer(params: ConfirmParams): SignerParams {
- val sequence = try {
- val response = accountsService.accounts(params.from.address).getOrThrow()
- response.sequence_number?.toLong() ?: 0L
- } catch (_: Throwable) {
- 0L
- }
- val fee = feeCalculator.calculate(params, sequence)
- val input = SignerParams(params, AptosChainData(sequence, fee))
- return input
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
- data class AptosChainData(
- val sequence: Long,
- val fees: List,
- ) : ChainSignData {
- override fun fee(speed: FeePriority): Fee = fees.firstOrNull { it.priority == speed } ?: fees.first()
-
- override fun allFee(): List = fees
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosTransactionStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosTransactionStatusClient.kt
deleted file mode 100644
index 3de240ca2..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/AptosTransactionStatusClient.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos
-
-import com.gemwallet.android.blockchain.clients.ServiceUnavailable
-import com.gemwallet.android.blockchain.clients.TransactionStateRequest
-import com.gemwallet.android.blockchain.clients.TransactionStatusClient
-import com.gemwallet.android.blockchain.clients.aptos.services.AptosTransactionsService
-import com.gemwallet.android.model.TransactionChanges
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionState
-import java.math.BigInteger
-
-class AptosTransactionStatusClient(
- private val chain: Chain,
- private val rpcClient: AptosTransactionsService,
-) : TransactionStatusClient {
-
- override suspend fun getStatus(request: TransactionStateRequest): TransactionChanges {
- val transaction = rpcClient.transactions(request.hash).getOrNull() ?: throw ServiceUnavailable
-
- val status = if (transaction.success) TransactionState.Confirmed else TransactionState.Reverted
- val fee = BigInteger(transaction.gas_used) * BigInteger(transaction.gas_unit_price)
- return TransactionChanges(status, fee)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/models/AptosAccount.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/models/AptosAccount.kt
deleted file mode 100644
index e452a2b1a..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/models/AptosAccount.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.models
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class AptosAccount(
- val sequence_number: String?,
- val message: String?,
- val error_code: String?,
-)
-
-const val aptosErrorCode = "account_not_found"
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosAccountsService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosAccountsService.kt
deleted file mode 100644
index f29d5d56b..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosAccountsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.gemwallet.android.blockchain.clients.aptos.models.AptosAccount
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface AptosAccountsService {
- @GET("/v1/accounts/{address}")
- suspend fun accounts(@Path("address") address: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosBalancesService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosBalancesService.kt
deleted file mode 100644
index 13d09c5b0..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosBalancesService.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.wallet.core.blockchain.aptos.AptosResource
-import com.wallet.core.blockchain.aptos.AptosResourceBalanceOptional
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface AptosBalancesService {
- @GET("/v1/accounts/{address}/balance/{assetType}")
- suspend fun balance(@Path("address") address: String, @Path("assetType") assetType: String): ResponseBody
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosBroadcastService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosBroadcastService.kt
deleted file mode 100644
index fe936ad70..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosBroadcastService.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.wallet.core.blockchain.aptos.AptosTransactionBroacast
-import okhttp3.RequestBody
-import retrofit2.http.Body
-import retrofit2.http.Headers
-import retrofit2.http.POST
-
-interface AptosBroadcastService {
- @Headers("Content-type: application/json")
- @POST("/v1/transactions")
- suspend fun broadcast(@Body request: RequestBody): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosFeeService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosFeeService.kt
deleted file mode 100644
index 67b981baf..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosFeeService.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.wallet.core.blockchain.aptos.AptosGasFee
-import com.wallet.core.blockchain.aptos.AptosTransaction
-import com.wallet.core.blockchain.aptos.AptosTransactionSimulation
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Headers
-import retrofit2.http.POST
-
-interface AptosFeeService {
- @GET("/v1/estimate_gas_price")
- suspend fun feePrice(): Result
-
- @Headers("Content-type: application/json")
- @POST("/v1/transactions/simulate?estimate_max_gas_amount=true")
- suspend fun simulate(@Body data: AptosTransactionSimulation): Result>
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosNodeStatusService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosNodeStatusService.kt
deleted file mode 100644
index 11f0f319c..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosNodeStatusService.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.wallet.core.blockchain.aptos.AptosLedger
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Url
-
-interface AptosNodeStatusService {
- @GET
- suspend fun ledger(@Url url: String): Response
-
- suspend fun AptosServices.getLedger(url: String): Response {
- return ledger("$url/v1")
- }
-}
-
-suspend fun AptosNodeStatusService.getLedger(url: String): Response {
- return ledger("$url/v1")
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosServices.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosServices.kt
deleted file mode 100644
index cce33bcce..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosServices.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-interface AptosServices :
- AptosAccountsService,
- AptosBalancesService,
- AptosBroadcastService,
- AptosFeeService,
- AptosNodeStatusService,
- AptosTransactionsService,
- AptosTokensService
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosTokensService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosTokensService.kt
deleted file mode 100644
index 29d3199cd..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosTokensService.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.wallet.core.blockchain.aptos.AptosCoinInfo
-import com.wallet.core.blockchain.aptos.AptosResource
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface AptosTokensService {
-
- @GET("/v1/accounts/{address}/resource/{resource}")
- suspend fun resource(@Path("address") address: String, @Path("resource") resource: String): Result>
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosTransactionsService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosTransactionsService.kt
deleted file mode 100644
index 4a1ee5ae5..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/aptos/services/AptosTransactionsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.aptos.services
-
-import com.wallet.core.blockchain.aptos.AptosTransaction
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface AptosTransactionsService {
- @GET("/v1/transactions/by_hash/{id}")
- suspend fun transactions(@Path("id") txId: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinBalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinBalanceClient.kt
deleted file mode 100644
index f4a02d601..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinBalanceClient.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.clients.BalanceClient
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinBalancesService
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.ext.fullAddress
-import com.gemwallet.android.ext.toBitcoinChain
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Chain
-
-class BitcoinBalanceClient(
- private val chain: Chain,
- private val balanceService: BitcoinBalancesService,
-) : BalanceClient {
-
- override suspend fun getNativeBalance(chain: Chain, address: String): AssetBalance? {
- val address = chain.toBitcoinChain().fullAddress(address)
- val result = balanceService.balance(address).getOrNull()
- return try {
- AssetBalance.create(chain.asset(), available = result?.balance ?: return null)
- } catch (_: Throwable) {
- null
- }
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinBroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinBroadcastClient.kt
deleted file mode 100644
index 75eb9dcc5..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinBroadcastClient.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.Mime
-import com.gemwallet.android.blockchain.clients.BroadcastClient
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinBroadcastService
-import com.gemwallet.android.blockchain.rpc.RpcError
-import com.gemwallet.android.math.toHexString
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class BitcoinBroadcastClient(
- private val chain: Chain,
- private val broadcastService: BitcoinBroadcastService,
-) : BroadcastClient {
-
- override suspend fun send(account: Account, signedMessage: ByteArray, type: TransactionType): String {
- val requestBody = signedMessage.toHexString("").toRequestBody(Mime.Plain.value)
- return broadcastService.broadcast(requestBody).getOrThrow().result
- ?: throw RpcError.BroadcastFail("Unknown error")
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinChainData.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinChainData.kt
new file mode 100644
index 000000000..aa6cf5ef0
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinChainData.kt
@@ -0,0 +1,16 @@
+package com.gemwallet.android.blockchain.clients.bitcoin
+
+import com.gemwallet.android.blockchain.services.mapper.toUtxo
+import com.gemwallet.android.model.ChainSignData
+import com.wallet.core.primitives.UTXO
+import uniffi.gemstone.GemTransactionLoadMetadata
+
+data class BitcoinChainData(
+ val utxo: List,
+) : ChainSignData
+
+fun GemTransactionLoadMetadata.Bitcoin.toChainData(): BitcoinChainData {
+ return BitcoinChainData(
+ utxo = utxos.toUtxo()
+ )
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinFeeCalculator.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinFeeCalculator.kt
deleted file mode 100644
index 78062299a..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinFeeCalculator.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinFeeService
-import com.gemwallet.android.blockchain.operators.walletcore.WCChainTypeProxy
-import com.gemwallet.android.ext.toBitcoinChain
-import com.gemwallet.android.model.Crypto
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.GasFee
-import com.wallet.core.blockchain.bitcoin.BitcoinUTXO
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.BitcoinChain
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.withContext
-import uniffi.gemstone.Config
-import wallet.core.java.AnySigner
-import wallet.core.jni.BitcoinSigHashType
-import wallet.core.jni.CoinTypeConfiguration
-import wallet.core.jni.proto.Bitcoin
-import wallet.core.jni.proto.Common
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.math.RoundingMode
-
-class BitcoinFeeCalculator(
- private val feeService: BitcoinFeeService,
-) {
- suspend fun calculate(
- utxos: List,
- account: Account,
- recipient: String,
- amount: BigInteger,
- ): List = withContext(Dispatchers.IO) {
- val ownerAddress = account.address
- val chain = account.chain
- FeePriority.entries.map {
- async {
- val price = estimateFeePrice(chain, it)
- val limit =
- calcFee(chain, ownerAddress, recipient, amount.toLong(), price.toLong(), utxos)
- GasFee(
- feeAssetId = AssetId(chain),
- priority = it,
- maxGasPrice = price,
- limit = limit
- )
- }
- }.awaitAll()
- }
-
- private suspend fun estimateFeePrice(chain: Chain, speed: FeePriority): BigInteger {
- val decimals = CoinTypeConfiguration.getDecimals(WCChainTypeProxy().invoke(chain))
- val minimumByteFee = getMinimumByteFee(chain)
- val priority = Config().getBitcoinChainConfig(chain.toBitcoinChain().string).blocksFeePriority.let {
- when (speed) {
- FeePriority.Slow -> it.slow
- FeePriority.Normal -> it.normal
- FeePriority.Fast -> it.fast
- }
- }.toString()
- return feeService.estimateFee(priority).fold(
- {
- val networkFeePerKb = Crypto(it.result, decimals).atomicValue
- val feePerByte = networkFeePerKb.toBigDecimal().divide(BigDecimal(1000), RoundingMode.CEILING).toBigInteger()
- return minimumByteFee.max(feePerByte)
- }
- ) {
- minimumByteFee
- }
- }
-
- private fun calcFee(
- chain: Chain,
- from: String,
- to: String,
- amount: Long,
- bytePrice: Long,
- utxos: List,
- ): BigInteger {
- val coinType = WCChainTypeProxy().invoke(chain)
- val total = utxos.map { it.value.toLong() }.fold(0L) { x, y -> x + y }
- if (total == 0L) {
- return BigInteger.ZERO // empty balance
- }
- val input = Bitcoin.SigningInput.newBuilder().apply {
- this.hashType = BitcoinSigHashType.ALL.value()
- this.byteFee = bytePrice
- this.amount = amount
- this.useMaxAmount = total == amount
- this.coinType = coinType.value()
- this.toAddress = to
- this.changeAddress = from
- this.addAllUtxo(utxos.getUtxoTransactions(from, coinType))
- }.build()
-
- val plan = AnySigner.plan(input, coinType, Bitcoin.TransactionPlan.parser())
- when (plan.error) {
- Common.SigningError.OK -> { /* continue */ }
- Common.SigningError.Error_not_enough_utxos,
- Common.SigningError.Error_dust_amount_requested,
- Common.SigningError.Error_missing_input_utxos -> throw IllegalStateException("Dust Error: $bytePrice")
- else -> throw IllegalStateException(plan.error.name)
- }
-
- val selectedUtxos: MutableList = mutableListOf()
- for (raw in plan.utxosList) {
- input.utxoList?.indexOfFirst { it == raw }?.let {
- selectedUtxos.add(utxos[it])
- }
- }
- if (utxos.isNotEmpty() && selectedUtxos.isEmpty() && amount != total && amount <= total) {
- return calcFee(chain, from, to, total, bytePrice, utxos)
- }
- return BigInteger.valueOf(plan.fee / bytePrice)
- }
-
- companion object {
- fun getMinimumByteFee(chain: Chain) = when (chain.toBitcoinChain()) {
- BitcoinChain.Litecoin -> BigInteger("5")
- BitcoinChain.Doge -> BigInteger("1000")
- BitcoinChain.BitcoinCash,
- BitcoinChain.Bitcoin -> BigInteger.ONE
- }
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinGatewayEstimateFee.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinGatewayEstimateFee.kt
new file mode 100644
index 000000000..e06168b5f
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinGatewayEstimateFee.kt
@@ -0,0 +1,105 @@
+package com.gemwallet.android.blockchain.clients.bitcoin
+
+import com.gemwallet.android.blockchain.operators.walletcore.WCChainTypeProxy
+import com.gemwallet.android.blockchain.services.mapper.toUtxo
+import com.gemwallet.android.ext.toChain
+import com.wallet.core.primitives.UTXO
+import uniffi.gemstone.Chain
+import uniffi.gemstone.GemFeeOptions
+import uniffi.gemstone.GemGasPriceType
+import uniffi.gemstone.GemGatewayEstimateFee
+import uniffi.gemstone.GemTransactionLoadFee
+import uniffi.gemstone.GemTransactionLoadInput
+import uniffi.gemstone.GemTransactionLoadMetadata
+import wallet.core.java.AnySigner
+import wallet.core.jni.BitcoinSigHashType
+import wallet.core.jni.proto.Bitcoin
+import wallet.core.jni.proto.Common
+import java.math.BigInteger
+
+class BitcoinGatewayEstimateFee : GemGatewayEstimateFee {
+ override suspend fun getFee(
+ chain: Chain,
+ input: GemTransactionLoadInput
+ ): GemTransactionLoadFee? {
+ val chain = chain.toChain() ?: throw IllegalArgumentException("Incorrect chain")
+
+ val utxos = (input.metadata as? GemTransactionLoadMetadata.Bitcoin)?.utxos?.toUtxo()
+ ?: throw IllegalArgumentException("Incorrect UTXO")
+
+ val bytePrice = (input.gasPrice as? GemGasPriceType.Regular)?.gasPrice?.toLongOrNull()
+ ?: throw IllegalArgumentException("Incorrect Byte Price")
+ val amount = input.value.toLongOrNull() ?: return null
+
+ val destinationAddress = input.destinationAddress
+ val senderAddress = input.senderAddress
+
+ val fee = calcFee(
+ chain = chain,
+ senderAddress = senderAddress,
+ destinationAddress = destinationAddress,
+ amount = amount,
+ bytePrice = bytePrice,
+ utxos = utxos
+ )
+
+ return GemTransactionLoadFee(
+ fee = fee.toString(),
+ gasPriceType = input.gasPrice,
+ gasLimit = "1",
+ options = GemFeeOptions(emptyMap())
+ )
+ }
+
+ override suspend fun getFeeData(
+ chain: Chain,
+ input: GemTransactionLoadInput
+ ): String? {
+ return null
+ }
+
+ private fun calcFee(
+ chain: com.wallet.core.primitives.Chain,
+ senderAddress: String,
+ destinationAddress: String,
+ amount: Long,
+ bytePrice: Long,
+ utxos: List,
+ ): BigInteger {
+ val coinType = WCChainTypeProxy().invoke(chain)
+ val total = utxos.map { it.value.toLong() }.fold(0L) { x, y -> x + y }
+ if (total == 0L) {
+ return BigInteger.ZERO // empty balance
+ }
+ val input = Bitcoin.SigningInput.newBuilder().apply {
+ this.hashType = BitcoinSigHashType.ALL.value()
+ this.byteFee = bytePrice
+ this.amount = amount
+ this.useMaxAmount = total == amount
+ this.coinType = coinType.value()
+ this.toAddress = destinationAddress
+ this.changeAddress = senderAddress
+ this.addAllUtxo(utxos.getUtxoTransactions(senderAddress, coinType))
+ }.build()
+
+ val plan = AnySigner.plan(input, coinType, Bitcoin.TransactionPlan.parser())
+ when (plan.error) {
+ Common.SigningError.OK -> { /* continue */ }
+ Common.SigningError.Error_not_enough_utxos,
+ Common.SigningError.Error_dust_amount_requested,
+ Common.SigningError.Error_missing_input_utxos -> throw IllegalStateException("Dust Error: $bytePrice")
+ else -> throw IllegalStateException(plan.error.name)
+ }
+
+ val selectedUtxos: MutableList = mutableListOf()
+ for (raw in plan.utxosList) {
+ input.utxoList?.indexOfFirst { it == raw }?.let {
+ selectedUtxos.add(utxos[it])
+ }
+ }
+ if (utxos.isNotEmpty() && selectedUtxos.isEmpty() && amount != total && amount <= total) {
+ return calcFee(chain, senderAddress, destinationAddress, total, bytePrice, utxos)
+ }
+ return BigInteger.valueOf(plan.fee/* / bytePrice*/) //
+ }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinNodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinNodeStatusClient.kt
deleted file mode 100644
index d329d8a1f..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinNodeStatusClient.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.clients.NodeStatusClient
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinNodeStatusService
-import com.gemwallet.android.blockchain.clients.bitcoin.services.getBlock
-import com.gemwallet.android.blockchain.clients.bitcoin.services.getNodeInfo
-import com.gemwallet.android.blockchain.rpc.getLatency
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-
-class BitcoinNodeStatusClient(
- private val chain: Chain,
- private val nodeStatusService: BitcoinNodeStatusService,
-) : NodeStatusClient {
-
- override suspend fun getNodeStatus(chain: Chain, url: String): NodeStatus? = withContext(Dispatchers.IO) {
- val nodeInfoJob = async { nodeStatusService.getNodeInfo(url).getOrNull() }
- val chainIdJob = async { nodeStatusService.getBlock(url) }
- val nodeInfo = nodeInfoJob.await() ?: return@withContext null
- val chainId = chainIdJob.await()
-
- NodeStatus(
- url = url,
- chainId = chainId.body()?.previousBlockHash ?: return@withContext null,
- blockNumber = nodeInfo.blockbook.bestHeight.toString(),
- inSync = nodeInfo.blockbook.inSync,
- latency = chainId.getLatency()
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignClient.kt
index 416b53cd0..c95675836 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignClient.kt
@@ -6,12 +6,12 @@ import com.gemwallet.android.math.decodeHex
import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
import com.gemwallet.android.model.GasFee
import com.google.protobuf.ByteString
-import com.wallet.core.blockchain.bitcoin.BitcoinUTXO
import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
import com.wallet.core.primitives.SwapProvider
+import com.wallet.core.primitives.UTXO
import wallet.core.java.AnySigner
import wallet.core.jni.BitcoinScript
import wallet.core.jni.CoinType
@@ -29,14 +29,14 @@ class BitcoinSignClient(
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val signingInput = getSigningInput(
params,
chainData,
finalAmount,
- feePriority,
+ fee,
privateKey
)
return sign(signingInput.build())
@@ -46,7 +46,7 @@ class BitcoinSignClient(
params: ConfirmParams.SwapParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val providers = setOf(SwapProvider.Thorchain, SwapProvider.Chainflip)
@@ -61,7 +61,7 @@ class BitcoinSignClient(
params,
chainData,
finalAmount,
- feePriority,
+ fee,
privateKey,
)
when(params.protocolId) {
@@ -85,11 +85,11 @@ class BitcoinSignClient(
params: ConfirmParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): Bitcoin.SigningInput.Builder {
- val chainData = chainData as BitcoinSignerPreloader.BitcoinChainData
- val gasFee = chainData.fee(feePriority) as GasFee
+ val chainData = chainData as BitcoinChainData
+ val gasFee = fee as GasFee
val coinType = coinType
return Bitcoin.SigningInput.newBuilder().apply {
@@ -102,7 +102,7 @@ class BitcoinSignClient(
this.useMaxAmount = params.isMax()
this.addPrivateKey(ByteString.copyFrom(privateKey))
this.addAllUtxo(chainData.utxo.getUtxoTransactions(params.from.address, coinType))
- chainData.utxo.forEach {
+ chainData.utxo.forEach { _ ->
val redeemScript = BitcoinScript.lockScriptForAddress(params.from.address, coinType)
val scriptData = redeemScript.data()
if (coinType == CoinType.BITCOIN || scriptData?.isNotEmpty() == true) {
@@ -126,16 +126,16 @@ class BitcoinSignClient(
if (output.errorMessage.isNotEmpty()) {
throw IllegalStateException(output.errorMessage)
}
- return listOf(output.encoded.toByteArray())
+ return listOf(output.encoded.toByteArray().toHexString("").toByteArray())
}
override fun supported(chain: Chain): Boolean = this.chain == chain
}
-fun List.getUtxoTransactions(address: String, coinType: CoinType): List {
+fun List.getUtxoTransactions(address: String, coinType: CoinType): List {
return map { utxo ->
Bitcoin.UnspentTransaction.newBuilder().apply {
- val hash = utxo.txid.decodeHex()
+ val hash = utxo.transaction_id.decodeHex()
hash.reverse()
this.outPoint = Bitcoin.OutPoint.newBuilder().apply {
this.hash = ByteString.copyFrom(hash)
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignerPreloader.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignerPreloader.kt
deleted file mode 100644
index c3f14356c..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinSignerPreloader.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.clients.NativeTransferPreloader
-import com.gemwallet.android.blockchain.clients.SwapTransactionPreloader
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinFeeService
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinUTXOService
-import com.gemwallet.android.ext.fullAddress
-import com.gemwallet.android.ext.toBitcoinChain
-import com.gemwallet.android.model.ChainSignData
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.SignerParams
-import com.wallet.core.blockchain.bitcoin.BitcoinUTXO
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import java.math.BigInteger
-
-class BitcoinSignerPreloader(
- private val chain: Chain,
- private val utxoService: BitcoinUTXOService,
- feeService: BitcoinFeeService,
-) : NativeTransferPreloader, SwapTransactionPreloader {
-
- private val feeCalculator = BitcoinFeeCalculator(feeService)
-
- override suspend fun preloadNativeTransfer(params: ConfirmParams.TransferParams.Native): SignerParams {
- val data = preload(params.from, params.destination().address, params.amount)
- return SignerParams(params, data)
- }
-
- override suspend fun preloadSwap(params: ConfirmParams.SwapParams): SignerParams {
- val data = preload(params.from, params.destination().address, params.amount)
- return SignerParams(params, data)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
- private suspend fun preload(fromAccount: Account, destinationAddress: String, amount: BigInteger): BitcoinChainData {
- val address = chain.toBitcoinChain().fullAddress(fromAccount.address)
- val utxo = utxoService.getUTXO(address).getOrNull() ?: throw Exception("Can't load UTXO")
- val fee = feeCalculator.calculate(utxo, fromAccount, destinationAddress, amount)
- return BitcoinChainData(utxo, fee)
- }
-
- data class BitcoinChainData(
- val utxo: List,
- val fee: List,
- ) : ChainSignData {
- override fun fee(speed: FeePriority): Fee = fee.firstOrNull { it.priority == speed } ?: fee.first()
-
- override fun allFee(): List = fee
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinTransactionStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinTransactionStatusClient.kt
deleted file mode 100644
index 7b249c976..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinTransactionStatusClient.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin
-
-import com.gemwallet.android.blockchain.clients.ServiceUnavailable
-import com.gemwallet.android.blockchain.clients.TransactionStateRequest
-import com.gemwallet.android.blockchain.clients.TransactionStatusClient
-import com.gemwallet.android.blockchain.clients.bitcoin.services.BitcoinTransactionsService
-import com.gemwallet.android.model.TransactionChanges
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionState
-
-class BitcoinTransactionStatusClient(
- private val chain: Chain,
- private val rpcClient: BitcoinTransactionsService
-) : TransactionStatusClient {
-
- override suspend fun getStatus(request: TransactionStateRequest): TransactionChanges {
- val tx = rpcClient.transaction(request.hash).getOrNull() ?: throw ServiceUnavailable
- return TransactionChanges(if (tx.blockHeight > 0) TransactionState.Confirmed else TransactionState.Pending)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinBalancesService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinBalancesService.kt
deleted file mode 100644
index 420d69535..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinBalancesService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinAccount
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface BitcoinBalancesService {
- @GET("/api/v2/address/{address}")
- suspend fun balance(@Path("address") address: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinBroadcastService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinBroadcastService.kt
deleted file mode 100644
index 2bbe5af21..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinBroadcastService.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinTransactionBroacastResult
-import okhttp3.RequestBody
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface BitcoinBroadcastService {
- @POST("/api/v2/sendtx/")
- suspend fun broadcast(@Body body: RequestBody): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinFeeService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinFeeService.kt
deleted file mode 100644
index 6bdf049ef..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinFeeService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinFeeResult
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface BitcoinFeeService {
- @GET("/api/v2/estimatefee/{priority}")
- suspend fun estimateFee(@Path("priority") priority: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinNodeStatusService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinNodeStatusService.kt
deleted file mode 100644
index ac26fc3a3..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinNodeStatusService.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinBlock
-import com.wallet.core.blockchain.bitcoin.BitcoinNodeInfo
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Url
-
-interface BitcoinNodeStatusService {
- @GET//("/api/v2/")
- suspend fun nodeInfo(@Url url: String): Result
-
- @GET//("/api/v2/block/{block}")
- suspend fun block(@Url url: String): Response
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinRpcClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinRpcClient.kt
deleted file mode 100644
index 6b790990b..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinRpcClient.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinBlock
-import com.wallet.core.blockchain.bitcoin.BitcoinNodeInfo
-import retrofit2.Response
-
-interface BitcoinRpcClient :
- BitcoinBalancesService,
- BitcoinUTXOService,
- BitcoinFeeService,
- BitcoinBroadcastService,
- BitcoinTransactionsService,
- BitcoinNodeStatusService
-
-suspend fun BitcoinNodeStatusService.getBlock(url: String): Response {
- return block("$url/api/v2/block/1")
-}
-
-suspend fun BitcoinNodeStatusService.getNodeInfo(url: String): Result {
- return nodeInfo("$url/api/v2")
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinTransactionsService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinTransactionsService.kt
deleted file mode 100644
index 14a18b601..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinTransactionsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinTransaction
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface BitcoinTransactionsService {
- @GET("/api/v2/tx/{txId}")
- suspend fun transaction(@Path("txId") txId: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinUTXOService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinUTXOService.kt
deleted file mode 100644
index b11ad9f60..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/services/BitcoinUTXOService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.bitcoin.services
-
-import com.wallet.core.blockchain.bitcoin.BitcoinUTXO
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface BitcoinUTXOService {
- @GET("/api/v2/utxo/{address}")
- suspend fun getUTXO(@Path("address") address: String): Result>
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoBalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoBalanceClient.kt
deleted file mode 100644
index 536afbbd4..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoBalanceClient.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano
-
-import com.gemwallet.android.blockchain.clients.BalanceClient
-import com.gemwallet.android.blockchain.clients.cardano.services.CardanoBalanceService
-import com.gemwallet.android.blockchain.clients.cardano.services.balance
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Chain
-
-class CardanoBalanceClient(
- private val chain: Chain,
- private val balanceService: CardanoBalanceService,
-) : BalanceClient {
-
- override suspend fun getNativeBalance(
- chain: Chain,
- address: String
- ): AssetBalance? {
- val amount = try {
- balanceService.balance(address)
- } catch (_: Throwable) {
- null
- } ?: return null
- return AssetBalance.create(chain.asset(), available = amount.toString())
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoBroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoBroadcastClient.kt
deleted file mode 100644
index a147bd71c..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoBroadcastClient.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano
-
-import com.gemwallet.android.blockchain.clients.BroadcastClient
-import com.gemwallet.android.blockchain.clients.cardano.services.CardanoBroadcastService
-import com.gemwallet.android.blockchain.clients.cardano.services.broadcast
-import com.gemwallet.android.blockchain.rpc.ServiceError
-import com.gemwallet.android.math.toHexString
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-
-class CardanoBroadcastClient(
- private val chain: Chain,
- private val broadcastService: CardanoBroadcastService
-) : BroadcastClient {
- override suspend fun send(
- account: Account,
- signedMessage: ByteArray,
- type: TransactionType
- ): String {
- return broadcastService.broadcast(signedMessage.toHexString(prefix = ""))?.submitTransaction?.hash
- ?: throw ServiceError.EmptyHash
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoChainData.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoChainData.kt
new file mode 100644
index 000000000..55f8e369d
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoChainData.kt
@@ -0,0 +1,16 @@
+package com.gemwallet.android.blockchain.clients.cardano
+
+import com.gemwallet.android.blockchain.services.mapper.toUtxo
+import com.gemwallet.android.model.ChainSignData
+import com.wallet.core.primitives.UTXO
+import uniffi.gemstone.GemTransactionLoadMetadata
+
+data class CardanoChainData(
+ val utxos: List,
+) : ChainSignData
+
+fun GemTransactionLoadMetadata.Cardano.toChainData(): CardanoChainData {
+ return CardanoChainData(
+ utxos = utxos.toUtxo(),
+ )
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoGatewayEstimateFee.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoGatewayEstimateFee.kt
new file mode 100644
index 000000000..9a783da93
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoGatewayEstimateFee.kt
@@ -0,0 +1,83 @@
+package com.gemwallet.android.blockchain.clients.cardano
+
+import com.gemwallet.android.blockchain.services.mapper.toUtxo
+import com.gemwallet.android.math.decodeHex
+import com.google.protobuf.ByteString
+import com.wallet.core.primitives.UTXO
+import uniffi.gemstone.Chain
+import uniffi.gemstone.GemFeeOptions
+import uniffi.gemstone.GemGatewayEstimateFee
+import uniffi.gemstone.GemTransactionLoadFee
+import uniffi.gemstone.GemTransactionLoadInput
+import uniffi.gemstone.GemTransactionLoadMetadata
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Cardano
+import java.math.BigInteger
+
+class CardanoGatewayEstimateFee : GemGatewayEstimateFee {
+ override suspend fun getFee(
+ chain: Chain,
+ input: GemTransactionLoadInput
+ ): GemTransactionLoadFee? {
+ val utxos = (input.metadata as? GemTransactionLoadMetadata.Cardano)?.utxos?.toUtxo()
+ ?: throw IllegalArgumentException("Incorrect UTXO")
+
+ val amount = input.value.toLongOrNull() ?: return null
+
+ val destination = input.destinationAddress
+ val from = input.senderAddress
+
+ val fee = calcFee(
+ from = from,
+ to = destination, amount,
+ useMaxAmount = input.isMaxValue,
+ utxos
+ )
+
+ return GemTransactionLoadFee(
+ fee = fee.toString(),
+ gasPriceType = input.gasPrice,
+ gasLimit = "1",
+ options = GemFeeOptions(emptyMap())
+ )
+ }
+
+ override suspend fun getFeeData(
+ chain: Chain,
+ input: GemTransactionLoadInput
+ ): String? {
+ return null
+ }
+
+ private fun calcFee(
+ from: String,
+ to: String,
+ amount: Long,
+ useMaxAmount: Boolean,
+ utxos: List,
+ ): BigInteger {
+ val signingInput = Cardano.SigningInput.newBuilder().apply {
+ this.addAllUtxos(
+ utxos.map { utxo ->
+ Cardano.TxInput.newBuilder().apply {
+ this.address = utxo.address
+ this.amount = utxo.value.toLong()
+ this.outPoint = Cardano.OutPoint.newBuilder().apply {
+ this.txHash = ByteString.copyFrom(utxo.transaction_id.decodeHex())
+ this.outputIndex = utxo.vout.toLong()
+ }.build()
+ }.build()
+ }
+ )
+ this.transferMessage = Cardano.Transfer.newBuilder().apply {
+ this.toAddress = to
+ this.changeAddress = from
+ this.amount = amount
+ this.useMaxAmount = useMaxAmount
+ }.build()
+ }.build()
+ val plan: Cardano.TransactionPlan = AnySigner.plan(signingInput, CoinType.CARDANO, Cardano.TransactionPlan.parser())
+ return plan.fee.toBigInteger()
+ }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoNodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoNodeStatusClient.kt
deleted file mode 100644
index 4daa5a0fb..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoNodeStatusClient.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano
-
-import com.gemwallet.android.blockchain.clients.NodeStatusClient
-import com.gemwallet.android.blockchain.clients.cardano.services.CardanoNodeStatusService
-import com.gemwallet.android.blockchain.clients.cardano.services.latestBlock
-import com.gemwallet.android.blockchain.clients.cardano.services.networkMagic
-import com.gemwallet.android.blockchain.rpc.getLatency
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-
-class CardanoNodeStatusClient(
- private val chain: Chain,
- private val nodeStatusService: CardanoNodeStatusService
-) : NodeStatusClient {
-
- override suspend fun getNodeStatus(
- chain: Chain,
- url: String
- ): NodeStatus? = withContext(Dispatchers.IO) {
- val getLatestBlock = async { nodeStatusService.latestBlock(url) }
- val getNetworkMagic = async { nodeStatusService.networkMagic(url) }
- val latestBlock = getLatestBlock.await()
- val networkMagic = getNetworkMagic.await()
- NodeStatus(
- url = url,
- chainId = networkMagic.body()?.data?.genesis?.shelley?.networkMagic?.toString() ?: "-",
- blockNumber = latestBlock.body()?.data?.cardano?.tip?.number?.toString() ?: return@withContext null,
- inSync = true,
- latency = latestBlock.getLatency(),
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignClient.kt
index 9ee08b2cc..4fe8223e0 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignClient.kt
@@ -2,11 +2,12 @@ package com.gemwallet.android.blockchain.clients.cardano
import com.gemwallet.android.blockchain.clients.SignClient
import com.gemwallet.android.math.decodeHex
+import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
import com.google.protobuf.ByteString
import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
import wallet.core.java.AnySigner
import wallet.core.jni.CoinType
import wallet.core.jni.proto.Cardano
@@ -20,10 +21,10 @@ class CardanoSignClient(
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- val chainData = (chainData as? CardanoSignerPreloaderClient.CardanoChainData)
+ val chainData = (chainData as? CardanoChainData)
?: throw IllegalArgumentException()
val signingInput = Cardano.SigningInput.newBuilder().apply {
this.addPrivateKey(ByteString.copyFrom(privateKey))
@@ -51,7 +52,7 @@ class CardanoSignClient(
if (!output.errorMessage.isNullOrEmpty()) {
throw Exception(output.errorMessage)
}
- return listOf(output.encoded.toByteArray())
+ return listOf(output.encoded.toByteArray().toHexString("").toByteArray())
}
override fun supported(chain: Chain): Boolean = this.chain == chain
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignerPreloaderClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignerPreloaderClient.kt
deleted file mode 100644
index 6b1011198..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoSignerPreloaderClient.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano
-
-import com.gemwallet.android.blockchain.clients.NativeTransferPreloader
-import com.gemwallet.android.blockchain.clients.cardano.services.CardanoServices
-import com.gemwallet.android.blockchain.clients.cardano.services.utxos
-import com.gemwallet.android.math.decodeHex
-import com.gemwallet.android.model.ChainSignData
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.SignerParams
-import com.google.protobuf.ByteString
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import com.wallet.core.primitives.UTXO
-import wallet.core.java.AnySigner
-import wallet.core.jni.CoinType
-import wallet.core.jni.proto.Cardano
-
-class CardanoSignerPreloaderClient(
- private val chain: Chain,
- private val feeServices: CardanoServices
-) : NativeTransferPreloader {
-
- override suspend fun preloadNativeTransfer(params: ConfirmParams.TransferParams.Native): SignerParams {
- val utxos = feeServices.utxos(params.from.address)
- val fee = calculateFee(params, utxos)
-
- return SignerParams(
- input = params,
- chainData = CardanoChainData(
- fee = Fee(
- feeAssetId = AssetId(chain),
- priority = FeePriority.Normal,
- amount = fee.toBigInteger(),
- ),
- utxos = utxos,
- )
- )
- }
-
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
- private fun calculateFee(params: ConfirmParams.TransferParams.Native, utxos: List): Long {
- val signingInput = Cardano.SigningInput.newBuilder().apply {
- this.addAllUtxos(
- utxos.map { utxo ->
- Cardano.TxInput.newBuilder().apply {
- this.address = utxo.address
- this.amount = utxo.value.toLong()
- this.outPoint = Cardano.OutPoint.newBuilder().apply {
- this.txHash = ByteString.copyFrom(utxo.transaction_id.decodeHex())
- this.outputIndex = utxo.vout.toLong()
- }.build()
- }.build()
- }
- )
- this.transferMessage = Cardano.Transfer.newBuilder().apply {
- this.toAddress = params.destination.address
- this.changeAddress = params.from.address
- this.amount = params.amount.toLong()
- this.useMaxAmount = params.isMaxAmount
- }.build()
- }.build()
- val plan: Cardano.TransactionPlan = AnySigner.plan(signingInput, CoinType.CARDANO, Cardano.TransactionPlan.parser())
- return plan.fee
- }
-
- data class CardanoChainData(
- val fee: Fee,
- val utxos: List,
- ) : ChainSignData {
-
- override fun fee(speed: FeePriority): Fee = fee
-
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoTransactionStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoTransactionStatusClient.kt
deleted file mode 100644
index 763f0b90a..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/CardanoTransactionStatusClient.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano
-
-import com.gemwallet.android.blockchain.clients.ServiceUnavailable
-import com.gemwallet.android.blockchain.clients.TransactionStateRequest
-import com.gemwallet.android.blockchain.clients.TransactionStatusClient
-import com.gemwallet.android.blockchain.clients.cardano.services.CardanoTransactionService
-import com.gemwallet.android.blockchain.clients.cardano.services.transaction
-import com.gemwallet.android.model.TransactionChanges
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionState
-
-class CardanoTransactionStatusClient(
- private val chain: Chain,
- private val transactionsService: CardanoTransactionService,
-) : TransactionStatusClient {
-
- override suspend fun getStatus(request: TransactionStateRequest): TransactionChanges {
- val transaction = transactionsService.transaction(request.hash) ?: throw ServiceUnavailable
- return TransactionChanges(
- state = TransactionState.Confirmed,
- fee = transaction.fee.toBigInteger(),
- )
-// TODO: transaction.block.number
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoBalanceService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoBalanceService.kt
deleted file mode 100644
index 01e463f72..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoBalanceService.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano.services
-
-import com.wallet.core.blockchain.cardano.CardanoAggregateBalance
-import com.wallet.core.blockchain.cardano.CardanoUTXOS
-import com.wallet.core.primitives.GraphqlData
-import com.wallet.core.primitives.GraphqlRequest
-import retrofit2.http.Body
-import retrofit2.http.POST
-import java.math.BigInteger
-
-interface CardanoBalanceService {
-
- @POST("/")
- suspend fun balance(@Body request: GraphqlRequest): Result>>
-
-}
-
-suspend fun CardanoBalanceService.balance(address: String): BigInteger? {
- val request = GraphqlRequest(
- operationName = "GetBalance",
- variables = hashMapOf(
- "address" to address
- ),
- query = "query GetBalance(\$address: String!) { utxos: utxos_aggregate(where: { address: { _eq: \$address } } ) { aggregate { sum { value } } } }"
- )
- return balance(request).getOrNull()?.data?.utxos?.aggregate?.sum?.value?.toBigInteger()
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoBroadcastService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoBroadcastService.kt
deleted file mode 100644
index 13910ef06..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoBroadcastService.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano.services
-
-import com.wallet.core.blockchain.cardano.CardanoTransactionBroadcast
-import com.wallet.core.primitives.GraphqlData
-import com.wallet.core.primitives.GraphqlRequest
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface CardanoBroadcastService {
- @POST("/")
- suspend fun broadcast(@Body request: GraphqlRequest): Result>
-}
-
-suspend fun CardanoBroadcastService.broadcast(data: String): CardanoTransactionBroadcast? {
- val request = GraphqlRequest(
- operationName = "SubmitTransaction",
- variables = hashMapOf("transaction" to data),
- query = "mutation SubmitTransaction(\$transaction: String!) { submitTransaction(transaction: \$transaction) { hash } }"
- )
- val result = broadcast(request)
- val data = result.getOrNull()
- return data?.errors?.firstOrNull()?.let {
- throw Exception(it.message)
- } ?: data?.data
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoFeeService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoFeeService.kt
deleted file mode 100644
index c051c380f..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoFeeService.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano.services
-
-import com.wallet.core.blockchain.cardano.CardanoUTXO
-import com.wallet.core.blockchain.cardano.CardanoUTXOS
-import com.wallet.core.primitives.GraphqlData
-import com.wallet.core.primitives.GraphqlRequest
-import com.wallet.core.primitives.UTXO
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface CardanoFeeService {
- @POST("/")
- suspend fun utxos(@Body request: GraphqlRequest): Result>>>
-}
-
-suspend fun CardanoFeeService.utxos(address: String): List {
- val request = GraphqlRequest(
- operationName = "UtxoSetForAddress",
- variables = hashMapOf("address" to address),
- query = "query UtxoSetForAddress(\$address: String!) { utxos(order_by: { value: desc } , where: { address: { _eq: \$address } } ) { address value txHash index tokens { quantity asset { fingerprint policyId assetName } } } }"
- )
- return utxos(request).getOrNull()?.data?.utxos?.map {
- UTXO(
- transaction_id = it.txHash,
- vout = it.index,
- value = it.value,
- address = it.address,
- )
- } ?: emptyList()
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoNodeStatusService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoNodeStatusService.kt
deleted file mode 100644
index c12d04581..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoNodeStatusService.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano.services
-
-import com.wallet.core.blockchain.cardano.CardanoBlockData
-import com.wallet.core.blockchain.cardano.CardanoGenesisData
-import com.wallet.core.primitives.GraphqlData
-import com.wallet.core.primitives.GraphqlRequest
-import retrofit2.Response
-import retrofit2.http.Body
-import retrofit2.http.POST
-import retrofit2.http.Url
-
-interface CardanoNodeStatusService {
- @POST
- suspend fun latestBlock(@Url url: String, @Body request: GraphqlRequest): Response>
-
- @POST
- suspend fun networkMagic(@Url url: String, @Body request: GraphqlRequest): Response>
-}
-
-suspend fun CardanoNodeStatusService.latestBlock(url: String): Response> {
- val request = GraphqlRequest(
- operationName = "GetBlockNumber",
- variables = hashMapOf(),
- query = "query GetBlockNumber { cardano { tip { number } } }"
- )
- return latestBlock(url, request)
-}
-
-suspend fun CardanoNodeStatusService.networkMagic(url: String): Response> {
- val request = GraphqlRequest(
- operationName = "GetNetworkMagic",
- variables = hashMapOf(),
- query = "query GetNetworkMagic { genesis { shelley { networkMagic } } }"
- )
- return networkMagic(url, request)
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoServices.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoServices.kt
deleted file mode 100644
index 78be5b297..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoServices.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano.services
-
-interface CardanoServices : CardanoBalanceService,
- CardanoTransactionService,
- CardanoFeeService,
- CardanoBroadcastService,
- CardanoNodeStatusService
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoTransactionService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoTransactionService.kt
deleted file mode 100644
index 34cf13111..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cardano/services/CardanoTransactionService.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cardano.services
-
-import com.wallet.core.blockchain.cardano.CardanoTransaction
-import com.wallet.core.blockchain.cardano.CardanoTransactions
-import com.wallet.core.primitives.GraphqlData
-import com.wallet.core.primitives.GraphqlRequest
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface CardanoTransactionService {
-
- @POST("/")
- suspend fun transaction(@Body request: GraphqlRequest): Result>
-}
-
-suspend fun CardanoTransactionService.transaction(hash: String): CardanoTransaction? {
- val request = GraphqlRequest(
- operationName = "TransactionsByHash",
- variables = hashMapOf(
- "hash" to hash,
- ),
- query = "query TransactionsByHash(\$hash: Hash32Hex!) { transactions(where: { hash: { _eq: \$hash } } ) { block { number } fee } }"
- )
- return transaction(request).getOrNull()?.data?.transactions?.firstOrNull()
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosBalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosBalanceClient.kt
deleted file mode 100644
index b17f873d8..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosBalanceClient.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import com.gemwallet.android.blockchain.clients.BalanceClient
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosBalancesService
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosStakeService
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.CosmosDenom
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-import java.math.BigInteger
-
-class CosmosBalanceClient(
- private val chain: Chain,
- private val balancesService: CosmosBalancesService,
- private val stakeService: CosmosStakeService,
-) : BalanceClient {
-
- override suspend fun getNativeBalance(chain: Chain, address: String): AssetBalance? = withContext(Dispatchers.IO) {
- val denom = CosmosDenom.from(chain)
-
- val getBalances = async { balancesService.getBalance(address).getOrNull()?.balances }
- val response = getBalances.await()
- val balance = response?.filter { it.denom == denom }
- ?.map { it.amount.toBigDecimal().toBigInteger() }
- ?.fold(BigInteger.ZERO) { acc, value -> acc + value} ?: return@withContext null
-
- when (chain) {
- Chain.Thorchain,
- Chain.Noble -> AssetBalance.create(chain.asset(), available = balance.toString())
- else -> {
- val getDelegations = async { stakeService.delegations(address).getOrNull()?.delegation_responses }
- val getUnboundingDelegations = async { stakeService.undelegations(address).getOrNull()?.unbonding_responses }
- val getRewards = async { stakeService.rewards(address).getOrNull()?.rewards }
-
- val delegations = getDelegations.await()
- ?.filter { it.balance.denom == denom }
- ?.map { it.balance.amount.toBigDecimal().toBigInteger() }
- ?.fold(BigInteger.ZERO) { acc, value -> acc + value} ?: return@withContext null
- val undelegations = getUnboundingDelegations.await()
- ?.mapNotNull { entry ->
- entry.entries.map { it.balance.toBigDecimal().toBigInteger() }
- .reduceOrNull { acc, value -> acc + value }
- }
- ?.fold(BigInteger.ZERO) { acc, value -> acc + value } ?: return@withContext null
- val rewards = getRewards.await()
- ?.mapNotNull { reward ->
- reward.reward
- .filter { it.denom == denom }
- .map { it.amount.toBigDecimal().toBigInteger() }
- .reduceOrNull { acc, value -> acc + value}
- }?.fold(BigInteger.ZERO) { acc, value -> acc + value } ?: return@withContext null
- AssetBalance.create(
- asset = chain.asset(),
- available = balance.toString(),
- staked = delegations.toString(),
- pending = undelegations.toString(),
- rewards = rewards.toString(),
- )
- }
- }
- }
-
- override suspend fun getDelegationBalances(chain: Chain, address: String): AssetBalance? = withContext(Dispatchers.IO) {
- when (chain) {
- Chain.Thorchain,
- Chain.Noble -> return@withContext null
- else -> {}
- }
- val denom = CosmosDenom.from(chain)
-
- val getDelegations = async { stakeService.delegations(address).getOrNull()?.delegation_responses }
- val getUnboundingDelegations = async { stakeService.undelegations(address).getOrNull()?.unbonding_responses }
- val getRewards = async { stakeService.rewards(address).getOrNull()?.rewards }
-
- val delegations = getDelegations.await()
- ?.filter { it.balance.denom == denom }
- ?.map { it.balance.amount.toBigDecimal().toBigInteger() }
- ?.fold(BigInteger.ZERO) { acc, value -> acc + value} ?: return@withContext null
- val undelegations = getUnboundingDelegations.await()
- ?.mapNotNull { entry ->
- entry.entries.map { it.balance.toBigDecimal().toBigInteger() }
- .reduceOrNull { acc, value -> acc + value }
- }
- ?.fold(BigInteger.ZERO) { acc, value -> acc + value } ?: return@withContext null
- val rewards = getRewards.await()
- ?.mapNotNull { reward ->
- reward.reward
- .filter { it.denom == denom }
- .map { it.amount.toBigDecimal().toBigInteger() }
- .reduceOrNull { acc, value -> acc + value}
- }?.fold(BigInteger.ZERO) { acc, value -> acc + value } ?: return@withContext null
- AssetBalance.create(
- asset = chain.asset(),
- staked = delegations.toString(),
- pending = undelegations.toString(),
- rewards = rewards.toString(),
- )
- }
-
- override suspend fun getTokenBalances(chain: Chain, address: String, tokens: List): List {
- val balances = try {
- balancesService.getBalance(address).getOrNull() ?: return emptyList()
- } catch (_: Throwable) {
- return emptyList()
- }
- return tokens.map { asset ->
- val amount = balances.balances.firstOrNull { it.denom == asset.id.tokenId }?.amount ?: "0"
- AssetBalance.create(
- asset,
- available = try {
- amount
- } catch (_: Throwable) {
- return@map null
- }
- )
- }.mapNotNull { it }
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
-
-fun CosmosDenom.Companion.from(chain: Chain): String = when (chain) {
- Chain.Cosmos -> CosmosDenom.Uatom.string
- Chain.Osmosis -> CosmosDenom.Uosmo.string
- Chain.Thorchain -> CosmosDenom.Rune.string
- Chain.Celestia -> CosmosDenom.Utia.string
- Chain.Injective -> CosmosDenom.Inj.string
- Chain.Sei -> CosmosDenom.Usei.string
- Chain.Noble -> CosmosDenom.Uusdc.string
- else -> throw IllegalArgumentException("Coin is not supported")
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosBroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosBroadcastClient.kt
deleted file mode 100644
index 757a39f70..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosBroadcastClient.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import com.gemwallet.android.blockchain.Mime
-import com.gemwallet.android.blockchain.clients.BroadcastClient
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosBroadcastService
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-import okhttp3.RequestBody.Companion.toRequestBody
-
-class CosmosBroadcastClient(
- private val chain: Chain,
- private val broadcastService: CosmosBroadcastService,
-) : BroadcastClient {
-
- override suspend fun send(account: Account, signedMessage: ByteArray, type: TransactionType): String {
- val requestData = signedMessage.toString(Charsets.UTF_8)
- val requestBody = requestData.toRequestBody(Mime.Json.value)
- val result = broadcastService.broadcast(requestBody)
- val data = result.getOrNull() ?: throw Exception(result.exceptionOrNull()?.message ?: "Broadcast error")
- if (data.tx_response.code != 0) {
- throw Exception(data.tx_response.raw_log)
- }
- return data.tx_response.txhash
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosChainData.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosChainData.kt
new file mode 100644
index 000000000..4eb3c3e83
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosChainData.kt
@@ -0,0 +1,18 @@
+package com.gemwallet.android.blockchain.clients.cosmos
+
+import com.gemwallet.android.model.ChainSignData
+import uniffi.gemstone.GemTransactionLoadMetadata
+
+data class CosmosChainData(
+ val chainId: String,
+ val accountNumber: ULong,
+ val sequence: ULong,
+) : ChainSignData
+
+fun GemTransactionLoadMetadata.Cosmos.toChainData(): CosmosChainData {
+ return CosmosChainData(
+ chainId = chainId,
+ accountNumber = accountNumber,
+ sequence = sequence
+ )
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosDenom.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosDenom.kt
new file mode 100644
index 000000000..f9e22173c
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosDenom.kt
@@ -0,0 +1,15 @@
+package com.gemwallet.android.blockchain.clients.cosmos
+
+import com.wallet.core.primitives.Chain
+import com.wallet.core.primitives.CosmosDenom
+
+fun CosmosDenom.Companion.from(chain: Chain): String = when (chain) {
+ Chain.Cosmos -> CosmosDenom.Uatom.string
+ Chain.Osmosis -> CosmosDenom.Uosmo.string
+ Chain.Thorchain -> CosmosDenom.Rune.string
+ Chain.Celestia -> CosmosDenom.Utia.string
+ Chain.Injective -> CosmosDenom.Inj.string
+ Chain.Sei -> CosmosDenom.Usei.string
+ Chain.Noble -> CosmosDenom.Uusdc.string
+ else -> throw IllegalArgumentException("Coin is not supported")
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosFeeCalculator.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosFeeCalculator.kt
deleted file mode 100644
index a544a6a93..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosFeeCalculator.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.GasFee
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import com.wallet.core.primitives.TransactionType
-import java.math.BigInteger
-
-class CosmosFeeCalculator(
- private val chain: Chain,
-) {
- fun calculate(txType: TransactionType): Fee {
- val assetId = AssetId(chain)
- val maxGasFee = when (chain) {
- Chain.Cosmos -> when (txType) {
- TransactionType.Transfer, TransactionType.Swap -> BigInteger.valueOf(3_000L)
- else -> BigInteger.valueOf(25_000L)
- }
- Chain.Osmosis -> when (txType) {
- TransactionType.Transfer, TransactionType.Swap -> BigInteger.valueOf(10_000L)
- else -> BigInteger.valueOf(100_000L)
- }
-
- Chain.Thorchain -> BigInteger.valueOf(2_000_000)
- Chain.Celestia -> when (txType){
- TransactionType.Transfer, TransactionType.Swap -> BigInteger.valueOf(3_000L)
- else -> BigInteger.valueOf(10_000L)
- }
- Chain.Injective -> when (txType){
- TransactionType.Transfer, TransactionType.Swap -> BigInteger.valueOf(100_000_000_000_000L)
- else -> BigInteger.valueOf(1_000_000_000_000_000L)
- }
- Chain.Sei -> when (txType){
- TransactionType.Transfer, TransactionType.Swap -> BigInteger.valueOf(100_000L)
- else -> BigInteger.valueOf(200_000L)
- }
- Chain.Noble -> BigInteger.valueOf(25_000)
- else -> throw IllegalArgumentException("Unsupported chain")
- }
- val limit = when (txType) {
- TransactionType.Transfer, TransactionType.Swap -> BigInteger.valueOf(200_000L)
- TransactionType.StakeDelegate,
- TransactionType.StakeUndelegate -> BigInteger.valueOf(1_000_000)
- TransactionType.StakeRewards -> BigInteger.valueOf(900_000)
- TransactionType.StakeRedelegate -> BigInteger.valueOf(1_250_000)
- TransactionType.StakeWithdraw,
- TransactionType.AssetActivation,
- TransactionType.TransferNFT,
- TransactionType.SmartContractCall,
- TransactionType.TokenApproval -> throw IllegalArgumentException("Chain not available: no limit fee")
-
- }
- return GasFee(
- feeAssetId = assetId,
- priority = FeePriority.Normal,
- maxGasPrice = maxGasFee,
- amount = maxGasFee,
- limit = limit,
- )
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosNodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosNodeStatusClient.kt
deleted file mode 100644
index 1c3e55fd2..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosNodeStatusClient.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import com.gemwallet.android.blockchain.clients.NodeStatusClient
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosNodeStatusService
-import com.gemwallet.android.blockchain.rpc.getLatency
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-
-class CosmosNodeStatusClient(
- private val chain: Chain,
- private val nodeStatusService: CosmosNodeStatusService,
-) : NodeStatusClient {
- override suspend fun getNodeStatus(chain: Chain, url: String): NodeStatus? = withContext(Dispatchers.IO) {
- val inSyncJob = async { nodeStatusService.syncing("$url/cosmos/base/tendermint/v1beta1/syncing") }
- val nodeInfoJob = async { nodeStatusService.getNodeInfo("$url/cosmos/base/tendermint/v1beta1/blocks/latest").getOrNull()?.block?.header }
-
- val inSync = inSyncJob.await()
- val nodeInfo = nodeInfoJob.await() ?: return@withContext null
-
- NodeStatus(
- url = url,
- inSync = !(inSync.body()?.syncing ?: return@withContext null),
- blockNumber = nodeInfo.height,
- chainId = nodeInfo.chain_id,
- latency = inSync.getLatency()
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignClient.kt
index 48eed6d79..d52c7f49d 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignClient.kt
@@ -4,11 +4,12 @@ import com.gemwallet.android.blockchain.clients.SignClient
import com.gemwallet.android.blockchain.operators.walletcore.WCChainTypeProxy
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
import com.gemwallet.android.model.GasFee
import com.google.protobuf.ByteString
import com.wallet.core.primitives.Chain
import com.wallet.core.primitives.CosmosDenom
-import com.wallet.core.primitives.FeePriority
+import com.wallet.core.primitives.DelegationValidator
import wallet.core.java.AnySigner
import wallet.core.jni.AnyAddress
import wallet.core.jni.CoinType
@@ -30,7 +31,7 @@ class CosmosSignClient(
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val denom = CosmosDenom.from(chain)
@@ -40,7 +41,7 @@ class CosmosSignClient(
coin = coin,
amount = getAmount(finalAmount, denom = denom)
)
- return sign(chainData, message, params.memo() ?: "", privateKey)
+ return sign(chainData, fee, message, params.memo() ?: "", privateKey)
}
@@ -48,7 +49,7 @@ class CosmosSignClient(
params: ConfirmParams.TransferParams.Token,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val denom = params.asset.id.tokenId!!
@@ -59,14 +60,14 @@ class CosmosSignClient(
coin = coin,
amount = getAmount(finalAmount, denom = denom)
)
- return sign(chainData, message, params.memo() ?: "", privateKey)
+ return sign(chainData, fee, message, params.memo() ?: "", privateKey)
}
override suspend fun signSwap(
params: ConfirmParams.SwapParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val denom = CosmosDenom.from(chain)
@@ -80,14 +81,14 @@ class CosmosSignClient(
)
}
val memo = params.swapData ?: throw IllegalArgumentException("No swap data")
- return sign(chainData, message, memo, privateKey)
+ return sign(chainData, fee, message, memo, privateKey)
}
override suspend fun signTokenApproval(
params: ConfirmParams.TokenApprovalParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
throw IllegalArgumentException()
@@ -97,59 +98,59 @@ class CosmosSignClient(
params: ConfirmParams.Stake.DelegateParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val denom = CosmosDenom.from(chain)
- val message = getStakeMessage(params.from.address, params.validatorId, getAmount(finalAmount, denom))
- return sign(chainData, message, "Stake via Gem Wallet", privateKey)
+ val message = getStakeMessage(params.from.address, params.validator.id, getAmount(finalAmount, denom))
+ return sign(chainData, fee, message, "Stake via Gem Wallet", privateKey)
}
override suspend fun signRedelegate(
params: ConfirmParams.Stake.RedelegateParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val denom = CosmosDenom.from(chain)
val message = getRedelegateMessage(
delegatorAddress = params.from.address,
- validatorSrcAddress = params.srcValidatorId,
- validatorDstAddress = params.dstValidatorId,
+ validatorSrcAddress = params.delegation.validator.id,
+ validatorDstAddress = params.dstValidator.id,
amount = getAmount(params.amount, denom),
)
- return sign(chainData, message, "Stake via Gem Wallet", privateKey)
+ return sign(chainData, fee, message, "Stake via Gem Wallet", privateKey)
}
override suspend fun signRewards(
params: ConfirmParams.Stake.RewardsParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- val message = getRewardsMessage(params.from.address, params.validatorsId)
- return sign(chainData, message, "Stake via Gem Wallet", privateKey)
+ val message = getRewardsMessage(params.from.address, params.validators)
+ return sign(chainData, fee, message, "Stake via Gem Wallet", privateKey)
}
override suspend fun signUndelegate(
params: ConfirmParams.Stake.UndelegateParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
val denom = CosmosDenom.from(chain)
- val message = getUnstakeMessage(params.from.address, params.validatorId, getAmount(params.amount, denom))
- return sign(chainData, message, "Stake via Gem Wallet", privateKey)
+ val message = getUnstakeMessage(params.from.address, params.delegation.validator.id, getAmount(params.amount, denom))
+ return sign(chainData, fee, message, "Stake via Gem Wallet", privateKey)
}
override suspend fun signWithdraw(
params: ConfirmParams.Stake.WithdrawParams,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
throw IllegalArgumentException()
@@ -220,12 +221,12 @@ class CosmosSignClient(
return listOf(message)
}
- fun getRewardsMessage(delegatorAddress: String, validators: List): List {
+ fun getRewardsMessage(delegatorAddress: String, validators: List): List {
return validators.map { validator ->
Message.newBuilder().apply {
withdrawStakeRewardMessage = WithdrawDelegationReward.newBuilder().apply {
this.delegatorAddress = delegatorAddress
- this.validatorAddress = validator
+ this.validatorAddress = validator.id
}.build()
}.build()
}
@@ -268,12 +269,13 @@ class CosmosSignClient(
private fun sign(
chainData: ChainSignData,
+ fee: Fee,
messages: List,
memo: String,
privateKey: ByteArray
): List {
- val meta = chainData as CosmosSignerPreloader.CosmosChainData
- val fee = meta.fee() as GasFee
+ val meta = chainData as CosmosChainData
+ val fee = fee as GasFee
val feeAmount = fee.amount
val gas = fee.limit.toLong() * messages.size
val coin = WCChainTypeProxy().invoke(chain)
@@ -295,8 +297,8 @@ class CosmosSignClient(
this.mode = Cosmos.BroadcastMode.SYNC
this.signingMode = Cosmos.SigningMode.Protobuf
this.chainId = meta.chainId
- this.accountNumber = meta.accountNumber
- this.sequence = meta.sequence
+ this.accountNumber = meta.accountNumber.toLong()
+ this.sequence = meta.sequence.toLong()
this.fee = cosmosFee
this.memo = memo
this.privateKey = ByteString.copyFrom(privateKey)
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignerPreloader.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignerPreloader.kt
deleted file mode 100644
index 030bd6a0f..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosSignerPreloader.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import com.gemwallet.android.blockchain.clients.NativeTransferPreloader
-import com.gemwallet.android.blockchain.clients.StakeTransactionPreloader
-import com.gemwallet.android.blockchain.clients.SwapTransactionPreloader
-import com.gemwallet.android.blockchain.clients.TokenTransferPreloader
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosAccountsService
-import com.gemwallet.android.model.ChainSignData
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.Fee
-import com.gemwallet.android.model.SignerParams
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.FeePriority
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-
-class CosmosSignerPreloader(
- private val chain: Chain,
- private val accountsService: CosmosAccountsService,
-) : NativeTransferPreloader, TokenTransferPreloader, StakeTransactionPreloader, SwapTransactionPreloader {
-
- private val feeCalculator = CosmosFeeCalculator(chain)
-
- override suspend fun preloadTokenTransfer(params: ConfirmParams.TransferParams.Token): SignerParams {
- return preload(params)
- }
-
- override suspend fun preloadNativeTransfer(params: ConfirmParams.TransferParams.Native): SignerParams {
- return preload(params)
- }
- override suspend fun preloadStake(params: ConfirmParams.Stake): SignerParams {
- return preload(params)
- }
-
- override suspend fun preloadSwap(params: ConfirmParams.SwapParams): SignerParams {
- return preload(params)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
- private suspend fun preload(params: ConfirmParams) = withContext(Dispatchers.IO) {
- val accountJob = async {
- when (chain) {
- Chain.Injective -> accountsService.getInjectiveAccountData(params.from.address).getOrNull()?.account?.base_account
- else -> accountsService.getAccountData(params.from.address).getOrNull()?.account
- }
- }
- val nodeInfoJob = async { accountsService.getNodeInfo().getOrNull()?.block?.header?.chain_id }
- val fee = feeCalculator.calculate(params.getTxType())
-
- val (account, nodeInfo) = Pair(
- accountJob.await() ?: throw Exception("Can't get data (account) for sign"),
- nodeInfoJob.await() ?: throw Exception("Can't get data (node info) for sign")
- )
- SignerParams(
- input = params,
- chainData = CosmosChainData(
- chainId = nodeInfo,
- accountNumber = account.account_number.toLong(),
- sequence = account.sequence.toLong(),
- fee = fee,
- )
- )
- }
-
- data class CosmosChainData(
- val chainId: String,
- val accountNumber: Long,
- val sequence: Long,
- val fee: Fee,
- ) : ChainSignData {
- override fun fee(speed: FeePriority): Fee = fee
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosStakeClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosStakeClient.kt
deleted file mode 100644
index c13647cd1..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosStakeClient.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import android.annotation.SuppressLint
-import com.gemwallet.android.blockchain.clients.StakeClient
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosStakeService
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.CosmosDenom
-import com.wallet.core.primitives.DelegationBase
-import com.wallet.core.primitives.DelegationState
-import com.wallet.core.primitives.DelegationValidator
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-import java.math.BigInteger
-import java.text.SimpleDateFormat
-
-class CosmosStakeClient(
- private val chain: Chain,
- private val stakeService: CosmosStakeService,
-) : StakeClient {
-
- @SuppressLint("SimpleDateFormat")
- private val completionDateFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
-
- override suspend fun getValidators(chain: Chain, apr: Double): List {
- return stakeService.validators().getOrNull()?.validators?.map {
- val commission = it.commission.commission_rates.rate.toDouble()
- val isActive = !it.jailed && it.status == "BOND_STATUS_BONDED"
- DelegationValidator(
- chain = chain,
- id = it.operator_address,
- name = it.description.moniker,
- isActive = isActive,
- commision = commission,
- apr = if (isActive) apr - (apr * commission) else 0.0,
- )
- } ?: emptyList()
- }
-
- override suspend fun getStakeDelegations(chain: Chain, address: String, apr: Double): List = withContext(Dispatchers.IO) {
- val getDelegations = async { stakeService.delegations(address).getOrNull()?.delegation_responses }
- val getUnboundingDelegations = async { stakeService.undelegations(address).getOrNull()?.unbonding_responses }
- val getRewards = async {
- stakeService.rewards(address).getOrNull()?.rewards
- ?.associateBy { it.validator_address }
- ?.mapValues { entry ->
- entry.value.reward
- .filter { it.denom == CosmosDenom.from(chain) }
- .mapNotNull {
- try {
- BigInteger(it.amount.split(".")[0])
- } catch (_: Throwable) {
- BigInteger.ZERO
- }
- }
- .reduceOrNull { acc, value -> acc + value }
- ?.toString()
- } ?: emptyMap()
- }
- val delegations = getDelegations.await()
- val undelegations = getUnboundingDelegations.await()
- val rewards = getRewards.await()
-
- val baseDelegations = delegations?.map {
- DelegationBase(
- assetId = AssetId(chain),
- state = DelegationState.Active,
- balance = it.balance.amount,
- completionDate = null,
- delegationId = "",
- validatorId = it.delegation.validator_address,
- rewards = rewards[it.delegation.validator_address] ?: "0",
- shares = "",
- )
- } ?: emptyList()
-
- val baseUndelegations: List = undelegations?.map { undelegation ->
- undelegation.entries.map { entry ->
- DelegationBase(
- assetId = AssetId(chain),
- state = DelegationState.Pending,
- balance = entry.balance,
- completionDate = completionDateFormatter.parse(entry.completion_time)?.time, //2024-02-28T08:12:56.376120563Z
- delegationId = entry.creation_height,
- validatorId = undelegation.validator_address,
- rewards = rewards[undelegation.validator_address] ?: "0",
- shares = "",
- )
- }
- }?.flatten() ?: emptyList()
-
- (baseDelegations + baseUndelegations)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosTransactionStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosTransactionStatusClient.kt
deleted file mode 100644
index fdbdc35a3..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/CosmosTransactionStatusClient.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos
-
-import com.gemwallet.android.blockchain.clients.ServiceUnavailable
-import com.gemwallet.android.blockchain.clients.TransactionStateRequest
-import com.gemwallet.android.blockchain.clients.TransactionStatusClient
-import com.gemwallet.android.blockchain.clients.cosmos.services.CosmosTransactionsService
-import com.gemwallet.android.model.TransactionChanges
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionState
-
-class CosmosTransactionStatusClient(
- private val chain: Chain,
- private val transactionsService: CosmosTransactionsService,
-) : TransactionStatusClient {
- override suspend fun getStatus(request: TransactionStateRequest): TransactionChanges {
- val tx = transactionsService.transaction(request.hash).getOrNull() ?: throw ServiceUnavailable
- val state = when {
- tx.tx_response == null || tx.tx_response.txhash.isEmpty() -> TransactionState.Pending
- tx.tx_response.code == 0 -> TransactionState.Confirmed
- else -> TransactionState.Reverted
- }
- return TransactionChanges(state)
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosAccountsService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosAccountsService.kt
deleted file mode 100644
index 9ccbb2e0b..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosAccountsService.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-import com.wallet.core.blockchain.cosmos.CosmosAccount
-import com.wallet.core.blockchain.cosmos.CosmosAccountResponse
-import com.wallet.core.blockchain.cosmos.CosmosBlockResponse
-import com.wallet.core.blockchain.cosmos.CosmosInjectiveAccount
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface CosmosAccountsService {
- @GET("/cosmos/auth/v1beta1/accounts/{owner}")
- suspend fun getAccountData(@Path("owner") owner: String): Result>
-
- @GET("/cosmos/auth/v1beta1/accounts/{owner}")
- suspend fun getInjectiveAccountData(@Path("owner") owner: String): Result>
-
- @GET("/cosmos/base/tendermint/v1beta1/blocks/latest")
- suspend fun getNodeInfo(): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosBalancesService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosBalancesService.kt
deleted file mode 100644
index 4e62720ee..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosBalancesService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-import com.wallet.core.blockchain.cosmos.CosmosBalances
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface CosmosBalancesService {
- @GET("/cosmos/bank/v1beta1/balances/{owner}")
- suspend fun getBalance(@Path("owner") owner: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosBroadcastService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosBroadcastService.kt
deleted file mode 100644
index b1f013e18..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosBroadcastService.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-import com.wallet.core.blockchain.cosmos.CosmosBroadcastResponse
-import okhttp3.RequestBody
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface CosmosBroadcastService {
- @POST("/cosmos/tx/v1beta1/txs")
- suspend fun broadcast(@Body body: RequestBody): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosNodeStatusService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosNodeStatusService.kt
deleted file mode 100644
index 2497c8c7a..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosNodeStatusService.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-import com.wallet.core.blockchain.cosmos.CosmosBlockResponse
-import com.wallet.core.blockchain.cosmos.CosmosSyncing
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Url
-
-interface CosmosNodeStatusService {
- @GET//("/cosmos/base/tendermint/v1beta1/syncing")
- suspend fun syncing(@Url url: String): Response
-
- @GET//("/cosmos/base/tendermint/v1beta1/blocks/latest")
- suspend fun getNodeInfo(@Url url: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosRpcClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosRpcClient.kt
deleted file mode 100644
index 81914b9d9..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosRpcClient.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-interface CosmosRpcClient :
- CosmosBalancesService,
- CosmosAccountsService,
- CosmosStakeService,
- CosmosTransactionsService,
- CosmosBroadcastService,
- CosmosNodeStatusService
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosStakeService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosStakeService.kt
deleted file mode 100644
index ba39a7326..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosStakeService.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-import com.wallet.core.blockchain.cosmos.CosmosDelegations
-import com.wallet.core.blockchain.cosmos.CosmosRewards
-import com.wallet.core.blockchain.cosmos.CosmosUnboundingDelegations
-import com.wallet.core.blockchain.cosmos.CosmosValidators
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface CosmosStakeService {
-
- @GET("/cosmos/staking/v1beta1/validators?pagination.limit=1000")
- suspend fun validators(): Result
-
- @GET("/cosmos/staking/v1beta1/delegations/{address}")
- suspend fun delegations(@Path("address") address: String): Result
-
- @GET("/cosmos/staking/v1beta1/delegators/{address}/unbonding_delegations")
- suspend fun undelegations(@Path("address") address: String): Result
-
- @GET("/cosmos/distribution/v1beta1/delegators/{address}/rewards")
- suspend fun rewards(@Path("address") address: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosTransactionsService.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosTransactionsService.kt
deleted file mode 100644
index be1c4e5ba..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/cosmos/services/CosmosTransactionsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gemwallet.android.blockchain.clients.cosmos.services
-
-import com.wallet.core.blockchain.cosmos.CosmosTransactionResponse
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface CosmosTransactionsService {
- @GET("/cosmos/tx/v1beta1/txs/{txId}")
- suspend fun transaction(@Path("txId") txId: String): Result
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmBalanceClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmBalanceClient.kt
deleted file mode 100644
index b6409ec4d..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmBalanceClient.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.gemwallet.android.blockchain.clients.ethereum
-
-import com.gemwallet.android.blockchain.clients.BalanceClient
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmBalancesService
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmCallService
-import com.gemwallet.android.blockchain.clients.ethereum.services.batch
-import com.gemwallet.android.blockchain.clients.ethereum.services.createCallRequest
-import com.gemwallet.android.blockchain.clients.ethereum.services.getBalance
-import com.gemwallet.android.ext.asset
-import com.gemwallet.android.math.hexToBigInteger
-import com.gemwallet.android.model.AssetBalance
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.Chain
-
-class EvmBalanceClient(
- private val chain: Chain,
- private val callService: EvmCallService,
- private val balancesService: EvmBalancesService,
- private val smartChainStakeClient: SmartchainStakeClient,
-) : BalanceClient {
-
- override suspend fun getNativeBalance(chain: Chain, address: String): AssetBalance? {
- val availableValue = balancesService.getBalance(address)
- .getOrNull()?.result?.value?.toString()
- return AssetBalance.create(chain.asset(), available = availableValue ?: return null)
- }
-
- override suspend fun getDelegationBalances(chain: Chain, address: String): AssetBalance? {
- return when (chain) {
- Chain.SmartChain -> smartChainStakeClient.getBalance(address)
- else -> null
- }
- }
-
- override suspend fun getTokenBalances(chain: Chain, address: String, tokens: List): List {
- if (tokens.isEmpty()) {
- return emptyList()
- }
- val result = mutableListOf()
- val tokens = tokens.filter { it.id.tokenId != null }
- val requests = tokens.map { token ->
- callService.createCallRequest(
- to = token.id.tokenId!!,
- data = "0x70a08231000000000000000000000000${address.removePrefix("0x")}",
- tag = "latest",
- )
- }
- val response = callService.batch(requests)
- response.mapIndexedNotNull { index, data ->
- val balance = data.hexToBigInteger() ?: return@mapIndexedNotNull null
- val token = tokens[index]
- result.add(AssetBalance.create(token, available = balance.toString()))
- }
- return result
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmBroadcastClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmBroadcastClient.kt
deleted file mode 100644
index 2d3e0a184..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmBroadcastClient.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.gemwallet.android.blockchain.clients.ethereum
-
-import com.gemwallet.android.blockchain.clients.BroadcastClient
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmBroadcastService
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
-import com.gemwallet.android.math.toHexString
-import com.wallet.core.primitives.Account
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.TransactionType
-
-class EvmBroadcastClient(
- private val chain: Chain,
- private val broadcastService: EvmBroadcastService,
-) : BroadcastClient {
- override suspend fun send(account: Account, signedMessage: ByteArray, type: TransactionType): String {
- val request = JSONRpcRequest.create(EvmMethod.Broadcast, listOf(signedMessage.toHexString()))
- val result = broadcastService.broadcast(request)
- val data = result.getOrNull() ?: throw Exception(result.exceptionOrNull()?.message ?: "Network error")
- if (data.error != null) {
- throw Exception(data.error.message)
- }
- return data.result
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainData.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainData.kt
new file mode 100644
index 000000000..b6ee803f7
--- /dev/null
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainData.kt
@@ -0,0 +1,26 @@
+package com.gemwallet.android.blockchain.clients.ethereum
+
+import com.gemwallet.android.model.ChainSignData
+import com.wallet.core.primitives.StakeData
+import uniffi.gemstone.GemTransactionLoadMetadata
+import java.math.BigInteger
+
+data class EvmChainData(
+ val chainId: Int,
+ val nonce: BigInteger,
+ val stakeData: StakeData?,
+) : ChainSignData
+
+
+fun GemTransactionLoadMetadata.Evm.toChainData(): EvmChainData {
+ return EvmChainData(
+ chainId = chainId.toInt(),
+ nonce = BigInteger.valueOf(nonce.toLong()),
+ stakeData = stakeData?.let {
+ StakeData(
+ data = it.data,
+ to = it.to
+ )
+ }
+ )
+}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainExt.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainExt.kt
index 93593ef92..1a46bf30f 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainExt.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmChainExt.kt
@@ -3,13 +3,11 @@ package com.gemwallet.android.blockchain.clients.ethereum
import com.gemwallet.android.blockchain.operators.walletcore.WCChainTypeProxy
import com.gemwallet.android.ext.type
import com.gemwallet.android.math.decodeHex
-import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ConfirmParams
import com.wallet.core.primitives.AssetId
import com.wallet.core.primitives.AssetSubtype
import com.wallet.core.primitives.EVMChain
import com.wallet.core.primitives.NFTType
-import uniffi.gemstone.Config
import wallet.core.jni.AnyAddress
import wallet.core.jni.EthereumAbi
import wallet.core.jni.EthereumAbiFunction
@@ -42,10 +40,6 @@ fun EVMChain.Companion.getDestinationAddress(
}
}
-fun EVMChain.isOpStack(): Boolean {
- return Config().getEvmChainConfig(string).isOpstack
-}
-
fun EVMChain.Companion.encodeNFT(params: ConfirmParams.NftParams): String {
return when (params.nftAsset.tokenType) {
NFTType.ERC721 -> {
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmFeeCalculator.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmFeeCalculator.kt
deleted file mode 100644
index aacd47360..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmFeeCalculator.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.gemwallet.android.blockchain.clients.ethereum
-
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmCallService
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmFeeService
-import com.gemwallet.android.blockchain.clients.ethereum.services.getFeeHistory
-import com.gemwallet.android.blockchain.clients.ethereum.services.getGasLimit
-import com.gemwallet.android.ext.toEVM
-import com.gemwallet.android.ext.type
-import com.gemwallet.android.math.hexToBigInteger
-import com.gemwallet.android.math.toHexString
-import com.gemwallet.android.model.ConfirmParams
-import com.gemwallet.android.model.GasFee
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetSubtype
-import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.EVMChain
-import com.wallet.core.primitives.FeePriority
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-import uniffi.gemstone.Config
-import uniffi.gemstone.GemEthereumFeeHistory
-import uniffi.gemstone.GemFeeCalculator
-import uniffi.gemstone.GemPriorityFeeRecord
-import wallet.core.jni.CoinType
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.util.Locale
-
-class EvmFeeCalculator(
- private val feeService: EvmFeeService,
- callService: EvmCallService,
- coinType: CoinType
-) {
-
- private val optimismGasOracle = OptimismGasOracle(callService, coinType)
-
- private val nativeGasLimit = BigInteger.valueOf(21_000L)
-
- suspend fun calculate(
- params: ConfirmParams, // TODO: Outpack
- assetId: AssetId,
- recipient: String,
- outputAmount: BigInteger,
- payload: String?,
- chainId: Int,
- nonce: BigInteger,
- ): List = withContext(Dispatchers.IO) {
- val getGasLimit = async { getGasLimit(assetId, params.from.address, recipient, outputAmount, payload) }
- val getBasePriorityFees = async { getBasePriorityFees(params) }
- val gasLimit = getGasLimit.await()
- val (baseFee, priorityFees) = getBasePriorityFees.await()
-
- if (params.assetId.chain.toEVM()?.isOpStack() == true) {
- return@withContext priorityFees.mapIndexed { index, priorityFee ->
- optimismGasOracle.estimate(
- params = params,
- chainId = chainId,
- nonce = nonce,
- gasLimit = gasLimit,
- baseFee = baseFee,
- priorityFee = priorityFee,
- txSpeed = when (index) {
- 0 -> FeePriority.Slow
- 1 -> FeePriority.Normal
- 2 -> FeePriority.Fast
- else -> FeePriority.Normal
- }
- )
- }
- }
-
- priorityFees.map { priorityFee ->
- val value = priorityFee.value.toBigInteger()
- val maxGasPrice: BigInteger = baseFee.plus(value)
- val minerFee: BigInteger = when (params) {
- is ConfirmParams.Stake,
- is ConfirmParams.SwapParams,
- is ConfirmParams.NftParams,
- is ConfirmParams.TokenApprovalParams -> value
- is ConfirmParams.TransferParams -> if (params.assetId.type() == AssetSubtype.NATIVE && params.isMax()) {
- maxGasPrice
- } else {
- value
- }
-
- is ConfirmParams.Activate -> throw IllegalArgumentException()
- }
- GasFee(
- feeAssetId = AssetId(params.assetId.chain),
- priority = FeePriority.entries.firstOrNull { it.string == priorityFee.priority.name.lowercase() }
- ?: FeePriority.Normal,
- limit = gasLimit,
- maxGasPrice = maxGasPrice,
- minerFee = minerFee,
- )
- }
- }
-
- private suspend fun getGasLimit(
- assetId: AssetId,
- from: String,
- recipient: String,
- outputAmount: BigInteger,
- payload: String?,
- ): BigInteger {
- val (amount, to, data) = when (assetId.type()) {
- AssetSubtype.NATIVE -> Triple(outputAmount, recipient, payload)
- AssetSubtype.TOKEN -> Triple(
- BigInteger.ZERO, // Amount
- assetId.tokenId!!.lowercase(Locale.ROOT), // token
- EVMChain.encodeTransactionData(assetId, payload, outputAmount, recipient).toHexString()
- )
- }
-
- val gasLimit = try {
- feeService.getGasLimit(from, to, amount, data)
- } catch (err: Throwable) {
- throw err
- }
- return if (gasLimit == nativeGasLimit) {
- gasLimit
- } else {
- gasLimit.add(gasLimit.toBigDecimal().multiply(BigDecimal.valueOf(0.5)).toBigInteger())
- }
- }
-
- internal suspend fun getHistory(chain: Chain, feeService: EvmFeeService): Pair {
- val config = Config().getEvmChainConfig(chain.toEVM()?.string ?: throw IllegalArgumentException())
- val rewardsPercentiles = config.rewardsPercentiles
- val feeHistory = feeService.getFeeHistory(
- listOf(rewardsPercentiles.slow, rewardsPercentiles.normal, rewardsPercentiles.fast)
- .map { it.toInt() }
- ) ?: throw Exception("Unable to calculate base fee")
- val baseFee = feeHistory.baseFeePerGas.mapNotNull { it.hexToBigInteger() }.maxOrNull()
- ?: throw Exception("Unable to calculate base fee")
-
- return Pair(
- baseFee,
- GemEthereumFeeHistory(
- reward = feeHistory.reward,
- baseFeePerGas = feeHistory.baseFeePerGas,
- gasUsedRatio = feeHistory.gasUsedRatio,
- oldestBlock = feeHistory.oldestBlock,
- )
- )
- }
-
- internal suspend fun getBasePriorityFees(
- params: ConfirmParams,
- ): Pair> {
- val history = getHistory(params.asset.id.chain, feeService)
- val calculator = GemFeeCalculator()
- val priority = calculator.calculateBasePriorityFees(
- chain = params.from.chain.string,
- history = history.second
- )
- return Pair(history.first, priority)
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmGetTokenClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmGetTokenClient.kt
deleted file mode 100644
index 61a7223ae..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmGetTokenClient.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gemwallet.android.blockchain.clients.ethereum
-
-import com.gemwallet.android.blockchain.clients.GetTokenClient
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmCallService
-import com.gemwallet.android.blockchain.clients.ethereum.services.batch
-import com.gemwallet.android.blockchain.clients.ethereum.services.createCallRequest
-import com.gemwallet.android.math.decodeHex
-import com.gemwallet.android.math.has0xPrefix
-import com.gemwallet.android.math.hexToBigInteger
-import com.gemwallet.android.math.toHexString
-import com.wallet.core.primitives.Asset
-import com.wallet.core.primitives.AssetId
-import com.wallet.core.primitives.AssetType
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import wallet.core.jni.EthereumAbi
-import wallet.core.jni.EthereumAbiFunction
-import wallet.core.jni.EthereumAbiValue
-
-class EvmGetTokenClient(
- private val chain: Chain,
- private val callService: EvmCallService,
-) : GetTokenClient {
- override suspend fun getTokenData(tokenId: String): Asset? = withContext(Dispatchers.IO) {
- val params = listOf(
- callService.createCallRequest(tokenId, EthereumAbi.encode(EthereumAbiFunction("name")).toHexString(), "latest"),
- callService.createCallRequest(tokenId, EthereumAbi.encode(EthereumAbiFunction("symbol")).toHexString(), "latest"),
- callService.createCallRequest(tokenId, EthereumAbi.encode(EthereumAbiFunction("decimals")).toHexString(), "latest"),
- )
- val result = callService.batch(params)
- val name = result.getOrNull(0)?.let { decodeAbi(it) }
- val symbol = result.getOrNull(1)?.let { decodeAbi(it) }
- val decimals = result.getOrNull(2)?.let { it.hexToBigInteger()?.toInt() }
-
- if (name.isNullOrEmpty() || symbol.isNullOrEmpty() || decimals == null) {
- null
- } else {
- Asset(
- id = AssetId(chain, tokenId),
- name = name,
- symbol = symbol,
- decimals = decimals,
- type = AssetType.ERC20,
- )
- }
- }
-
- override suspend fun isTokenQuery(query: String): Boolean = isTokenAddress(query)
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-
- private fun decodeAbi(hexString: String): String? {
- val data = hexString.decodeHex()
- if (data.size < 32) {
- return null
- }
- return EthereumAbiValue.decodeValue(data.drop(32).toByteArray(), "string")
- }
-
- companion object {
- fun isTokenAddress(tokenId: String): Boolean {
- return tokenId.has0xPrefix() && tokenId.isNotEmpty() && tokenId.length == 42
- }
- }
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmMethod.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmMethod.kt
deleted file mode 100644
index 676b41804..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmMethod.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.gemwallet.android.blockchain.clients.ethereum
-
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcMethod
-
-enum class EvmMethod(val value: String) : JSONRpcMethod {
- GetBalance("eth_getBalance"),
- GetGasLimit("eth_estimateGas"),
- GetFeeHistory("eth_feeHistory"),
- GetChainId("eth_chainId"),
- GetNonce("eth_getTransactionCount"),
- Broadcast("eth_sendRawTransaction"),
- Call("eth_call"),
- GetTransaction("eth_getTransactionReceipt"),
- Sync("eth_syncing"),
- GetBlockNumber("eth_blockNumber"),
- ;
-
- override fun value(): String = value
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmNodeStatusClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmNodeStatusClient.kt
deleted file mode 100644
index c61a4d94a..000000000
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmNodeStatusClient.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gemwallet.android.blockchain.clients.ethereum
-
-import com.gemwallet.android.blockchain.clients.NodeStatusClient
-import com.gemwallet.android.blockchain.clients.ethereum.services.EvmNodeStatusService
-import com.gemwallet.android.blockchain.clients.ethereum.services.getChainId
-import com.gemwallet.android.blockchain.clients.ethereum.services.latestBlock
-import com.gemwallet.android.blockchain.clients.ethereum.services.sync
-import com.gemwallet.android.blockchain.rpc.getLatency
-import com.gemwallet.android.model.NodeStatus
-import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
-
-class EvmNodeStatusClient(
- private val chain: Chain,
- private val nodeStatusService: EvmNodeStatusService,
-) : NodeStatusClient {
-
- override suspend fun getNodeStatus(chain: Chain, url: String): NodeStatus? = withContext(Dispatchers.IO) {
- val getChainId = async { nodeStatusService.getChainId(url) }
- val getLatestBlock = async { nodeStatusService.latestBlock(url).getOrNull()?.result?.value?.toString() }
- val getSync = async { nodeStatusService.sync(url).getOrNull()?.result }
-
- val chainId = getChainId.await()
- val blockNumber = getLatestBlock.await() ?: return@withContext null
- val inSync = getSync.await() ?: return@withContext null
-
- NodeStatus(
- url = url,
- chainId = chainId.body()?.result?.value?.toString() ?: return@withContext null,
- blockNumber = blockNumber,
- inSync = !inSync,
- latency = chainId.getLatency(),
- )
- }
-
- override fun supported(chain: Chain): Boolean = this.chain == chain
-}
\ No newline at end of file
diff --git a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmSignClient.kt b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmSignClient.kt
index 20d6a86ca..25378779e 100644
--- a/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmSignClient.kt
+++ b/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ethereum/EvmSignClient.kt
@@ -6,12 +6,12 @@ import com.gemwallet.android.math.decodeHex
import com.gemwallet.android.math.toHexString
import com.gemwallet.android.model.ChainSignData
import com.gemwallet.android.model.ConfirmParams
+import com.gemwallet.android.model.Fee
import com.gemwallet.android.model.GasFee
import com.google.protobuf.ByteString
import com.wallet.core.primitives.AssetId
import com.wallet.core.primitives.Chain
import com.wallet.core.primitives.EVMChain
-import com.wallet.core.primitives.FeePriority
import com.wallet.core.primitives.NFTType
import wallet.core.java.AnySigner
import wallet.core.jni.AnyAddress
@@ -46,14 +46,14 @@ class EvmSignClient(
params: ConfirmParams.TransferParams.Native,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List {
- val meta = chainData as EvmSignerPreloader.EvmChainData
+ val meta = chainData as EvmChainData
val transfer = buildTransfer(finalAmount, finalAmount, params)
val input = buildSignInput(
assetId = params.assetId,
- fee = meta.gasFee(feePriority),
+ fee = fee as GasFee,
chainId = meta.chainId.toBigInteger(),
nonce = meta.nonce,
destinationAddress = params.destination().address,
@@ -67,15 +67,15 @@ class EvmSignClient(
params: ConfirmParams.TransferParams.Token,
chainData: ChainSignData,
finalAmount: BigInteger,
- feePriority: FeePriority,
+ fee: Fee,
privateKey: ByteArray
): List