Merge pull request #1152 from soramitsu/staging

staging
soramitsu · Apr 30, 2024 · 94ef3c4 · 94ef3c4
2 parents 89559ac + e9dac6b
commit 94ef3c4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
 buildscript {
     ext {
         // App version
-        versionName = '3.4.4'
-        versionCode = 172
+        versionName = '3.4.5'
+        versionCode = 174
 
         // SDK and tools
         compileSdkVersion = 34

diff --git a/core-db/src/main/java/jp/co/soramitsu/coredb/AppDatabase.kt b/core-db/src/main/java/jp/co/soramitsu/coredb/AppDatabase.kt
@@ -67,6 +67,7 @@ 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.Migration_64_65
 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
@@ -92,7 +93,7 @@ import jp.co.soramitsu.coredb.model.chain.FavoriteChainLocal
 import jp.co.soramitsu.coredb.model.chain.MetaAccountLocal
 
 @Database(
-    version = 64,
+    version = 65,
     entities = [
         AccountLocal::class,
         AddressBookContact::class,
@@ -177,6 +178,7 @@ abstract class AppDatabase : RoomDatabase() {
                     .addMigrations(Migration_61_62)
                     .addMigrations(Migration_62_63)
                     .addMigrations(Migration_63_64)
+                    .addMigrations(Migration_64_65)
                     .build()
             }
             return instance!!

diff --git a/core-db/src/main/java/jp/co/soramitsu/coredb/migrations/Migrations.kt b/core-db/src/main/java/jp/co/soramitsu/coredb/migrations/Migrations.kt
@@ -3,9 +3,16 @@ package jp.co.soramitsu.coredb.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
+val Migration_64_65 = object : Migration(64, 65) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM storage")
+    }
+}
+
 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")
+        db.execSQL("DELETE FROM storage")
     }
 }
 

diff --git a/feature-staking-api/src/main/java/jp/co/soramitsu/staking/api/data/StakingSharedState.kt b/feature-staking-api/src/main/java/jp/co/soramitsu/staking/api/data/StakingSharedState.kt
@@ -189,20 +189,20 @@ class StakingSharedState(
     }
 }
 
-sealed class StakingAssetSelection(val chainId: ChainId, val chainAssetId: String) {
+sealed class StakingAssetSelection(open val chainId: ChainId, open val chainAssetId: String) {
     abstract val type: StakingType
 
-    class RelayChainStaking(chainId: ChainId, chainAssetId: String) :
+    data class RelayChainStaking(override val chainId: ChainId, override val chainAssetId: String) :
         StakingAssetSelection(chainId, chainAssetId) {
         override val type = StakingType.RELAYCHAIN
     }
 
-    class ParachainStaking(chainId: ChainId, chainAssetId: String) :
+    data class ParachainStaking(override val chainId: ChainId, override val chainAssetId: String) :
         StakingAssetSelection(chainId, chainAssetId) {
         override val type = StakingType.PARACHAIN
     }
 
-    class Pool(chainId: ChainId, chainAssetId: String) :
+    data class Pool(override val chainId: ChainId, override val chainAssetId: String) :
         StakingAssetSelection(chainId, chainAssetId) {
         override val type = StakingType.POOL
     }

diff --git a/.../jp/co/soramitsu/staking/impl/scenarios/relaychain/StakingRelayChainScenarioRepository.kt b/.../jp/co/soramitsu/staking/impl/scenarios/relaychain/StakingRelayChainScenarioRepository.kt
@@ -1,5 +1,6 @@
 package jp.co.soramitsu.staking.impl.scenarios.relaychain
 
+import android.util.Log
 import java.math.BigInteger
 import jp.co.soramitsu.common.data.network.runtime.binding.BinderWithType
 import jp.co.soramitsu.common.data.network.runtime.binding.NonNullBinderWithType
@@ -91,6 +92,7 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.withContext