Feature/cross chain swaps

.gitignore

@@ -25,5 +25,4 @@ app/*.apk
 !/core-db/schemas/io.novafoundation.nova.core_db.AppDatabase/8.json
 !/core-db/schemas/io.novafoundation.nova.core_db.AppDatabase/9.json
 
-google-services.json
-/bindings
+google-services.json

app/src/androidTest/java/io/novafoundation/nova/SwapServiceIntegrationTest.kt

@@ -4,14 +4,13 @@ import android.util.Log
 import io.novafoundation.nova.common.di.FeatureUtils
 import io.novafoundation.nova.common.utils.Percent
 import io.novafoundation.nova.feature_swap_api.di.SwapFeatureApi
-import io.novafoundation.nova.feature_swap_api.domain.model.SwapExecuteArgs
+import io.novafoundation.nova.feature_swap_api.domain.model.SwapFeeArgs
 import io.novafoundation.nova.feature_swap_api.domain.model.SwapLimit
 import io.novafoundation.nova.feature_swap_api.domain.model.SwapQuote
 import io.novafoundation.nova.feature_swap_api.domain.model.SwapQuoteArgs
-import io.novafoundation.nova.feature_swap_core.domain.model.SwapQuoteException
+import io.novafoundation.nova.feature_swap_core_api.data.primitive.errors.SwapQuoteException
 import io.novafoundation.nova.feature_swap_api.domain.model.swapRate
-import io.novafoundation.nova.feature_swap_core.domain.model.QuotePath
-import io.novafoundation.nova.feature_swap_core.domain.model.SwapDirection
+import io.novafoundation.nova.feature_swap_core_api.data.primitive.model.SwapDirection
 import io.novafoundation.nova.feature_swap_impl.di.SwapFeatureComponent
 import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance
 import io.novafoundation.nova.feature_wallet_api.di.WalletFeatureApi
@@ -80,7 +79,7 @@ class SwapServiceIntegrationTest : BaseIntegrationTest() {
         val wnd = westmint.wnd()
         val siri = westmint.siri()
 
-        val swapArgs = SwapExecuteArgs(
+        val swapArgs = SwapFeeArgs(
             assetIn = wnd,
             assetOut = siri,
             swapLimit = SwapLimit.SpecifiedIn(
@@ -104,7 +103,7 @@ class SwapServiceIntegrationTest : BaseIntegrationTest() {
         val wnd = westmint.wnd()
         val siri = westmint.siri()
 
-        val swapArgs = SwapExecuteArgs(
+        val swapArgs = SwapFeeArgs(
             assetIn = siri,
             assetOut = wnd,
             swapLimit = SwapLimit.SpecifiedIn(

app/src/main/java/io/novafoundation/nova/app/di/deps/ComponentHolderModule.kt

@@ -51,8 +51,8 @@ import io.novafoundation.nova.feature_settings_impl.di.SettingsFeatureHolder
 import io.novafoundation.nova.feature_staking_api.di.StakingFeatureApi
 import io.novafoundation.nova.feature_staking_impl.di.StakingFeatureHolder
 import io.novafoundation.nova.feature_swap_api.di.SwapFeatureApi
-import io.novafoundation.nova.feature_swap_core.di.SwapCoreApi
 import io.novafoundation.nova.feature_swap_core.di.SwapCoreHolder
+import io.novafoundation.nova.feature_swap_core_api.di.SwapCoreApi
 import io.novafoundation.nova.feature_swap_impl.di.SwapFeatureHolder
 import io.novafoundation.nova.feature_versions_api.di.VersionsFeatureApi
 import io.novafoundation.nova.feature_versions_impl.di.VersionsFeatureHolder

app/src/main/java/io/novafoundation/nova/app/root/navigation/Navigator.kt

@@ -399,14 +399,14 @@ class Navigator(
         navController?.navigate(R.id.action_selectAssetSwapFlowFragment_to_swapFlowNetworkFragment, NetworkSwapFlowFragment.createPayload(payload))
     }
 
-    override fun openBuyNetworks(payload: NetworkFlowPayload) {
-        navController?.navigate(R.id.action_buyFlow_to_buyFlowNetwork, NetworkFlowFragment.createPayload(payload))
-    }
-
     override fun returnToMainSwapScreen() {
         navController?.navigate(R.id.action_return_to_swap_settings)
     }
 
+    override fun openBuyNetworks(payload: NetworkFlowPayload) {
+        navController?.navigate(R.id.action_buyFlow_to_buyFlowNetwork, NetworkFlowFragment.createPayload(payload))
+    }
+
     override fun openSwapFlow() {
         val payload = SwapFlowPayload.InitialSelecting
         navController?.navigate(R.id.action_mainFragment_to_swapFlow, AssetSwapFlowFragment.getBundle(payload))
@@ -416,6 +416,10 @@ class Navigator(
         navController?.navigate(R.id.action_open_swapSetupAmount, SwapMainSettingsFragment.getBundle(swapSettingsPayload))
     }
 
+    override fun finishSelectAndOpenSwapSetupAmount(swapSettingsPayload: SwapSettingsPayload) {
+        navController?.navigate(R.id.action_finish_and_open_swap_settings, SwapMainSettingsFragment.getBundle(swapSettingsPayload))
+    }
+
     override fun openNfts() {
         navController?.navigate(R.id.action_mainFragment_to_nfts_nav_graph)
     }

app/src/main/java/io/novafoundation/nova/app/root/navigation/swap/SwapNavigator.kt

@@ -4,31 +4,39 @@ import io.novafoundation.nova.app.R
 import io.novafoundation.nova.app.root.navigation.BaseNavigator
 import io.novafoundation.nova.app.root.navigation.NavigationHolder
 import io.novafoundation.nova.app.root.navigation.Navigator
-import io.novafoundation.nova.feature_assets.presentation.send.amount.SendPayload
 import io.novafoundation.nova.feature_assets.presentation.balance.detail.BalanceDetailFragment
+import io.novafoundation.nova.feature_assets.presentation.send.amount.SendPayload
 import io.novafoundation.nova.feature_assets.presentation.swap.asset.AssetSwapFlowFragment
 import io.novafoundation.nova.feature_assets.presentation.swap.asset.SwapFlowPayload
+import io.novafoundation.nova.feature_swap_api.presentation.model.SwapSettingsPayload
 import io.novafoundation.nova.feature_swap_impl.presentation.SwapRouter
-import io.novafoundation.nova.feature_swap_impl.presentation.confirmation.SwapConfirmationFragment
-import io.novafoundation.nova.feature_swap_impl.presentation.confirmation.payload.SwapConfirmationPayload
+import io.novafoundation.nova.feature_swap_impl.presentation.main.SwapMainSettingsFragment
 import io.novafoundation.nova.feature_wallet_api.presentation.model.AssetPayload
 
 class SwapNavigator(
     private val navigationHolder: NavigationHolder,
     private val commonDelegate: Navigator
 ) : BaseNavigator(navigationHolder), SwapRouter {
 
-    override fun openSwapConfirmation(payload: SwapConfirmationPayload) {
-        val bundle = SwapConfirmationFragment.getBundle(payload)
-        navigationHolder.navController?.navigate(R.id.action_swapMainSettingsFragment_to_swapConfirmationFragment, bundle)
-    }
+    override fun openSwapConfirmation() = performNavigation(R.id.action_swapMainSettingsFragment_to_swapConfirmationFragment)
+
+    override fun openSwapRoute() = performNavigation(R.id.action_open_swapRouteFragment)
+
+    override fun openSwapFee() = performNavigation(R.id.action_open_swapFeeFragment)
+
+    override fun openSwapExecution() = performNavigation(R.id.action_swapConfirmationFragment_to_swapExecutionFragment)
 
     override fun openSwapOptions() {
         navigationHolder.navController?.navigate(R.id.action_swapMainSettingsFragment_to_swapOptionsFragment)
     }
 
+    override fun openRetrySwap(payload: SwapSettingsPayload) = performNavigation(
+        actionId = R.id.action_swapExecutionFragment_to_swapSettingsFragment,
+        args = SwapMainSettingsFragment.getBundle(payload)
+    )
+
     override fun openBalanceDetails(assetPayload: AssetPayload) {
-        navigationHolder.navController?.navigate(R.id.action_swapConfirmationFragment_to_assetDetails, BalanceDetailFragment.getBundle(assetPayload))
+        navigationHolder.navController?.navigate(R.id.action_swapExecutionFragment_to_assetDetails, BalanceDetailFragment.getBundle(assetPayload))
     }
 
     override fun selectAssetIn(selectedAsset: AssetPayload?) {

app/src/main/res/navigation/main_nav_graph.xml

@@ -937,6 +937,7 @@
 
     </fragment>
 
+
     <fragment
         android:id="@+id/sendFlowNetworkFragment"
         android:name="io.novafoundation.nova.feature_assets.presentation.send.flow.network.NetworkSendFlowFragment"
@@ -1004,6 +1005,8 @@
 
     <include app:graph="@navigation/start_swap_nav_graph" />
 
+    <include app:graph="@navigation/select_swap_token_nav_graph" />
+
     <include app:graph="@navigation/manage_tokens_graph" />
 
     <include app:graph="@navigation/sign_parity_signer_graph" />

app/src/main/res/navigation/select_swap_token_nav_graph.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:startDestination="@id/selectAssetSwapFlowFragment"
-    android:id="@+id/select_swap_token_nav_graph">
+    android:id="@+id/select_swap_token_nav_graph"
+    app:startDestination="@id/selectAssetSwapFlowFragment">
 
     <fragment
         android:id="@+id/selectAssetSwapFlowFragment"
@@ -25,9 +25,19 @@
 
     <action
         android:id="@+id/action_return_to_swap_settings"
-        app:popUpTo="@id/swapSettingsFragment"
         app:enterAnim="@anim/fragment_close_enter"
         app:exitAnim="@anim/fragment_close_exit"
         app:popEnterAnim="@anim/fragment_open_enter"
-        app:popExitAnim="@anim/fragment_open_exit" />
+        app:popExitAnim="@anim/fragment_open_exit"
+        app:popUpTo="@id/swapSettingsFragment" />
+
+    <action
+        android:id="@+id/action_finish_and_open_swap_settings"
+        app:destination="@+id/start_swap_nav_graph"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit"
+        app:popUpToInclusive="true"
+        app:popUpTo="@id/select_swap_token_nav_graph" />
 </navigation>

app/src/main/res/navigation/start_swap_nav_graph.xml

@@ -33,23 +33,19 @@
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
-
     </fragment>
 
     <fragment
         android:id="@+id/swapConfirmationFragment"
         android:name="io.novafoundation.nova.feature_swap_impl.presentation.confirmation.SwapConfirmationFragment"
         android:label="SwapConfirmationFragment"
-        tools:layout="@layout/fragment_swap_confirmation_settings">
+        tools:layout="@layout/fragment_swap_confirmation">
 
         <action
-            android:id="@+id/action_swapConfirmationFragment_to_assetDetails"
-            app:destination="@id/balanceDetailFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit"
-            app:popUpTo="@id/mainFragment" />
+            android:id="@+id/action_swapConfirmationFragment_to_swapExecutionFragment"
+            app:popUpTo="@id/swapConfirmationFragment"
+            app:popUpToInclusive="true"
+            app:destination="@id/swapExecutionFragment" />
 
     </fragment>
 
@@ -60,4 +56,50 @@
 
     <include app:graph="@navigation/select_swap_token_nav_graph" />
 
+    <fragment
+        android:id="@+id/swapRouteFragment"
+        android:name="io.novafoundation.nova.feature_swap_impl.presentation.route.SwapRouteFragment"
+        android:label="SwapRouteFragment" />
+
+    <action
+        android:id="@+id/action_open_swapRouteFragment"
+        app:destination="@id/swapRouteFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit" />
+
+    <dialog
+        android:id="@+id/swapFeeFragment"
+        android:name="io.novafoundation.nova.feature_swap_impl.presentation.fee.SwapFeeFragment"
+        android:label="SwapFeeFragment" />
+
+    <action
+        android:id="@+id/action_open_swapFeeFragment"
+        app:destination="@id/swapFeeFragment" />
+
+    <fragment
+        android:id="@+id/swapExecutionFragment"
+        android:name="io.novafoundation.nova.feature_swap_impl.presentation.execution.SwapExecutionFragment"
+        android:label="SwapExecutionFragment"
+        tools:layout="@layout/fragment_swap_execution">
+
+        <action
+            android:id="@+id/action_swapExecutionFragment_to_assetDetails"
+            app:destination="@id/balanceDetailFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit"
+            app:popUpTo="@id/mainFragment" />
+
+        <action
+            android:id="@+id/action_swapExecutionFragment_to_swapSettingsFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit"
+            app:popUpTo="@+id/start_swap_nav_graph"
+            app:destination="@id/swapSettingsFragment" />
+    </fragment>
 </navigation>

bindings/hydra-dx-math/src/main/java/io/novafoundation/nova/hydra_dx_math/xyk/HYKSwapMathBridge.java

@@ -23,4 +23,4 @@ public static native String calculate_pool_trade_fee(
         String feeNumerator,
         String feeDenominator
     );
-}
+}

common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Events.kt

@@ -1,12 +1,8 @@
 package io.novafoundation.nova.common.data.network.runtime.binding
 
-import io.novafoundation.nova.common.utils.system
-import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot
 import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum
 import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct
-import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex
 import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent
-import io.novasama.substrate_sdk_android.runtime.metadata.storage
 import java.math.BigInteger
 
 class EventRecord(val phase: Phase, val event: GenericEvent.Instance)
@@ -20,14 +16,17 @@ sealed class Phase {
     object Initialization : Phase()
 }
 
-@HelperBinding
-fun bindEventRecord(dynamicInstance: Any?): EventRecord {
+fun bindEventRecords(decoded: Any?): List<EventRecord> {
+    return bindList(decoded, ::bindEventRecord)
+}
+
+private fun bindEventRecord(dynamicInstance: Any?): EventRecord {
     requireType<Struct.Instance>(dynamicInstance)
 
     val phaseDynamic = dynamicInstance.getTyped<DictEnum.Entry<*>>("phase")
 
     val phase = when (phaseDynamic.name) {
-        "ApplyExtrinsic" -> Phase.ApplyExtrinsic(phaseDynamic.value.cast())
+        "ApplyExtrinsic" -> Phase.ApplyExtrinsic(bindNumber(phaseDynamic.value))
         "Finalization" -> Phase.Finalization
         "Initialization" -> Phase.Initialization
         else -> incompatible()
@@ -37,18 +36,3 @@ fun bindEventRecord(dynamicInstance: Any?): EventRecord {
 
     return EventRecord(phase, dynamicEvent)
 }
-
-@UseCaseBinding
-fun bindEventRecords(
-    scale: String,
-    runtime: RuntimeSnapshot,
-): List<EventRecord> {
-    val returnType = runtime.metadata.system().storage("Events").type.value ?: incompatible()
-
-    val dynamicInstance = returnType.fromHex(runtime, scale)
-    requireType<List<*>>(dynamicInstance)
-
-    return dynamicInstance.mapNotNull { dynamicEventRecord ->
-        bindOrNull { bindEventRecord(dynamicEventRecord) }
-    }
-}

common/src/main/java/io/novafoundation/nova/common/data/repository/AssetsIconModeRepository.kt

@@ -32,6 +32,7 @@ class RealAssetsIconModeRepository(
     }
 
     override fun getIconMode(): AssetIconMode {
+        return ASSET_ICON_MODE_DEFAULT
         return preferences.getString(PREFS_ASSETS_ICON_MODE)?.fromPrefsValue() ?: ASSET_ICON_MODE_DEFAULT
     }
 

common/src/main/java/io/novafoundation/nova/common/domain/ExtendedLoadingState.kt

@@ -42,6 +42,10 @@ val <T> ExtendedLoadingState<T>.dataOrNull: T?
         else -> null
     }
 
+@get:JvmName("isErrorProp")
+val ExtendedLoadingState<*>.isError: Boolean
+    get() = this is ExtendedLoadingState.Error
+
 fun <T> ExtendedLoadingState<T?>.loadedAndEmpty(): Boolean = when (this) {
     is ExtendedLoadingState.Loaded -> data == null
     else -> false
@@ -55,6 +59,10 @@ fun ExtendedLoadingState<*>.isLoading(): Boolean {
     return this is ExtendedLoadingState.Loading
 }
 
+@get:JvmName("isLoadingProp")
+val ExtendedLoadingState<*>.isLoading: Boolean
+    get() = isLoading()
+
 fun ExtendedLoadingState<*>.isError(): Boolean {
     return this is ExtendedLoadingState.Error
 }

common/src/main/java/io/novafoundation/nova/common/mixin/impl/RetriableUi.kt

@@ -10,14 +10,16 @@ fun BaseFragmentMixin<*>.observeRetries(
     retriable: Retriable,
     context: Context = fragment.requireContext(),
 ) {
-    retriable.retryEvent.observeEvent {
-        retryDialog(
-            context = context,
-            onRetry = it.onRetry,
-            onCancel = it.onCancel
-        ) {
-            setTitle(it.title)
-            setMessage(it.message)
+    with(retriable) {
+        retryEvent.observeEvent {
+            retryDialog(
+                context = context,
+                onRetry = it.onRetry,
+                onCancel = it.onCancel
+            ) {
+                setTitle(it.title)
+                setMessage(it.message)
+            }
         }
     }
 }