Merge branch 'develop' into rc/7.9.5

novasamatech · Mar 15, 2024 · aa2454f · aa2454f
2 parents 129a2c7 + cc78349
commit aa2454f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...undation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/AssetRegistryApi.kt b/...undation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/AssetRegistryApi.kt
@@ -19,12 +19,12 @@ val RuntimeMetadata.assetRegistry: AssetRegistryApi
     get() = AssetRegistryApi(assetRegistry())
 
 context(StorageQueryContext)
-val AssetRegistryApi.assetMetadataMap: QueryableStorageEntry1<HydraDxAssetId, Int>
+val AssetRegistryApi.assetMetadataMap: QueryableStorageEntry1<HydraDxAssetId, Int?>
     get() = storage1(
-        name = "AssetMetadataMap",
+        name = "Assets",
         binding = { decoded, _ -> bindMetadataDecimals(decoded) },
     )
 
-private fun bindMetadataDecimals(decoded: Any): Int {
-    return bindInt(decoded.castToStruct()["decimals"])
+private fun bindMetadataDecimals(decoded: Any): Int? {
+    return decoded.castToStruct().get<Any?>("decimals")?.let(::bindInt)
 }
diff --git a/...undation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapSource.kt b/...undation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapSource.kt
@@ -4,6 +4,7 @@ import com.google.gson.Gson
 import io.novafoundation.nova.common.data.network.runtime.binding.BlockNumber
 import io.novafoundation.nova.common.data.network.runtime.binding.orEmpty
 import io.novafoundation.nova.common.utils.MultiMapList
+import io.novafoundation.nova.common.utils.filterNotNull
 import io.novafoundation.nova.common.utils.graph.Edge
 import io.novafoundation.nova.common.utils.graph.Graph
 import io.novafoundation.nova.common.utils.graph.create
@@ -223,7 +224,7 @@ private class StableSwapSource(
     private fun CoroutineScope.fetchAssetsPrecisionsAsync(): Deferred<Map<HydraDxAssetId, Int>> {
         return async {
             remoteStorageSource.query(chain.id) {
-                metadata.assetRegistry.assetMetadataMap.entries()
+                metadata.assetRegistry.assetMetadataMap.entries().filterNotNull()
             }
         }
     }

diff --git a/.../src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableModule.kt b/.../src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableModule.kt
@@ -18,7 +18,7 @@ fun <T : Any> QueryableModule.storage0(name: String, binding: QueryableStorageBi
 }
 
 context(StorageQueryContext)
-fun <I, T : Any> QueryableModule.storage1(
+fun <I, T> QueryableModule.storage1(
     name: String,
     binding: QueryableStorageBinder1<I, T>,
     keyBinding: QueryableStorageKeyBinder<I>? = null

diff --git a/...in/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry1.kt b/...in/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry1.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.filterNotNull
 
 typealias QueryableStorageBinder1<K, V> = (dynamicInstance: Any, key: K) -> V
 
-interface QueryableStorageEntry1<I, T : Any> {
+interface QueryableStorageEntry1<I, T> {
 
     context(StorageQueryContext)
     suspend fun keys(): List<I>
@@ -46,7 +46,7 @@ fun <I, T : Any> QueryableStorageEntry1<I, T>.observeNonNull(argument: I): Flow<
 context(StorageQueryContext)
 suspend fun <I, T : Any> QueryableStorageEntry1<I, T>.queryNonNull(argument: I): T = requireNotNull(query(argument))
 
-internal class RealQueryableStorageEntry1<I, T : Any>(
+internal class RealQueryableStorageEntry1<I, T>(
     private val storageEntry: StorageEntry,
     private val binding: QueryableStorageBinder1<I, T>,
     @Suppress("UNCHECKED_CAST") private val keyBinding: QueryableStorageKeyBinder<I>? = null