sca-116 wip

app/build.gradle

@@ -120,10 +120,6 @@ android {
         }
     }
 
-    kotlin {
-        jvmToolchain(11)
-    }
-
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             outputFileName = new File("Sora_" + variant.versionName + "_" + variant.flavorName + "_" + buildType.name + ".apk")
@@ -184,7 +180,6 @@ dependencies {
     implementation androidDep
     implementation appCompatResourcesDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation navigationFragmentDep
@@ -210,7 +205,6 @@ dependencies {
     implementation platform(googleFirebaseBomDep)
     implementation googleCrashlyticsDep
 
-    implementation xNetworkingDep
     implementation webSocketLibDep
 
     implementation zXingCoreDep

build.gradle

@@ -39,17 +39,16 @@ buildscript {
             insetter               : '0.6.0',
             truth                  : '1.1.5',
             lottie                 : '4.2.0',
-            xNetworking            : '0.0.61',
-            compose                : '1.5.1',
-            composeMaterial        : '1.4.3',
+            xNetworking            : '0.2.1',
+            compose                : '1.5.2',
             composeCompiler        : '1.5.3',
             composeConstraintLayout: '1.1.0-alpha05',
             uiCore                 : '0.2.7',
-            soraCard               : '0.1.45',
+            soraCard               : '0.1.48',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',
             accompanist            : '0.30.1',
-            xserializationjson     : '1.5.0',
+            xserializationjson     : '1.5.1',
             ktor                   : '2.3.1',
             xbackup                : '0.0.2-20231002.173502-3'
     ]
@@ -73,7 +72,6 @@ buildscript {
         appCompatResourcesDep = "androidx.appcompat:appcompat-resources:1.6.1"
         biometricDep = "androidx.biometric:biometric:$versions.biometric"
         materialDep = "com.google.android.material:material:1.9.0"
-        cardViewDep = "androidx.cardview:cardview:1.0.0"
         constraintDep = "androidx.constraintlayout:constraintlayout:$versions.constraint"
         activityKtxDep = "androidx.activity:activity-ktx:1.7.1"
         fragmentKtxDep = "androidx.fragment:fragment-ktx:1.6.1"
@@ -113,7 +111,8 @@ buildscript {
 
         irohaDep = "com.github.hyperledger.iroha-java:client:$versions.iroha"
         soraDep = "com.github.soramitsu:sora-sdk:$versions.soraSdk"
-        xNetworkingDep = "jp.co.soramitsu:XNetworking-android:$versions.xNetworking"
+        xNetworkingDep = "jp.co.soramitsu.xnetworking:basic-android:$versions.xNetworking"
+        xNetworkingSoraWalletDep = "jp.co.soramitsu.xnetworking:sorawallet-android:$versions.xNetworking"
         ktorWebSocketDep = "io.ktor:ktor-client-websockets:$versions.ktor"
         webSocketLibDep = "com.neovisionaries:nv-websocket-client:$versions.webSocketLib"
         uiCoreDep = "jp.co.soramitsu:ui-core:$versions.uiCore"
@@ -202,12 +201,12 @@ buildscript {
         composeAnimationGraphicsDep = "androidx.compose.animation:animation-graphics:$versions.compose"
         composeToolingDep = "androidx.compose.ui:ui-tooling:$versions.compose"
         composeToolingPreviewDep = "androidx.compose.ui:ui-tooling-preview:$versions.compose"
-        composeActivityDep = "androidx.activity:activity-compose:1.7.1"
-        composeViewModelDep = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
-        composeLifecycleDep = "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"
+        composeActivityDep = "androidx.activity:activity-compose:1.7.2"
+        composeViewModelDep = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
+        composeLifecycleDep = "androidx.lifecycle:lifecycle-runtime-compose:2.6.2"
         composeConstraintLayoutDep = "androidx.constraintlayout:constraintlayout-compose:$versions.composeConstraintLayout"
 
-        accompanistNavAnimationDep = "com.google.accompanist:accompanist-navigation-animation:$versions.accompanist"
+//        accompanistNavAnimationDep = "com.google.accompanist:accompanist-navigation-animation:$versions.accompanist"
 
         lazySodiumDep = "com.goterl:lazysodium-android:$versions.lazySodium@aar"
         jnaDep = "net.java.dev.jna:jna:$versions.jna@aar"

common/build.gradle

@@ -113,13 +113,13 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(":android-foundation")
     implementation project(":soracrypro")
+    implementation project(":network")
 
     implementation activityKtxDep
     implementation coreKtxDep
     implementation androidDep
     implementation appCompatResourcesDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation coroutineAndroidDep
@@ -132,7 +132,6 @@ dependencies {
     implementation googlePlayCoreDep
     implementation coilSvgDep
 
-    implementation xNetworkingDep
     implementation webSocketLibDep
     implementation uiCoreDep
 

common/src/main/java/jp/co/soramitsu/common/di/modules/CommonModule.kt

@@ -83,14 +83,14 @@ import jp.co.soramitsu.common.vibration.DeviceVibrator
 import jp.co.soramitsu.crypto.ed25519.Ed25519Sha3
 import jp.co.soramitsu.shared_utils.encrypt.json.JsonSeedEncoder
 import jp.co.soramitsu.xbackup.BackupService
-import jp.co.soramitsu.xnetworking.networkclient.SoramitsuHttpClientProvider
-import jp.co.soramitsu.xnetworking.networkclient.SoramitsuHttpClientProviderImpl
-import jp.co.soramitsu.xnetworking.networkclient.SoramitsuNetworkClient
+import jp.co.soramitsu.xnetworking.basic.networkclient.SoramitsuHttpClientProvider
+import jp.co.soramitsu.xnetworking.basic.networkclient.SoramitsuHttpClientProviderImpl
+import jp.co.soramitsu.xnetworking.basic.networkclient.SoramitsuNetworkClient
 import jp.co.soramitsu.xnetworking.sorawallet.blockexplorerinfo.SoraWalletBlockExplorerInfo
 import jp.co.soramitsu.xnetworking.sorawallet.mainconfig.SoraRemoteConfigBuilder
 import jp.co.soramitsu.xnetworking.sorawallet.mainconfig.SoraRemoteConfigProvider
 import jp.co.soramitsu.xnetworking.sorawallet.tokenwhitelist.SoraTokensWhitelistManager
-import jp.co.soramitsu.xnetworking.txhistory.client.sorawallet.SubQueryClientForSoraWalletFactory
+import jp.co.soramitsu.xnetworking.sorawallet.txhistory.client.SubQueryClientForSoraWalletFactory
 
 @InstallIn(SingletonComponent::class)
 @Module

common/src/main/res/layout/layout_loading.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/x1"
-    app:cardCornerRadius="@dimen/x2" >
+    android:orientation="horizontal"
+    app:cardCornerRadius="@dimen/x2">
 
     <ProgressBar
+        style="@style/Widget.Soramitsu.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:indeterminate="true"
         android:layout_margin="@dimen/x2"
-        style="@style/Widget.Soramitsu.ProgressBar" />
+        android:indeterminate="true" />
 
-</androidx.cardview.widget.CardView>
+</LinearLayout>

common_wallet/build.gradle

@@ -62,10 +62,10 @@ dependencies {
     implementation project(":common")
     implementation project(":feature_blockexplorer_api")
     implementation project(":core_db")
+    implementation project(":network")
 
     implementation coreKtxDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation coroutineAndroidDep
@@ -76,7 +76,6 @@ dependencies {
     implementation googlePlayCoreDep
     implementation coilSvgDep
 
-    implementation xNetworkingDep
     implementation webSocketLibDep
     implementation uiCoreDep
 

demeter/build.gradle

@@ -64,6 +64,7 @@ dependencies {
     implementation project(":feature_blockexplorer_api")
     implementation project(":feature_account_api")
     implementation project(":sorasubstrate")
+    implementation project(":network")
 
     implementation daggerDep
     kapt daggerKaptDep
@@ -75,10 +76,8 @@ dependencies {
 
     implementation roomDep
     implementation roomKtxDep
-    //kapt roomKaptDep
 
     implementation sharedUtilsDep
-    implementation xNetworkingDep
 
     testImplementation project(":test_shared")
     testImplementation project(":test_data")

feature_assets_api/build.gradle

@@ -63,6 +63,7 @@ dependencies {
     implementation project(":common")
     implementation project(':common_wallet')
     implementation project(":sorasubstrate")
+    implementation project(":network")
     implementation sharedUtilsDep
 
     implementation coroutineAndroidDep
@@ -84,9 +85,6 @@ dependencies {
     implementation composeLifecycleDep
     debugImplementation composeToolingDep
     implementation navigationComposeDep
-    //implementation accompanistNavAnimationDep
-
-    implementation xNetworkingDep
 
     implementation daggerDep
     kapt daggerKaptDep

feature_assets_impl/build.gradle

@@ -79,7 +79,6 @@ dependencies {
 
     implementation androidDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation navigationFragmentDep
@@ -131,9 +130,6 @@ dependencies {
     implementation composeLifecycleDep
     debugImplementation composeToolingDep
     implementation navigationComposeDep
-    //implementation accompanistNavAnimationDep
-
-    implementation xNetworkingDep
 
     implementation zXingCoreDep
     implementation zXingEmbeddedDep

feature_blockexplorer_api/build.gradle

@@ -64,10 +64,10 @@ dependencies {
 
     implementation project(":common")
     implementation project(":core_db")
+    implementation project(":network")
 
     implementation androidDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation coilDep
@@ -106,8 +106,6 @@ dependencies {
     implementation navigationFragmentDep
     implementation navigationUiDep
 
-    implementation xNetworkingDep
-
     implementation daggerDep
     kapt daggerKaptDep
 

feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/data/BlockExplorerManager.kt

@@ -44,10 +44,12 @@ import jp.co.soramitsu.common.logger.FirebaseWrapper
 import jp.co.soramitsu.core_db.AppDatabase
 import jp.co.soramitsu.core_db.model.FiatTokenPriceLocal
 import jp.co.soramitsu.core_db.model.ReferralLocal
-import jp.co.soramitsu.xnetworking.common.Utils.toDoubleNan
-import jp.co.soramitsu.xnetworking.networkclient.SoramitsuNetworkClient
+import jp.co.soramitsu.xnetworking.basic.common.Utils.toDoubleNan
+import jp.co.soramitsu.xnetworking.basic.networkclient.SoramitsuNetworkClient
 import jp.co.soramitsu.xnetworking.sorawallet.blockexplorerinfo.SoraWalletBlockExplorerInfo
 import jp.co.soramitsu.xnetworking.sorawallet.blockexplorerinfo.sbapy.SbApyInfo
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.serializer
 
@@ -64,6 +66,8 @@ class BlockExplorerManager @Inject constructor(
 
     private var assetsInfo: List<Pair<String, BigInteger>>? = null
 
+    private val mutex = Mutex()
+
     fun getTempApy(id: String) = tempApy.find {
         it.id == id
     }?.sbApy?.times(100)
@@ -73,33 +77,40 @@ class BlockExplorerManager @Inject constructor(
             assetsInfo = it
         }
 
-    private suspend fun getAssetsInfoInternal(tokenIds: List<String>): List<Pair<String, BigInteger>> = runCatching {
-        val selected = soraConfigManager.getSelectedCurrency()
-        val tokens = db.assetDao().getFiatTokenPriceLocal(selected.code)
-        val yesterdayHour = yesterday()
-        val resultList = mutableListOf<Pair<String, BigInteger>>()
-        val fiats = mutableListOf<FiatTokenPriceLocal>()
-        info.getAssetsInfo(tokenIds, yesterdayHour).forEach { assetInfo ->
-            val dbValue = tokens.find { it.tokenIdFiat == assetInfo.tokenId }
-            val delta = assetInfo.hourDelta
-            if (dbValue != null && delta != null) {
-                fiats.add(dbValue.copy(fiatPricePrevH = delta, fiatPricePrevHTime = yesterdayHour))
+    private suspend fun getAssetsInfoInternal(tokenIds: List<String>): List<Pair<String, BigInteger>> = mutex.withLock {
+        runCatching {
+            val selected = soraConfigManager.getSelectedCurrency()
+            val tokens = db.assetDao().getFiatTokenPriceLocal(selected.code)
+            val yesterdayHour = yesterday()
+            val resultList = mutableListOf<Pair<String, BigInteger>>()
+            val fiats = mutableListOf<FiatTokenPriceLocal>()
+            info.getAssetsInfo(tokenIds, yesterdayHour).forEach { assetInfo ->
+                val dbValue = tokens.find { it.tokenIdFiat == assetInfo.tokenId }
+                val delta = assetInfo.hourDelta
+                if (dbValue != null && delta != null) {
+                    fiats.add(dbValue.copy(fiatPricePrevH = delta, fiatPricePrevHTime = yesterdayHour))
+                }
+                resultList.add(assetInfo.tokenId to BigInteger(assetInfo.liquidity))
             }
-            resultList.add(assetInfo.tokenId to BigInteger(assetInfo.liquidity))
+            db.assetDao().insertFiatPrice(fiats)
+            resultList
+        }.getOrElse {
+            FirebaseWrapper.recordException(it)
+            emptyList()
         }
-        db.assetDao().insertFiatPrice(fiats)
-        resultList
-    }.getOrElse {
-        FirebaseWrapper.recordException(it)
-        emptyList()
     }
 
     suspend fun updatePoolsSbApy() {
         updateSbApyInternal()
     }
 
     suspend fun updateFiat() {
-        updateFiatInternal()
+        if (appStateProvider.isForeground) {
+            runCatching {
+                val response = info.getFiat()
+                updateFiatPrices(response.map { FiatInfo(it.id, it.priceUsd) })
+            }
+        }
     }
 
     suspend fun updateReferrerRewards(
@@ -136,16 +147,7 @@ class BlockExplorerManager @Inject constructor(
         }
     }
 
-    private suspend fun updateFiatInternal() {
-        if (appStateProvider.isForeground) {
-            runCatching {
-                val response = info.getFiat()
-                updateFiatPrices(response.map { FiatInfo(it.id, it.priceUsd) })
-            }
-        }
-    }
-
-    private suspend fun updateFiatPrices(fiatData: List<FiatInfo>) {
+    private suspend fun updateFiatPrices(fiatData: List<FiatInfo>) = mutex.withLock {
         val selected = soraConfigManager.getSelectedCurrency()
         val tokens = db.assetDao().getTokensWithFiatOfCurrency(selected.code)
 

feature_blockexplorer_impl/build.gradle

@@ -71,10 +71,10 @@ dependencies {
     implementation project(":feature_account_api")
     implementation project(":feature_main_api")
     implementation project(":feature_wallet_api")
+    implementation project(":network")
 
     implementation androidDep
     implementation materialDep
-    implementation cardViewDep
     implementation constraintDep
 
     implementation coilDep
@@ -111,8 +111,6 @@ dependencies {
     implementation navigationFragmentDep
     implementation navigationUiDep
 
-    implementation xNetworkingDep
-
     implementation daggerDep
     kapt daggerKaptDep
 

feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/data/TransactionHistoryRepositoryImpl.kt

@@ -44,8 +44,8 @@ import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.Transact
 import jp.co.soramitsu.sora.substrate.runtime.Pallete
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
 import jp.co.soramitsu.sora.substrate.substrate.ExtrinsicManager
-import jp.co.soramitsu.xnetworking.txhistory.TxHistoryItem
-import jp.co.soramitsu.xnetworking.txhistory.client.sorawallet.SubQueryClientForSoraWallet
+import jp.co.soramitsu.xnetworking.basic.txhistory.TxHistoryItem
+import jp.co.soramitsu.xnetworking.sorawallet.txhistory.client.SubQueryClientForSoraWallet
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.debounce
 

feature_blockexplorer_impl/src/main/java/jp/co/soramitsu/feature_blockexplorer_impl/data/TransactionMapper.kt

@@ -46,8 +46,8 @@ import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.Transact
 import jp.co.soramitsu.sora.substrate.runtime.Method
 import jp.co.soramitsu.sora.substrate.runtime.Pallete
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
-import jp.co.soramitsu.xnetworking.txhistory.TxHistoryItem
-import jp.co.soramitsu.xnetworking.txhistory.TxHistoryItemParam
+import jp.co.soramitsu.xnetworking.basic.txhistory.TxHistoryItem
+import jp.co.soramitsu.xnetworking.basic.txhistory.TxHistoryItemParam
 
 fun mapHistoryItemsToTransactions(
     txs: List<TxHistoryItem>,