TripleRefCount update (#232)

* TripleRefCount update

* Remove kotlin 1.4.31 language feature usages to pass old formatter

* Rename ref count updater

* Increment version codes

Author: valentunn

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.2.1'
-        versionCode = 10
+        versionName = '1.2.2'
+        versionCode = 11
 
         // SDK and tools
         compileSdkVersion = 29

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/network/blockchain/WssSubstrateSource.kt

@@ -41,7 +41,7 @@ import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.Stakin
 import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.account.AccountData
 import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.account.AccountInfoFactory
 import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.account.AccountInfoSchema
-import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.account.AccountInfoSchemaV28
+import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.account.AccountInfoSchemaWithTripleRefCount
 import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.extrinsic.EncodeExtrinsicParams
 import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.extrinsic.TransferExtrinsic
 import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.extrinsic.TransferExtrinsicFactory
@@ -235,12 +235,12 @@ class WssSubstrateSource(
         return hex?.let { accountInfoFactory.decode(it) } ?: emptyAccountInfo()
     }
 
-    private fun emptyAccountInfo(): EncodableStruct<AccountInfoSchema> = AccountInfoSchemaV28 { info ->
-        info[AccountInfoSchemaV28.nonce] = 0.toUInt()
-        info[AccountInfoSchemaV28.providers] = 0.toUInt()
-        info[AccountInfoSchemaV28.consumers] = 0.toUInt()
+    private fun emptyAccountInfo(): EncodableStruct<AccountInfoSchema> = AccountInfoSchemaWithTripleRefCount { info ->
+        info[AccountInfoSchemaWithTripleRefCount.nonce] = 0.toUInt()
+        info[AccountInfoSchemaWithTripleRefCount.providers] = 0.toUInt()
+        info[AccountInfoSchemaWithTripleRefCount.consumers] = 0.toUInt()
 
-        info[AccountInfoSchemaV28.data] = AccountData { data ->
+        info[AccountInfoSchemaWithTripleRefCount.data] = AccountData { data ->
             data[AccountData.free] = 0.toBigInteger()
             data[AccountData.reserved] = 0.toBigInteger()
             data[AccountData.miscFrozen] = 0.toBigInteger()

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/network/blockchain/struct/account/AccountInfo.kt

@@ -20,19 +20,21 @@ object AccountData : Schema<AccountData>() {
     val feeFrozen by uint128()
 }
 
-object AccountInfoSchemaV27 : AccountInfoSchema() {
+object AccountInfoSchemaWithDualRefCount : AccountInfoSchema() {
     override val nonce by uint32()
 
-    val refCount by uint32()
+    val consumers by uint32()
+    val providers by uint32()
 
     override val data by schema(AccountData)
 }
 
-object AccountInfoSchemaV28 : AccountInfoSchema() {
+object AccountInfoSchemaWithTripleRefCount : AccountInfoSchema() {
     override val nonce by uint32()
 
     val consumers by uint32()
     val providers by uint32()
+    val selfSufficient by uint32()
 
     override val data by schema(AccountData)
 }

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/network/blockchain/struct/account/AccountInfoFactory.kt

@@ -4,15 +4,15 @@ import jp.co.soramitsu.common.utils.SuspendableProperty
 import jp.co.soramitsu.fearless_utils.scale.EncodableStruct
 
 class AccountInfoFactory(
-    val isUpgradedToDualRefCount: SuspendableProperty<Boolean>
+    private val isUpgradedToTripleRefCount: SuspendableProperty<Boolean>
 ) {
 
     suspend fun decode(scale: String): EncodableStruct<AccountInfoSchema> {
 
-        return if (isUpgradedToDualRefCount.get()) {
-            AccountInfoSchemaV28.read(scale)
+        return if (isUpgradedToTripleRefCount.get()) {
+            AccountInfoSchemaWithTripleRefCount.read(scale)
         } else {
-            AccountInfoSchemaV27.read(scale)
+            AccountInfoSchemaWithDualRefCount.read(scale)
         }
     }
 }

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/network/blockchain/struct/extrinsic/TransferExtrinsicFactory.kt

@@ -1,6 +1,5 @@
 package jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.extrinsic
 
-import jp.co.soramitsu.common.utils.SuspendableProperty
 import jp.co.soramitsu.common.utils.hash
 import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType
 import jp.co.soramitsu.fearless_utils.encrypt.Signer
@@ -32,27 +31,18 @@ class EncodeExtrinsicParams(
 )
 
 class TransferExtrinsicFactory(
-    private val isUpgradedToDualRefCount: SuspendableProperty<Boolean>,
     private val signer: Signer
 ) {
 
-    suspend fun decode(scale: String): TransferExtrinsic? {
-        return if (isUpgradedToDualRefCount.get()) {
-            decodeV28(scale)
-        } else {
-            decodeV27(scale)
-        }
+    fun decode(scale: String): TransferExtrinsic? {
+        return decodeV28(scale)
     }
 
-    suspend fun createEncodedExtrinsic(
+    fun createEncodedExtrinsic(
         encodeExtrinsicParams: EncodeExtrinsicParams,
         keypair: Keypair
     ): String {
-        return if (isUpgradedToDualRefCount.get()) {
-            createExtrinsicV28(encodeExtrinsicParams, keypair)
-        } else {
-            createExtrinsicV27(encodeExtrinsicParams, keypair)
-        }
+        return createExtrinsicV28(encodeExtrinsicParams, keypair)
     }
 
     private fun createExtrinsicV28(
@@ -95,46 +85,6 @@ class TransferExtrinsicFactory(
         SubmittableExtrinsicV28.toHexString(submittableExtrinsic)
     }
 
-    private fun createExtrinsicV27(
-        encodeExtrinsicParams: EncodeExtrinsicParams,
-        keypair: Keypair
-    ): String = with(encodeExtrinsicParams) {
-        val callStruct = TransferCallV27 { call ->
-            call[TransferCallV27.callIndex] = networkType.runtimeConfiguration.pallets.transfers.transfer.index
-
-            call[TransferCallV27.args] = TransferArgsV27 { args ->
-                args[TransferArgsV27.recipientId] = recipientId
-                args[TransferArgsV27.amount] = amountInPlanks
-            }
-        }
-
-        val callBytes = TransferCallV27.toByteArray(callStruct)
-
-        val payload = createExtrinsicPayloadValue(callBytes, encodeExtrinsicParams)
-
-        val signatureValue = Signature(
-            encryptionType = encryptionType,
-            value = signer.signExtrinsic(payload, keypair, encryptionType)
-        )
-
-        val extrinsic = SignedExtrinsicV27 { extrinsic ->
-            extrinsic[SignedExtrinsicV27.accountId] = senderId
-            extrinsic[SignedExtrinsicV27.signature] = signatureValue
-            extrinsic[SignedExtrinsicV27.nonce] = nonce
-            extrinsic[SignedExtrinsicV27.call] = callStruct
-        }
-
-        val extrinsicBytes = SignedExtrinsicV27.toByteArray(extrinsic)
-        val byteLengthValue = extrinsicBytes.size.toBigInteger()
-
-        val submittableExtrinsic = SubmittableExtrinsicV27 { struct ->
-            struct[SubmittableExtrinsicV27.byteLength] = byteLengthValue
-            struct[SubmittableExtrinsicV27.signedExtrinsic] = extrinsic
-        }
-
-        SubmittableExtrinsicV27.toHexString(submittableExtrinsic)
-    }
-
     private fun createExtrinsicPayloadValue(
         callBytes: ByteArray,
         encodeExtrinsicParams: EncodeExtrinsicParams
@@ -150,22 +100,6 @@ class TransferExtrinsicFactory(
         }
     }
 
-    private fun decodeV27(scale: String): TransferExtrinsic? {
-        val struct = SubmittableExtrinsicV27.readOrNull(scale) ?: return null
-
-        val signedExtrinsic = struct[SubmittableExtrinsicV27.signedExtrinsic]
-        val call = signedExtrinsic[SignedExtrinsicV27.call]
-        val args = call[TransferCallV27.args]
-
-        return TransferExtrinsic(
-            senderId = signedExtrinsic[SignedExtrinsicV27.accountId],
-            recipientId = args[TransferArgsV27.recipientId],
-            amountInPlanks = args[TransferArgsV27.amount],
-            index = call[TransferCallV27.callIndex],
-            hash = struct.hash()
-        )
-    }
-
     private fun decodeV28(scale: String): TransferExtrinsic? {
         val struct = SubmittableExtrinsicV28.readOrNull(scale) ?: return null
 

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/network/blockchain/updaters/DualRefCountUpdater.kt renamed to feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/network/blockchain/updaters/TripleRefCountUpdater.kt

@@ -1,5 +1,6 @@
 package jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.updaters
 
+import jp.co.soramitsu.common.utils.SuspendableProperty
 import jp.co.soramitsu.common.utils.fromHex
 import jp.co.soramitsu.core_api.data.network.Updater
 import jp.co.soramitsu.fearless_utils.runtime.Module
@@ -12,40 +13,39 @@ import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.SubscribeSto
 import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.storageChange
 import jp.co.soramitsu.fearless_utils.wsrpc.subscription.response.SubscriptionChange
 import jp.co.soramitsu.fearless_utils.wsrpc.subscriptionFlow
-import jp.co.soramitsu.feature_wallet_impl.data.network.blockchain.struct.account.AccountInfoFactory
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 
-object DualRefCountService : Service<Unit>(Module.System, "UpgradedToDualRefCount") {
+object TripleRefCountService : Service<Unit>(Module.System, "UpgradedToTripleRefCount") {
     override fun storageKey(storageArgs: Unit): String {
         return StorageUtils.createStorageKey(this, null)
     }
 }
 
-private const val DEFAULT_DUAL_REF_COUNT = false
+private const val DEFAULT_TRIPLE_REF_COUNT = false
 
-private val upgradedToDualRefCountRequest = SubscribeStorageRequest(DualRefCountService.storageKey())
+private val upgradedToTripleRefCountRequest = SubscribeStorageRequest(TripleRefCountService.storageKey())
 
-private fun SubscriptionChange.dualRefCountChange(): Boolean {
+private fun SubscriptionChange.tripleRefCountChange(): Boolean {
     val storageChange = storageChange()
 
     val raw = storageChange.getSingleChange()
 
-    return raw?.let(boolean::fromHex) ?: DEFAULT_DUAL_REF_COUNT
+    return raw?.let(boolean::fromHex) ?: DEFAULT_TRIPLE_REF_COUNT
 }
 
 class AccountInfoSchemaUpdater(
-    private val accountInfoFactory: AccountInfoFactory,
+    private val tripleRefCountProperty: SuspendableProperty<Boolean>,
     private val socketService: SocketService
 ) : Updater {
 
     override suspend fun listenForUpdates() {
-        accountInfoFactory.isUpgradedToDualRefCount.invalidate()
+        tripleRefCountProperty.invalidate()
 
-        socketService.subscriptionFlow(upgradedToDualRefCountRequest)
-            .map { it.dualRefCountChange() }
-            .onEach(accountInfoFactory.isUpgradedToDualRefCount::set)
+        socketService.subscriptionFlow(upgradedToTripleRefCountRequest)
+            .map { it.tripleRefCountChange() }
+            .onEach(tripleRefCountProperty::set)
             .collect()
     }
 }

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/di/WalletFeatureModule.kt

@@ -44,20 +44,19 @@ class WalletFeatureModule {
 
     @Provides
     @FeatureScope
-    fun provideDualRefCountProperty() = SuspendableProperty<Boolean>()
+    fun provideTripleRefCountProperty() = SuspendableProperty<Boolean>()
 
     @Provides
     @FeatureScope
     fun provideExtrinsicFactory(
-        dualRefCountProperty: SuspendableProperty<Boolean>,
         signer: Signer
-    ) = TransferExtrinsicFactory(dualRefCountProperty, signer)
+    ) = TransferExtrinsicFactory(signer)
 
     @Provides
     @FeatureScope
     fun provideAccountInfoFactory(
-        dualRefCountProperty: SuspendableProperty<Boolean>
-    ) = AccountInfoFactory(dualRefCountProperty)
+        tripleRefCountProperty: SuspendableProperty<Boolean>
+    ) = AccountInfoFactory(tripleRefCountProperty)
 
     @Provides
     @FeatureScope
@@ -125,10 +124,10 @@ class WalletFeatureModule {
     @Provides
     @FeatureScope
     fun provideAccountSchemaUpdater(
-        accountInfoFactory: AccountInfoFactory,
+        tripleRefCountProperty: SuspendableProperty<Boolean>,
         socketService: SocketService
     ): AccountInfoSchemaUpdater {
-        return AccountInfoSchemaUpdater(accountInfoFactory, socketService)
+        return AccountInfoSchemaUpdater(tripleRefCountProperty, socketService)
     }
 
     @Provides