Merge pull request #916 from soramitsu/feature/runtime_logic_upgrade

Deneath · web-flow · commit 1d912276de99 · 2023-05-24T12:49:59.000+07:00
Runtime 9420 upgrades:
diff --git a/feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/api/data/cache/AssetCacheExt.kt b/feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/api/data/cache/AssetCacheExt.kt
@@ -1,15 +1,25 @@
 package jp.co.soramitsu.wallet.api.data.cache
 
+import java.math.BigInteger
+import jp.co.soramitsu.common.data.network.runtime.binding.AccountData
 import jp.co.soramitsu.common.data.network.runtime.binding.AccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.EqAccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.OrmlTokensAccountData
 import jp.co.soramitsu.common.data.network.runtime.binding.bindAccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.bindEquilibriumAccountInfo
+import jp.co.soramitsu.common.data.network.runtime.binding.bindNonce
 import jp.co.soramitsu.common.data.network.runtime.binding.bindOrmlTokensAccountData
+import jp.co.soramitsu.common.data.network.runtime.binding.cast
+import jp.co.soramitsu.common.utils.orZero
+import jp.co.soramitsu.common.utils.system
 import jp.co.soramitsu.core.models.Asset
+import jp.co.soramitsu.core.rpc.storage.returnType
 import jp.co.soramitsu.coredb.model.AssetLocal
 import jp.co.soramitsu.shared_utils.runtime.AccountId
 import jp.co.soramitsu.shared_utils.runtime.RuntimeSnapshot
+import jp.co.soramitsu.shared_utils.runtime.definitions.types.composite.Struct
+import jp.co.soramitsu.shared_utils.runtime.definitions.types.fromHexOrNull
+import jp.co.soramitsu.shared_utils.runtime.metadata.storage
 
 suspend fun AssetCache.updateAsset(
     metaId: Long,
@@ -35,13 +45,32 @@ private fun accountInfoUpdater(accountInfo: AccountInfo) = { asset: AssetLocal -
     )
 }
 
+fun bind9420AccountInfo(hex: String?, runtime: RuntimeSnapshot): AccountInfo {
+    hex ?: return AccountInfo.empty()
+    val type = runtime.metadata.system().storage("Account").returnType()
+
+    val dynamicInstance = type.fromHexOrNull(runtime, hex).cast<Struct.Instance>()
+    val dataInstance: Struct.Instance? = dynamicInstance["data"]
+    val data = AccountData(
+        free = (dataInstance?.get("free") as? BigInteger).orZero(),
+        reserved = (dataInstance?.get("reserved") as? BigInteger).orZero(),
+        miscFrozen = (dataInstance?.get("frozen") as? BigInteger).orZero(),
+        feeFrozen = (dataInstance?.get("feeFrozen") as? BigInteger).orZero()
+    )
+    return AccountInfo(
+        nonce = bindNonce(dynamicInstance["nonce"]),
+        data = data
+    )
+}
+
 fun bindAccountInfoOrDefault(hex: String?, runtime: RuntimeSnapshot): AccountInfo {
     return hex?.let { bindAccountInfo(it, runtime) } ?: AccountInfo.empty()
 }
 
 fun bindOrmlTokensAccountDataOrDefault(hex: String?, runtime: RuntimeSnapshot): OrmlTokensAccountData {
     return hex?.let { bindOrmlTokensAccountData(it, runtime) } ?: OrmlTokensAccountData.empty()
 }
+
 fun bindEquilibriumAccountData(hex: String?, runtime: RuntimeSnapshot): EqAccountInfo? {
     return hex?.let { bindEquilibriumAccountInfo(it, runtime) }
 }
diff --git a/feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/impl/domain/model/Asset.kt b/feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/impl/domain/model/Asset.kt
@@ -1,5 +1,6 @@
 package jp.co.soramitsu.wallet.impl.domain.model
 
+import java.math.BigDecimal
 import jp.co.soramitsu.account.api.domain.model.MetaAccount
 import jp.co.soramitsu.common.model.AssetKey
 import jp.co.soramitsu.common.utils.orZero
@@ -72,12 +73,12 @@ data class Asset(
         )
     }
 
-    val free = token.amountFromPlanks(freeInPlanks.orZero())
+    private val free = token.amountFromPlanks(freeInPlanks.orZero())
     val reserved = token.amountFromPlanks(reservedInPlanks.orZero())
-    val miscFrozen = token.amountFromPlanks(miscFrozenInPlanks.orZero())
-    val feeFrozen = token.amountFromPlanks(feeFrozenInPlanks.orZero())
+    private val miscFrozen = token.amountFromPlanks(miscFrozenInPlanks.orZero())
+    private val feeFrozen = token.amountFromPlanks(feeFrozenInPlanks.orZero())
 
-    val locked = miscFrozen.max(feeFrozen)
+    val locked: BigDecimal = miscFrozen.max(feeFrozen)
     val frozen = locked + reserved
 
     val total = calculateTotalBalance(freeInPlanks, reservedInPlanks)?.let { token.amountFromPlanks(it) }
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/SubstrateRemoteSource.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/SubstrateRemoteSource.kt
@@ -1,5 +1,6 @@
 package jp.co.soramitsu.wallet.impl.data.network.blockchain
 
+import java.math.BigInteger
 import jp.co.soramitsu.common.data.network.runtime.binding.EqAccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.EqOraclePricePoint
 import jp.co.soramitsu.common.data.network.runtime.binding.ExtrinsicStatusEvent
@@ -10,7 +11,6 @@ import jp.co.soramitsu.shared_utils.runtime.AccountId
 import jp.co.soramitsu.shared_utils.runtime.extrinsic.ExtrinsicBuilder
 import jp.co.soramitsu.wallet.impl.data.network.blockchain.bindings.TransferExtrinsic
 import jp.co.soramitsu.wallet.impl.domain.model.Transfer
-import java.math.BigInteger
 
 class TransferExtrinsicWithStatus(
     val extrinsic: TransferExtrinsic,
@@ -25,7 +25,8 @@ interface SubstrateRemoteSource {
         chain: Chain,
         transfer: Transfer,
         additional: (suspend ExtrinsicBuilder.() -> Unit)?,
-        batchAll: Boolean
+        batchAll: Boolean,
+        allowDeath: Boolean = false
     ): BigInteger
 
     suspend fun performTransfer(
@@ -34,7 +35,8 @@ interface SubstrateRemoteSource {
         transfer: Transfer,
         tip: BigInteger?,
         additional: (suspend ExtrinsicBuilder.() -> Unit)?,
-        batchAll: Boolean
+        batchAll: Boolean,
+        allowDeath: Boolean = false
     ): String
 
     suspend fun fetchAccountTransfersInBlock(
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/WssSubstrateSource.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/WssSubstrateSource.kt
@@ -2,6 +2,7 @@
 
 package jp.co.soramitsu.wallet.impl.data.network.blockchain
 
+import java.math.BigInteger
 import jp.co.soramitsu.common.data.network.runtime.binding.AccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.EqAccountInfo
 import jp.co.soramitsu.common.data.network.runtime.binding.EqOraclePricePoint
@@ -42,7 +43,6 @@ import jp.co.soramitsu.wallet.api.data.cache.bindOrmlTokensAccountDataOrDefault
 import jp.co.soramitsu.wallet.impl.data.network.blockchain.bindings.bindTransferExtrinsic
 import jp.co.soramitsu.wallet.impl.data.repository.totalBalance
 import jp.co.soramitsu.wallet.impl.domain.model.Transfer
-import java.math.BigInteger
 
 class WssSubstrateSource(
     private val rpcCalls: RpcCalls,
@@ -151,13 +151,14 @@ class WssSubstrateSource(
         chain: Chain,
         transfer: Transfer,
         additional: (suspend ExtrinsicBuilder.() -> Unit)?,
-        batchAll: Boolean
+        batchAll: Boolean,
+        allowDeath: Boolean
     ): BigInteger {
         return extrinsicService.estimateFee(
             chain = chain,
             useBatchAll = batchAll,
             formExtrinsic = {
-                transfer(chain, transfer, this.runtime.typeRegistry)
+                transfer(chain, transfer, this.runtime.typeRegistry, allowDeath)
                 additional?.invoke(this)
             }
         )
@@ -169,15 +170,16 @@ class WssSubstrateSource(
         transfer: Transfer,
         tip: BigInteger?,
         additional: (suspend ExtrinsicBuilder.() -> Unit)?,
-        batchAll: Boolean
+        batchAll: Boolean,
+        allowDeath: Boolean
     ): String {
         return extrinsicService.submitExtrinsic(
             chain = chain,
             accountId = accountId,
             useBatchAll = batchAll,
             tip = tip,
             formExtrinsic = {
-                transfer(chain, transfer, this.runtime.typeRegistry)
+                transfer(chain, transfer, this.runtime.typeRegistry, allowDeath)
                 additional?.invoke(this)
             }
         ).getOrThrow()
@@ -226,30 +228,35 @@ class WssSubstrateSource(
         }.filterNotNull()
     }
 
-    private fun ExtrinsicBuilder.transfer(chain: Chain, transfer: Transfer, typeRegistry: TypeRegistry): ExtrinsicBuilder {
+    private fun ExtrinsicBuilder.transfer(chain: Chain, transfer: Transfer, typeRegistry: TypeRegistry, allowDeath: Boolean): ExtrinsicBuilder {
         val accountId = chain.accountIdOf(transfer.recipient)
-        return if (transfer.chainAsset.currency == null) {
-            defaultTransfer(accountId, transfer, typeRegistry)
-        } else {
-            when (transfer.chainAsset.typeExtra) {
-                null, ChainAssetType.Normal -> defaultTransfer(accountId, transfer, typeRegistry)
-                ChainAssetType.OrmlChain -> ormlChainTransfer(accountId, transfer)
-
-                ChainAssetType.SoraAsset,
-                ChainAssetType.SoraUtilityAsset -> soraAssetTransfer(accountId, transfer)
-
-                ChainAssetType.OrmlAsset,
-                ChainAssetType.ForeignAsset,
-                ChainAssetType.StableAssetPoolToken,
-                ChainAssetType.LiquidCrowdloan,
-                ChainAssetType.VToken,
-                ChainAssetType.VSToken,
-                ChainAssetType.Stable -> ormlAssetTransfer(accountId, transfer)
-
-                ChainAssetType.Equilibrium -> equilibriumAssetTransfer(accountId, transfer)
-                ChainAssetType.Unknown -> error("Token ${transfer.chainAsset.symbolToShow} not supported, chain ${chain.name}")
+        val useDefaultTransfer =
+            transfer.chainAsset.currency == null || transfer.chainAsset.typeExtra == null || transfer.chainAsset.typeExtra == ChainAssetType.Normal
+        if (useDefaultTransfer) {
+            return if (allowDeath) {
+                defaultTransferAllowDeath(accountId, transfer, typeRegistry)
+            } else {
+                defaultTransfer(accountId, transfer, typeRegistry)
             }
         }
+        return when (transfer.chainAsset.typeExtra) {
+            ChainAssetType.OrmlChain -> ormlChainTransfer(accountId, transfer)
+
+            ChainAssetType.SoraAsset,
+            ChainAssetType.SoraUtilityAsset -> soraAssetTransfer(accountId, transfer)
+
+            ChainAssetType.OrmlAsset,
+            ChainAssetType.ForeignAsset,
+            ChainAssetType.StableAssetPoolToken,
+            ChainAssetType.LiquidCrowdloan,
+            ChainAssetType.VToken,
+            ChainAssetType.VSToken,
+            ChainAssetType.Stable -> ormlAssetTransfer(accountId, transfer)
+
+            ChainAssetType.Equilibrium -> equilibriumAssetTransfer(accountId, transfer)
+            ChainAssetType.Unknown -> error("Token ${transfer.chainAsset.symbolToShow} not supported, chain ${chain.name}")
+            else -> error("Token ${transfer.chainAsset.symbolToShow} not supported, chain ${chain.name}")
+        }
     }
 
     private fun ExtrinsicBuilder.equilibriumAssetTransfer(
@@ -326,4 +333,27 @@ class WssSubstrateSource(
             )
         )
     }
+
+    private fun ExtrinsicBuilder.defaultTransferAllowDeath(
+        accountId: AccountId,
+        transfer: Transfer,
+        typeRegistry: TypeRegistry
+    ): ExtrinsicBuilder {
+        @Suppress("IMPLICIT_CAST_TO_ANY")
+        val dest = when (typeRegistry["Address"]) { // this logic was added to support Moonbeam/Moonriver chains; todo separate assets in json like orml
+            is FixedByteArray -> accountId
+            else -> DictEnum.Entry(
+                name = "Id",
+                value = accountId
+            )
+        }
+        return call(
+            moduleName = Modules.BALANCES,
+            callName = "transfer_allow_death",
+            arguments = mapOf(
+                "dest" to dest,
+                "value" to transfer.amountInPlanks
+            )
+        )
+    }
 }
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/updaters/PaymentUpdater.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/network/blockchain/updaters/PaymentUpdater.kt
@@ -22,12 +22,12 @@ import jp.co.soramitsu.coredb.model.OperationLocal
 import jp.co.soramitsu.runtime.ext.addressOf
 import jp.co.soramitsu.runtime.multiNetwork.ChainRegistry
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
-import jp.co.soramitsu.runtime.multiNetwork.getRuntime
 import jp.co.soramitsu.shared_utils.runtime.AccountId
 import jp.co.soramitsu.shared_utils.runtime.RuntimeSnapshot
 import jp.co.soramitsu.shared_utils.runtime.metadata.storage
 import jp.co.soramitsu.shared_utils.runtime.metadata.storageKey
 import jp.co.soramitsu.wallet.api.data.cache.AssetCache
+import jp.co.soramitsu.wallet.api.data.cache.bind9420AccountInfo
 import jp.co.soramitsu.wallet.api.data.cache.bindAccountInfoOrDefault
 import jp.co.soramitsu.wallet.api.data.cache.bindEquilibriumAccountData
 import jp.co.soramitsu.wallet.api.data.cache.bindOrmlTokensAccountDataOrDefault
@@ -128,7 +128,12 @@ class PaymentUpdater(
             when (asset.typeExtra) {
                 null, ChainAssetType.Normal,
                 ChainAssetType.SoraUtilityAsset -> {
-                    val newAccountInfo = bindAccountInfoOrDefault(change.value, runtime)
+                    val runtimeVersion = chainRegistry.getRemoteRuntimeVersion(chain.id) ?: 0
+                    val newAccountInfo = if (runtimeVersion >= 9420) {
+                        bind9420AccountInfo(change.value, runtime)
+                    } else {
+                        bindAccountInfoOrDefault(change.value, runtime)
+                    }
                     assetCache.updateAsset(metaId, accountId, asset, newAccountInfo)
                 }
 
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/repository/WalletRepositoryImpl.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/repository/WalletRepositoryImpl.kt
@@ -1,6 +1,8 @@
 package jp.co.soramitsu.wallet.impl.data.repository
 
 import com.opencsv.CSVReaderHeaderAware
+import java.math.BigDecimal
+import java.math.BigInteger
 import jp.co.soramitsu.account.api.domain.model.MetaAccount
 import jp.co.soramitsu.account.api.domain.model.accountId
 import jp.co.soramitsu.common.compose.component.NetworkIssueItemState
@@ -50,8 +52,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.withContext
-import java.math.BigDecimal
-import java.math.BigInteger
 import jp.co.soramitsu.core.models.Asset as CoreAsset
 
 class WalletRepositoryImpl(
@@ -235,7 +235,9 @@ class WalletRepositoryImpl(
         additional: (suspend ExtrinsicBuilder.() -> Unit)?,
         batchAll: Boolean
     ): Fee {
-        val fee = substrateSource.getTransferFee(chain, transfer, additional, batchAll)
+        val runtimeVersion = chainRegistry.getRemoteRuntimeVersion(chain.id) ?: 0
+        val allowDeath = runtimeVersion >= 9420
+        val fee = substrateSource.getTransferFee(chain, transfer, additional, batchAll, allowDeath)
 
         return Fee(
             transferAmount = transfer.amount,
@@ -252,7 +254,9 @@ class WalletRepositoryImpl(
         additional: (suspend ExtrinsicBuilder.() -> Unit)?,
         batchAll: Boolean
     ): String {
-        val operationHash = substrateSource.performTransfer(accountId, chain, transfer, tip, additional, batchAll)
+        val runtimeVersion = chainRegistry.getRemoteRuntimeVersion(chain.id) ?: 0
+        val allowDeath = runtimeVersion >= 9420
+        val operationHash = substrateSource.performTransfer(accountId, chain, transfer, tip, additional, batchAll, allowDeath)
         val accountAddress = chain.addressOf(accountId)
 
         val operation = createOperation(
