Merge pull request #273 from soramitsu/rc/1.7.0

Rc/1.7.0

Author: valentunn

.editorconfig

@@ -0,0 +1,9 @@
+# http://editorconfig.org
+root = true
+
+[{*.kt, *.kts}]
+#Ktlint configuration
+max_line_length = 160
+insert_final_newline = true
+indent_size = 4
+disabled_rules = import-ordering

.gitignore

@@ -10,4 +10,6 @@ app/*.apk
 /.idea/
 
 # ignore jacoco coverage reports
-/coverage
+/coverage
+
+fearless.jks

README.md

@@ -8,12 +8,22 @@ Fearless Wallet is a mobile wallet designed for the decentralized future on the
 
 [![](https://img.shields.io/twitter/follow/FearlessWallet?label=Follow&style=social)](https://twitter.com/FearlessWallet)
 
-
 ## Roadmap
 Fearless Wallet roadmap is available for everyone: [roadmap link](https://soramitsucoltd.aha.io/shared/97bc3006ee3c1baa0598863615cf8d14)
 
 ## Dev Status
 Track features development: [board link](https://soramitsucoltd.aha.io/shared/343e5db57d53398e3f26d0048158c4a2)
 
+## How to build
+
+To build Fearless Wallet Android project, you need to provide several keys either in enviroment variables or in `local.properties` file:
+
+``` properties
+MOONPAY_TEST_SECRET=stub
+MOONPAY_PRODUCTION_SECRET=stub
+```
+
+Note, that with stub keys buy via moonpay will not work correctly. However, other parts of application will not be affected.
+
 ## License
 Fearless Wallet Android is available under the Apache 2.0 license. See the LICENSE file for more info.

app/build.gradle

@@ -62,6 +62,10 @@ android {
             }
         }
     }
+
+    kotlinOptions {
+        freeCompilerArgs = ["-Xallow-result-return-type"]
+    }
 }
 
 play {
@@ -85,6 +89,11 @@ dependencies {
     implementation project(':feature-wallet-api')
     implementation project(':feature-wallet-impl')
 
+    implementation project(':runtime')
+
+    implementation project(':feature-staking-api')
+    implementation project(':feature-staking-impl')
+
     implementation kotlinDep
 
     implementation androidDep
@@ -113,6 +122,10 @@ dependencies {
     compileOnly wsDep
 
     implementation coroutinesDep
+
+    testImplementation project(':test-shared')
+
+    implementation insetterDep
 }
 
 task printVersion {

app/src/main/java/jp/co/soramitsu/app/App.kt

@@ -55,4 +55,4 @@ open class App : Application(), FeatureContainer {
     override fun commonApi(): CommonApi {
         return appComponent
     }
-}
+}

app/src/main/java/jp/co/soramitsu/app/di/app/AppComponent.kt

@@ -36,4 +36,4 @@ interface AppComponent : CommonApi {
     }
 
     fun inject(app: App)
-}
+}

app/src/main/java/jp/co/soramitsu/app/di/app/AppModule.kt

@@ -14,4 +14,4 @@ class AppModule {
     fun provideContext(application: App): Context {
         return application
     }
-}
+}

app/src/main/java/jp/co/soramitsu/app/di/app/FeatureManagerModule.kt

@@ -14,4 +14,4 @@ class FeatureManagerModule {
     fun provideFeatureHolderManager(featureApiHolderMap: @JvmSuppressWildcards Map<Class<*>, FeatureApiHolder>): FeatureHolderManager {
         return FeatureHolderManager(featureApiHolderMap)
     }
-}
+}

app/src/main/java/jp/co/soramitsu/app/di/app/NavigationModule.kt

@@ -6,6 +6,7 @@ import jp.co.soramitsu.app.root.navigation.Navigator
 import jp.co.soramitsu.common.di.scope.ApplicationScope
 import jp.co.soramitsu.feature_account_impl.presentation.AccountRouter
 import jp.co.soramitsu.feature_onboarding_impl.OnboardingRouter
+import jp.co.soramitsu.feature_staking_impl.presentation.StakingRouter
 import jp.co.soramitsu.feature_wallet_impl.presentation.WalletRouter
 import jp.co.soramitsu.splash.SplashRouter
 
@@ -31,4 +32,8 @@ class NavigationModule {
     @ApplicationScope
     @Provides
     fun provideWalletRouter(navigator: Navigator): WalletRouter = navigator
-}
+
+    @ApplicationScope
+    @Provides
+    fun provideStakingRouter(navigator: Navigator): StakingRouter = navigator
+}

app/src/main/java/jp/co/soramitsu/app/di/deps/ComponentHolderModule.kt

@@ -16,8 +16,12 @@ import jp.co.soramitsu.feature_account_api.di.AccountFeatureApi
 import jp.co.soramitsu.feature_account_impl.di.AccountFeatureHolder
 import jp.co.soramitsu.feature_onboarding_api.di.OnboardingFeatureApi
 import jp.co.soramitsu.feature_onboarding_impl.di.OnboardingFeatureHolder
+import jp.co.soramitsu.feature_staking_api.di.StakingFeatureApi
+import jp.co.soramitsu.feature_staking_impl.di.StakingFeatureHolder
 import jp.co.soramitsu.feature_wallet_api.di.WalletFeatureApi
 import jp.co.soramitsu.feature_wallet_impl.di.WalletFeatureHolder
+import jp.co.soramitsu.runtime.di.RuntimeApi
+import jp.co.soramitsu.runtime.di.RuntimeHolder
 import jp.co.soramitsu.splash.di.SplashFeatureApi
 import jp.co.soramitsu.splash.di.SplashFeatureHolder
 
@@ -63,4 +67,16 @@ interface ComponentHolderModule {
     @ClassKey(RootApi::class)
     @IntoMap
     fun provideMainFeature(accountFeatureHolder: RootFeatureHolder): FeatureApiHolder
-}
+
+    @ApplicationScope
+    @Binds
+    @ClassKey(StakingFeatureApi::class)
+    @IntoMap
+    fun provideStakingFeature(holder: StakingFeatureHolder): FeatureApiHolder
+
+    @ApplicationScope
+    @Binds
+    @ClassKey(RuntimeApi::class)
+    @IntoMap
+    fun provideARuntimeFeature(runtimeHolder: RuntimeHolder): FeatureApiHolder
+}

app/src/main/java/jp/co/soramitsu/app/di/deps/FeatureHolderManager.kt

@@ -15,4 +15,4 @@ class FeatureHolderManager(
         val featureApiHolder = mFeatureHolders[key] ?: throw IllegalStateException()
         featureApiHolder.releaseFeatureApi()
     }
-}
+}

app/src/main/java/jp/co/soramitsu/app/root/di/RootApi.kt

@@ -1,3 +1,3 @@
 package jp.co.soramitsu.app.root.di
 
-interface RootApi
+interface RootApi

app/src/main/java/jp/co/soramitsu/app/root/di/RootComponent.kt

@@ -8,8 +8,11 @@ import jp.co.soramitsu.app.root.presentation.main.coming_soon.di.ComingSoonCompo
 import jp.co.soramitsu.app.root.presentation.main.di.MainFragmentComponent
 import jp.co.soramitsu.common.di.CommonApi
 import jp.co.soramitsu.common.di.scope.FeatureScope
+import jp.co.soramitsu.core_db.di.DbApi
 import jp.co.soramitsu.feature_account_api.di.AccountFeatureApi
+import jp.co.soramitsu.feature_staking_api.di.StakingFeatureApi
 import jp.co.soramitsu.feature_wallet_api.di.WalletFeatureApi
+import jp.co.soramitsu.runtime.di.RuntimeApi
 
 @Component(
     dependencies = [
@@ -40,8 +43,11 @@ interface RootComponent {
         dependencies = [
             AccountFeatureApi::class,
             WalletFeatureApi::class,
-            CommonApi::class
+            StakingFeatureApi::class,
+            DbApi::class,
+            CommonApi::class,
+            RuntimeApi::class
         ]
     )
     interface RootFeatureDependenciesComponent : RootDependencies
-}
+}

app/src/main/java/jp/co/soramitsu/app/root/di/RootDependencies.kt

@@ -4,10 +4,13 @@ import jp.co.soramitsu.common.data.network.AppLinksProvider
 import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
 import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
 import jp.co.soramitsu.common.resources.ResourceManager
+import jp.co.soramitsu.fearless_utils.wsrpc.SocketService
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.feature_staking_api.di.StakingUpdaters
 import jp.co.soramitsu.feature_wallet_api.di.WalletUpdaters
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
+import jp.co.soramitsu.runtime.RuntimeUpdater
 
 interface RootDependencies {
     fun networkStateMixin(): NetworkStateMixin
@@ -25,4 +28,10 @@ interface RootDependencies {
     fun resourceManager(): ResourceManager
 
     fun walletUpdaters(): WalletUpdaters
-}
+
+    fun stakingUpdaters(): StakingUpdaters
+
+    fun runtimeUpdater(): RuntimeUpdater
+
+    fun socketService(): SocketService
+}

app/src/main/java/jp/co/soramitsu/app/root/di/RootFeatureHolder.kt

@@ -4,8 +4,11 @@ import jp.co.soramitsu.app.root.navigation.Navigator
 import jp.co.soramitsu.common.di.FeatureApiHolder
 import jp.co.soramitsu.common.di.FeatureContainer
 import jp.co.soramitsu.common.di.scope.ApplicationScope
+import jp.co.soramitsu.core_db.di.DbApi
 import jp.co.soramitsu.feature_account_api.di.AccountFeatureApi
+import jp.co.soramitsu.feature_staking_api.di.StakingFeatureApi
 import jp.co.soramitsu.feature_wallet_api.di.WalletFeatureApi
+import jp.co.soramitsu.runtime.di.RuntimeApi
 import javax.inject.Inject
 
 @ApplicationScope
@@ -17,10 +20,13 @@ class RootFeatureHolder @Inject constructor(
     override fun initializeDependencies(): Any {
         val rootFeatureDependencies = DaggerRootComponent_RootFeatureDependenciesComponent.builder()
             .commonApi(commonApi())
+            .dbApi(getFeature(DbApi::class.java))
             .accountFeatureApi(getFeature(AccountFeatureApi::class.java))
             .walletFeatureApi(getFeature(WalletFeatureApi::class.java))
+            .stakingFeatureApi(getFeature(StakingFeatureApi::class.java))
+            .runtimeApi(getFeature(RuntimeApi::class.java))
             .build()
         return DaggerRootComponent.factory()
             .create(navigator, rootFeatureDependencies)
     }
-}
+}

app/src/main/java/jp/co/soramitsu/app/root/di/RootFeatureModule.kt

@@ -2,32 +2,45 @@ package jp.co.soramitsu.app.root.di
 
 import dagger.Module
 import dagger.Provides
-import jp.co.soramitsu.app.root.domain.CompositeUpdater
 import jp.co.soramitsu.app.root.domain.RootInteractor
+import jp.co.soramitsu.app.root.domain.UpdateSystem
 import jp.co.soramitsu.common.di.scope.FeatureScope
-import jp.co.soramitsu.core_api.data.network.Updater
+import jp.co.soramitsu.fearless_utils.wsrpc.SocketService
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.feature_staking_api.di.StakingUpdaters
 import jp.co.soramitsu.feature_wallet_api.di.WalletUpdaters
-import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
+import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
+import jp.co.soramitsu.runtime.RuntimeUpdater
 
 @Module
 class RootFeatureModule {
 
     @Provides
     @FeatureScope
-    fun provideRootUpdater(
-        walletUpdaters: WalletUpdaters
-    ): Updater {
-        return CompositeUpdater(walletUpdaters.updaters)
+    fun provideUpdateSystem(
+        walletUpdaters: WalletUpdaters,
+        stakingUpdaters: StakingUpdaters,
+        runtimeUpdater: RuntimeUpdater,
+        socketService: SocketService
+    ): UpdateSystem {
+        return UpdateSystem(
+            runtimeUpdater,
+            updaters = listOf(
+                *walletUpdaters.updaters,
+                *stakingUpdaters.updaters,
+                runtimeUpdater
+            ),
+            socketService
+        )
     }
 
     @Provides
     @FeatureScope
     fun provideRootInteractor(
         accountRepository: AccountRepository,
-        rootUpdater: Updater,
-        buyTokenRegistry: BuyTokenRegistry
+        updateSystem: UpdateSystem,
+        walletRepository: WalletRepository
     ): RootInteractor {
-        return RootInteractor(accountRepository, rootUpdater, buyTokenRegistry)
+        return RootInteractor(accountRepository, updateSystem, walletRepository)
     }
-}
+}

app/src/main/java/jp/co/soramitsu/app/root/domain/CompositeUpdater.kt

@@ -1,23 +1,28 @@
 package jp.co.soramitsu.app.root.domain
 
-import jp.co.soramitsu.core_api.data.network.Updater
+import jp.co.soramitsu.core.updater.Updater
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
-import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
+import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.feature_wallet_impl.data.buyToken.ExternalProvider
+import kotlinx.coroutines.flow.Flow
 
 class RootInteractor(
     private val accountRepository: AccountRepository,
-    private val rootUpdater: Updater,
-    private val buyTokenRegistry: BuyTokenRegistry
+    private val updateSystem: UpdateSystem,
+    private val walletRepository: WalletRepository,
 ) {
 
     fun selectedNodeFlow() = accountRepository.selectedNodeFlow()
 
-    suspend fun listenForUpdates() {
-        rootUpdater.listenForUpdates()
+    suspend fun listenForUpdates(): Flow<Updater.SideEffect> {
+        return updateSystem.start()
     }
 
-    fun isBuyProviderRedirectLink(link: String) = buyTokenRegistry.availableProviders
-        .filterIsInstance<ExternalProvider>()
-        .any { it.redirectLink == link }
-}
+    fun isBuyProviderRedirectLink(link: String) = ExternalProvider.REDIRECT_URL_BASE in link
+
+    suspend fun updatePhishingAddresses() {
+        runCatching {
+            walletRepository.updatePhishingAddresses()
+        }
+    }
+}