Merge pull request #325 from soramitsu/rc/1.8.3

Rc/1.8.3

Author: valentunn

README.md

@@ -21,9 +21,12 @@ To build Fearless Wallet Android project, you need to provide several keys eithe
 ``` properties
 MOONPAY_TEST_SECRET=stub
 MOONPAY_PRODUCTION_SECRET=stub
+SUBSCAN_API_KEY=
 ```
 
 Note, that with stub keys buy via moonpay will not work correctly. However, other parts of application will not be affected.
 
+If you will leave SUBSCAN_API_KEY value empty, you will have very strict limits for the subscan api requests. If you want to increase the limits, check the [Subscan website](https://docs.api.subscan.io/#introduction) and then add the api key to the 'local.properties' -> SUBSCAN_API_KEY=YOUR_API_KEY
+
 ## License
 Fearless Wallet Android is available under the Apache 2.0 license. See the LICENSE file for more info.

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.8.2'
-        versionCode = 17
+        versionName = '1.8.3'
+        versionCode = 19
 
         // SDK and tools
         compileSdkVersion = 29

common/src/main/java/jp/co/soramitsu/common/data/network/NetworkApiCreator.kt

@@ -10,10 +10,13 @@ class NetworkApiCreator(
     private val baseUrl: String
 ) {
 
-    fun <T> create(service: Class<T>): T {
+    fun <T> create(
+        service: Class<T>,
+        customBaseUrl: String = baseUrl
+    ): T {
         val retrofit = Retrofit.Builder()
             .client(okHttpClient)
-            .baseUrl(baseUrl)
+            .baseUrl(customBaseUrl)
             .addConverterFactory(ScalarsConverterFactory.create())
             .addConverterFactory(GsonConverterFactory.create())
             .build()

common/src/main/java/jp/co/soramitsu/common/data/network/rpc/ChildState.kt

@@ -0,0 +1,18 @@
+package jp.co.soramitsu.common.data.network.rpc
+
+import jp.co.soramitsu.fearless_utils.extensions.toHexString
+import java.io.ByteArrayOutputStream
+
+private const val CHILD_KEY_DEFAULT = ":child_storage:default:"
+
+suspend fun childStateKey(
+    builder: suspend ByteArrayOutputStream.() -> Unit
+): String {
+    val buffer = ByteArrayOutputStream().apply {
+        write(CHILD_KEY_DEFAULT.encodeToByteArray())
+
+        builder()
+    }
+
+    return buffer.toByteArray().toHexString(withPrefix = true)
+}

common/src/main/java/jp/co/soramitsu/common/data/network/runtime/binding/BalanceOf.kt

@@ -0,0 +1,5 @@
+package jp.co.soramitsu.common.data.network.runtime.binding
+
+import java.math.BigInteger
+
+typealias BalanceOf = BigInteger

common/src/main/java/jp/co/soramitsu/common/data/network/runtime/binding/BindingHelpers.kt

@@ -18,7 +18,9 @@ annotation class HelperBinding
 fun incompatible(): Nothing = throw IllegalStateException("Binding is incompatible")
 
 typealias Binder<T> = (scale: String?, RuntimeSnapshot) -> T
+typealias BinderWithKey<T, K> = (scale: String?, RuntimeSnapshot, key: K) -> T
 typealias NonNullBinder<T> = (scale: String, RuntimeSnapshot) -> T
+typealias NonNullBinderWithType<T> = (scale: String, RuntimeSnapshot, Type<*>) -> T
 typealias BinderWithType<T> = (scale: String?, RuntimeSnapshot, Type<*>) -> T
 
 @OptIn(ExperimentalContracts::class)

common/src/main/java/jp/co/soramitsu/common/data/network/runtime/binding/Primitive.kt

@@ -4,3 +4,6 @@ import java.math.BigInteger
 
 @HelperBinding
 fun bindNumber(dynamicInstance: Any?): BigInteger = dynamicInstance.cast()
+
+@HelperBinding
+fun bindString(dynamicInstance: Any?): String = dynamicInstance.cast<ByteArray>().decodeToString()

common/src/main/java/jp/co/soramitsu/common/data/network/runtime/calls/GetChildStateRequest.kt

@@ -0,0 +1,11 @@
+package jp.co.soramitsu.common.data.network.runtime.calls
+
+import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest
+
+class GetChildStateRequest(
+    storageKey: String,
+    childKey: String
+) : RuntimeRequest(
+    method = "childstate_getStorage",
+    params = listOf(childKey, storageKey)
+)

common/src/main/java/jp/co/soramitsu/common/mixin/impl/ValidatableUi.kt

@@ -2,16 +2,15 @@ package jp.co.soramitsu.common.mixin.impl
 
 import android.content.Context
 import jp.co.soramitsu.common.base.BaseFragment
-import jp.co.soramitsu.common.base.BaseViewModel
 import jp.co.soramitsu.common.mixin.api.Validatable
 import jp.co.soramitsu.common.validation.DefaultFailureLevel
 import jp.co.soramitsu.common.view.dialog.errorDialog
 import jp.co.soramitsu.common.view.dialog.warningDialog
 
-fun <T> BaseFragment<T>.observeValidations(
-    viewModel: T,
+fun BaseFragment<*>.observeValidations(
+    viewModel: Validatable,
     dialogContext: Context = requireContext()
-) where T : BaseViewModel, T : Validatable {
+) {
     viewModel.validationFailureEvent.observeEvent {
         val level = it.level
 

common/src/main/java/jp/co/soramitsu/common/utils/ConcurrentHasher.kt

@@ -0,0 +1,12 @@
+package jp.co.soramitsu.common.utils
+
+import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+object ConcurrentHasher {
+
+    private val mutex = Mutex()
+
+    suspend fun ByteArray.concurrentBlake2b256() = mutex.withLock { blake2b256() }
+}