Merge pull request #1149 from soramitsu/staging

staging

Author: Deneath

build.gradle

@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
 buildscript {
     ext {
         // App version
-        versionName = '3.4.3'
-        versionCode = 168
+        versionName = '3.4.4'
+        versionCode = 172
 
         // SDK and tools
         compileSdkVersion = 34

core-api/src/main/java/jp/co/soramitsu/core/model/StorageEntry.kt

@@ -1,6 +1,6 @@
 package jp.co.soramitsu.core.model
 
-class StorageEntry(
+data class StorageEntry(
     val storageKey: String,
     val content: String?
 )

core-api/src/main/java/jp/co/soramitsu/core/updater/Updater.kt

@@ -18,15 +18,15 @@ interface UpdateScope {
     fun invalidationFlow(): Flow<Any>
 }
 
-object GlobalScope : UpdateScope {
+object GlobalUpdaterScope : UpdateScope {
 
     override fun invalidationFlow() = flowOf(Unit)
 }
 
 interface GlobalScopeUpdater : Updater {
 
     override val scope
-        get() = GlobalScope
+        get() = GlobalUpdaterScope
 }
 
 interface Updater : SideEffectScope {

core-db/src/main/java/jp/co/soramitsu/coredb/AppDatabase.kt

@@ -66,6 +66,7 @@ import jp.co.soramitsu.coredb.migrations.Migration_59_60
 import jp.co.soramitsu.coredb.migrations.Migration_60_61
 import jp.co.soramitsu.coredb.migrations.Migration_61_62
 import jp.co.soramitsu.coredb.migrations.Migration_62_63
+import jp.co.soramitsu.coredb.migrations.Migration_63_64
 import jp.co.soramitsu.coredb.migrations.RemoveAccountForeignKeyFromAsset_17_18
 import jp.co.soramitsu.coredb.migrations.RemoveLegacyData_35_36
 import jp.co.soramitsu.coredb.migrations.RemoveStakingRewardsTable_22_23
@@ -91,7 +92,7 @@ import jp.co.soramitsu.coredb.model.chain.FavoriteChainLocal
 import jp.co.soramitsu.coredb.model.chain.MetaAccountLocal
 
 @Database(
-    version = 63,
+    version = 64,
     entities = [
         AccountLocal::class,
         AddressBookContact::class,
@@ -175,6 +176,7 @@ abstract class AppDatabase : RoomDatabase() {
                     .addMigrations(Migration_60_61)
                     .addMigrations(Migration_61_62)
                     .addMigrations(Migration_62_63)
+                    .addMigrations(Migration_63_64)
                     .build()
             }
             return instance!!

core-db/src/main/java/jp/co/soramitsu/coredb/migrations/Migrations.kt

@@ -3,6 +3,12 @@ package jp.co.soramitsu.coredb.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
+val Migration_63_64 = object : Migration(63, 64) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE chains ADD COLUMN `isUsesAppId` INTEGER NOT NULL DEFAULT 0")
+    }
+}
+
 val Migration_62_63 = object : Migration(62, 63) {
     override fun migrate(db: SupportSQLiteDatabase) {
         db.execSQL("ALTER TABLE assets ADD COLUMN `status` TEXT NULL")

core-db/src/main/java/jp/co/soramitsu/coredb/model/chain/ChainLocal.kt

@@ -22,7 +22,8 @@ class ChainLocal(
     val supportStakingPool: Boolean,
     val isEthereumChain: Boolean,
     val isChainlinkProvider: Boolean,
-    val supportNft: Boolean
+    val supportNft: Boolean,
+    val isUsesAppId: Boolean
 ) {
 
     class ExternalApi(

feature-crowdloan-impl/src/main/java/jp/co/soramitsu/crowdloan/impl/domain/contribute/CrowdloanContributeInteractor.kt

@@ -139,7 +139,7 @@ class CrowdloanContributeInteractor(
         }
 
         return runCatching {
-            walletRepository.performTransfer(accountId, chain, transfer, fee, null, additional, batchAll)
+            walletRepository.performTransfer(accountId, chain, transfer, fee, null, null, additional, batchAll)
         }
     }
 

feature-staking-api/src/main/java/jp/co/soramitsu/staking/api/data/StakingSharedState.kt

@@ -85,7 +85,9 @@ class StakingSharedState(
     val assetWithChain: Flow<SingleAssetSharedState.AssetWithChain> = selectionItem.map {
         val (chain, asset) = chainRegistry.chainWithAsset(it.chainId, it.chainAssetId)
         SingleAssetSharedState.AssetWithChain(chain, asset)
-    }.shareIn(scope, SharingStarted.Eagerly, replay = 1)
+    }
+        .distinctUntilChanged()
+        .shareIn(scope, SharingStarted.Eagerly, replay = 1)
 
     suspend fun assetWithChain(selectionItem: StakingAssetSelection) {
         val (chain, asset) = chainRegistry.chainWithAsset(
@@ -112,7 +114,7 @@ class StakingSharedState(
                 chainAsset = chainAsset,
                 minSupportedVersion = chain.minSupportedVersion
             )
-        }.shareIn(scope, SharingStarted.Eagerly, replay = 1)
+        }.distinctUntilChanged().shareIn(scope, SharingStarted.Eagerly, replay = 1)
 
     suspend fun availableAssetsToSelect(): List<Asset> {
         val metaAccount = accountRepository.getSelectedMetaAccount()

feature-staking-api/src/main/java/jp/co/soramitsu/staking/api/domain/model/Exposure.kt

@@ -2,6 +2,19 @@ package jp.co.soramitsu.staking.api.domain.model
 
 import java.math.BigInteger
 
-class IndividualExposure(val who: ByteArray, val value: BigInteger)
+interface ValidatorExposure {
+    val nominatorCount: Int
+    val total: BigInteger
+    val own: BigInteger
+}
 
-class Exposure(val total: BigInteger, val own: BigInteger, val others: List<IndividualExposure>)
+class LegacyExposure(
+    override val total: BigInteger, override val own: BigInteger, val others: List<IndividualExposure>
+): ValidatorExposure{
+    override val nominatorCount: Int = others.size
+}
+
+class Exposure(override val total: BigInteger, override val own: BigInteger, override val nominatorCount: Int, val pageCount: BigInteger): ValidatorExposure
+data class ExposurePage(val pageTotal: BigInteger, val others: List<IndividualExposure>)
+
+class IndividualExposure(val who: ByteArray, val value: BigInteger)

feature-staking-api/src/main/java/jp/co/soramitsu/staking/api/domain/model/Validator.kt

@@ -27,7 +27,20 @@ class RootIdentity(
     override val pgpFingerprint: String?,
     override val image: String?,
     override val twitter: String?
-) : Identity
+) : Identity {
+    companion object {
+        fun empty() = RootIdentity(
+            display = null,
+            legal = null,
+            web = null,
+            riot = null,
+            email = null,
+            pgpFingerprint = null,
+            image = null,
+            twitter = null
+        )
+    }
+}
 
 class ChildIdentity(
     childName: String?,
@@ -37,7 +50,7 @@ class ChildIdentity(
     override val display: String = "${parentIdentity.display} / ${childName.orEmpty()}"
 }
 
-class SuperOf(
+data class SuperOf(
     val parentIdHex: String,
     val childName: String?
 )