Merge pull request #1395 from novasamatech/rc/7.9.1

Rc/7.9.1
novasamatech · Feb 20, 2024 · 4d5485b · 4d5485b
2 parents f006e37 + d17172b
commit 4d5485b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
diff --git a/.github/workflows/install/action.yml b/.github/workflows/install/action.yml
@@ -4,8 +4,23 @@ runs:
   using: "composite"
   steps:
     - name: ☕️ Install Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4.0.0
       with:
         distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
+
+    - name: 🛠️ Install NDK
+      uses: nttld/setup-ndk@v1.4.2
+      with:
+        ndk-version: 'r26b'
+        local-cache: true
+
+    - name: 🦀 Install Rust
+      run: |
+        curl https://sh.rustup.rs -sSf | sh -s -- -q -y --no-modify-path && \
+        rustup target add armv7-linux-androideabi && \
+        rustup target add i686-linux-android && \
+        rustup target add aarch64-linux-android && \
+        rustup target add x86_64-linux-android
+      shell: bash
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '7.9.0'
-        versionCode = 117
+        versionName = '7.9.1'
+        versionCode = 118
 
         applicationId = "io.novafoundation.nova"
         releaseApplicationSuffix = "market"

diff --git a/.../novafoundation/nova/feature_nft_impl/data/source/providers/uniques/UniquesNftProvider.kt b/.../novafoundation/nova/feature_nft_impl/data/source/providers/uniques/UniquesNftProvider.kt
@@ -64,13 +64,13 @@ class UniquesNftProvider(
                     keyExtractor = { (classId: BigInteger) -> classId },
                     binding = ::bindMetadata
                 )
-                instanceMetadataDescriptor = runtime.metadata.uniques().storage("InstanceMetadataOf").querySingleArgKeys(
-                    keysArgs = classesIds,
+                instanceMetadataDescriptor = runtime.metadata.uniques().storage("InstanceMetadataOf").queryKeys(
+                    keysArgs = classesWithInstances,
                     keyExtractor = { (classId: BigInteger, instance: BigInteger) -> classId to instance },
                     binding = ::bindMetadata
                 )
-                totalIssuanceDescriptor = runtime.metadata.uniques().storage("Class").queryKeys(
-                    keysArgs = classesWithInstances,
+                totalIssuanceDescriptor = runtime.metadata.uniques().storage("Class").querySingleArgKeys(
+                    keysArgs = classesIds,
                     keyExtractor = { (classId: BigInteger) -> classId },
                     binding = { bindNumber(it.castToStruct()["items"]) }
                 )

diff --git a/...-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/mappers/CrossChain.kt b/...-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/mappers/CrossChain.kt
@@ -9,7 +9,6 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.CrossChainTransfer
 import io.novafoundation.nova.feature_wallet_api.domain.model.CrossChainTransfersConfiguration.XcmFee
 import io.novafoundation.nova.feature_wallet_api.domain.model.CrossChainTransfersConfiguration.XcmTransfer
 import io.novafoundation.nova.feature_wallet_api.domain.model.DeliveryFeeConfiguration
-import io.novafoundation.nova.feature_wallet_api.domain.model.DeliveryFeeConfiguration.Type
 import io.novafoundation.nova.feature_wallet_api.domain.model.XCMInstructionType
 import io.novafoundation.nova.feature_wallet_api.domain.model.XcmTransferType
 import io.novafoundation.nova.feature_wallet_impl.data.network.crosschain.CrossChainOriginAssetRemote
@@ -27,27 +26,27 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.toInterior
 import java.math.BigInteger
 
 fun mapCrossChainConfigFromRemote(remote: CrossChainTransfersConfigRemote): CrossChainTransfersConfiguration {
-    val assetsLocations = remote.assetsLocation.mapValues { (_, reserveLocationRemote) ->
+    val assetsLocations = remote.assetsLocation.orEmpty().mapValues { (_, reserveLocationRemote) ->
         mapReserveLocationFromRemote(reserveLocationRemote)
     }
 
-    val feeInstructions = remote.instructions.mapValues { (_, instructionsRemote) ->
+    val feeInstructions = remote.instructions.orEmpty().mapValues { (_, instructionsRemote) ->
         instructionsRemote.map(::mapXcmInstructionFromRemote)
     }
 
-    val chains = remote.chains.associateBy(
+    val chains = remote.chains.orEmpty().associateBy(
         keySelector = { it.chainId },
         valueTransform = { it.assets.map(::mapAssetTransfersFromRemote) }
     )
 
-    val networkDeliveryFee = remote.networkDeliveryFee.mapValues { (_, networkDeliveryFeeRemote) ->
+    val networkDeliveryFee = remote.networkDeliveryFee.orEmpty().mapValues { (_, networkDeliveryFeeRemote) ->
         mapNetworkDeliveryFeeFromRemote(networkDeliveryFeeRemote)
     }
 
     return CrossChainTransfersConfiguration(
         assetLocations = assetsLocations,
         feeInstructions = feeInstructions,
-        instructionBaseWeights = remote.networkBaseWeight,
+        instructionBaseWeights = remote.networkBaseWeight.orEmpty(),
         deliveryFeeConfigurations = networkDeliveryFee,
         chains = chains
     )

diff --git a/...novafoundation/nova/feature_wallet_impl/data/network/crosschain/CrossChainConfigRemote.kt b/...novafoundation/nova/feature_wallet_impl/data/network/crosschain/CrossChainConfigRemote.kt
@@ -4,11 +4,11 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId
 import java.math.BigInteger
 
 class CrossChainTransfersConfigRemote(
-    val assetsLocation: Map<String, ReserveLocationRemote>,
-    val instructions: Map<String, List<String>>,
-    val networkDeliveryFee: Map<String, NetworkDeliveryFeeRemote>,
-    val networkBaseWeight: Map<String, BigInteger>,
-    val chains: List<CrossChainOriginChainRemote>
+    val assetsLocation: Map<String, ReserveLocationRemote>?,
+    val instructions: Map<String, List<String>>?,
+    val networkDeliveryFee: Map<String, NetworkDeliveryFeeRemote>?,
+    val networkBaseWeight: Map<String, BigInteger>?,
+    val chains: List<CrossChainOriginChainRemote>?
 )
 
 class ReserveLocationRemote(