Merge pull request #1167 from soramitsu/staging

Staging
soramitsu · Jun 13, 2024 · aff0cb4 · aff0cb4
2 parents a29947b + e3aa645
commit aff0cb4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
 buildscript {
     ext {
         // App version
-        versionName = '3.5.3'
-        versionCode = 184
+        versionName = '3.5.5'
+        versionCode = 186
 
         // SDK and tools
         compileSdkVersion = 34

diff --git a/.../jp/co/soramitsu/staking/impl/scenarios/relaychain/StakingRelayChainScenarioRepository.kt b/.../jp/co/soramitsu/staking/impl/scenarios/relaychain/StakingRelayChainScenarioRepository.kt
@@ -304,7 +304,7 @@ class StakingRelayChainScenarioRepository(
         chainId: ChainId,
         accountIdsHex: List<String>
     ): AccountIdMap<ValidatorPrefs?> {
-        return localStorage.queryKeys(
+        return remoteStorage.queryKeys(
             keysBuilder = { runtime ->
                 val storage = runtime.metadata.stakingOrNull()?.storage("Validators")
                     ?: return@queryKeys emptyMap()

diff --git a/.../java/jp/co/soramitsu/wallet/impl/domain/implementations/ExistentialDepositUseCaseImpl.kt b/.../java/jp/co/soramitsu/wallet/impl/domain/implementations/ExistentialDepositUseCaseImpl.kt
@@ -38,7 +38,9 @@ class ExistentialDepositUseCaseImpl(
         val chainId = chainAsset.chainId
 
         val existentialDepositResult = kotlin.runCatching {
-            val runtime = chainRegistry.getRuntime(chainId)
+            val runtime = chainRegistry.getRuntimeOrNull(chainId)
+                ?: return@runCatching BigInteger.ZERO
+
             when (chainAsset.typeExtra) {
                 null,
                 ChainAssetType.Normal,

diff --git a/...l/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/WssSubstrateSource.kt b/...l/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/WssSubstrateSource.kt
@@ -317,7 +317,7 @@ class WssSubstrateSource(
             ChainAssetType.Token2,
             ChainAssetType.AssetId,
             ChainAssetType.Xcm,
-            ChainAssetType.Stable -> ormlAssetTransfer(accountId, transfer)
+            ChainAssetType.Stable -> ormlAssetTransfer(accountId, transfer, typeRegistry)
 
             ChainAssetType.Equilibrium -> equilibriumAssetTransfer(accountId, transfer)
 
@@ -356,16 +356,28 @@ class WssSubstrateSource(
 
     private fun ExtrinsicBuilder.ormlAssetTransfer(
         accountId: AccountId,
-        transfer: Transfer
-    ) = call(
-        moduleName = Modules.CURRENCIES,
-        callName = "transfer",
-        arguments = mapOf(
-            "dest" to DictEnum.Entry("Id", accountId),
-            "currency_id" to transfer.chainAsset.currency,
-            "amount" to transfer.amountInPlanks
+        transfer: Transfer,
+        typeRegistry: TypeRegistry
+    ): ExtrinsicBuilder {
+        @Suppress("IMPLICIT_CAST_TO_ANY")
+        val dest = when (typeRegistry["Address"]) {
+            is FixedByteArray -> accountId // asset type 'assetId'
+            else -> DictEnum.Entry(
+                name = "Id",
+                value = accountId
+            )
+        }
+
+        return call(
+            moduleName = Modules.CURRENCIES,
+            callName = "transfer",
+            arguments = mapOf(
+                "dest" to dest,
+                "currency_id" to transfer.chainAsset.currency,
+                "amount" to transfer.amountInPlanks
+            )
         )
-    )
+    }
 
     private fun ExtrinsicBuilder.soraAssetTransfer(
         accountId: AccountId,