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() }
+}

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

@@ -11,8 +11,10 @@ import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
 import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent
 import jp.co.soramitsu.fearless_utils.runtime.metadata.Module
 import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata
+import jp.co.soramitsu.fearless_utils.runtime.metadata.StorageEntry
 import jp.co.soramitsu.fearless_utils.runtime.metadata.module
 import jp.co.soramitsu.fearless_utils.runtime.metadata.moduleOrNull
+import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey
 import jp.co.soramitsu.fearless_utils.scale.EncodableStruct
 import jp.co.soramitsu.fearless_utils.scale.Schema
 import jp.co.soramitsu.fearless_utils.scale.dataType.DataType
@@ -24,6 +26,8 @@ import jp.co.soramitsu.fearless_utils.wsrpc.mappers.nonNull
 import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojo
 import java.io.ByteArrayOutputStream
 
+fun StorageEntry.defaultInHex() = default.toHexString(withPrefix = true)
+
 fun ByteArray.toAddress(networkType: Node.NetworkType) = toAddress(networkType.runtimeConfiguration.addressByte)
 
 fun <T> DataType<T>.fromHex(hex: String): T {
@@ -74,6 +78,10 @@ fun RuntimeMetadata.babe() = module(Modules.BABE)
 
 fun RuntimeMetadata.slots() = module(Modules.SLOTS)
 
+fun <T> StorageEntry.storageKeys(runtime: RuntimeSnapshot, singleMapKeys: Collection<T>): Map<String, T> {
+    return singleMapKeys.associateBy { storageKey(runtime, it) }
+}
+
 fun String.networkType() = Node.NetworkType.findByAddressByte(addressByte())!!
 
 fun RuntimeMetadata.hasModule(name: String) = moduleOrNull(name) != null

common/src/main/java/jp/co/soramitsu/common/validation/ValidationExecutor.kt

@@ -21,7 +21,7 @@ class ValidationExecutor(
         errorDisplayer: (Throwable) -> Unit,
         validationFailureTransformer: (S) -> TitleAndMessage,
         progressConsumer: ProgressConsumer? = null,
-        autoFixPayload: (original: P, failureStatus: S) -> P,
+        autoFixPayload: (original: P, failureStatus: S) -> P = { original, _ -> original },
         block: (P) -> Unit,
     ) {
         progressConsumer?.invoke(true)

common/src/main/res/values/strings.xml

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
+    <string name="staking_set_validators_title">Select validators to start staking</string>
+    <string name="staking_set_validators_message">Validators are not selected</string>
+
+    <string name="staking_max_nominators_reached_title">Cannot nominate</string>
+    <string name="staking_max_nominators_reached_message">Maximum number of nominators has been reached</string>
+
+    <string name="crowdloan_my_contribution">You contributed: %s</string>
+
     <string name="staking_alert_bond_more_title">Bond more tokens.</string>
     <string name="staking_alert_bond_more_message">Staking is inactive. Current minimal stake is %s</string>
     <string name="staking_alert_redeem_title">Redeem unbonded tokens.</string>
 
     <string name="staking_alert_title">Alerts</string>
     <string name="staking_alert_no_alerts_now">Everything is fine now. Alerts will appear here.</string>
     <string name="staking_alert_start_next_era_message">Please wait for the next era to start.</string>
-    <string name="staking_alert_election">Staking actions are currently unavailable.</string>
-    <string name="staking_alert_election_message">The network is electing validators.\nUsually it takes less than 10 minutes.</string>
     <string name="staking_alert_change_validators">Change your validators.</string>
     <string name="staking_alert_change_validators_message">Staking is inactive. None of your validators were elected by network.</string>
 
@@ -175,7 +181,6 @@
 
     <string name="staking_nominator_status_alert_active_title">Active status</string>
     <string name="staking_nominator_status_alert_active_message">One of your validators have been elected by network.</string>
-    <string name="staking_nominator_status_alert_election_message">The network is electing validators. Please wait a few minutes.</string>
     <string name="staking_nominator_status_alert_waiting_message">Your staking will start in the next era.</string>
     <string name="staking_nominator_status_alert_inactive_title">Inactive status</string>
     <string name="staking_nominator_status_alert_no_validators">None of your validators have been elected by network.</string>
@@ -189,7 +194,6 @@
 
     <string name="staking_stake">Stake</string>
     <string name="staking_total_rewards">Total rewards</string>
-    <string name="staking_nominator_status_election">Election period</string>
     <string name="staking_nominator_status_active">Active</string>
     <string name="staking_nominator_status_inactive">Inactive</string>
     <string name="staking_nominator_status_waiting">Waiting for the next era</string>

feature-crowdloan-api/src/main/java/jp/co/soramitsu/feature_crowdloan_api/data/network/blockhain/binding/Contribution.kt

@@ -0,0 +1,25 @@
+package jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding
+
+import jp.co.soramitsu.common.data.network.runtime.binding.bindNumber
+import jp.co.soramitsu.common.data.network.runtime.binding.bindString
+import jp.co.soramitsu.common.data.network.runtime.binding.cast
+import jp.co.soramitsu.common.data.network.runtime.binding.incompatible
+import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
+import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex
+import java.math.BigInteger
+
+class Contribution(
+    val amount: BigInteger,
+    val memo: String
+)
+
+fun bindContribution(scale: String, runtime: RuntimeSnapshot): Contribution {
+    val type = runtime.typeRegistry["(BalanceOf, Vec<u8>)"] ?: incompatible()
+
+    val dynamicInstance = type.fromHex(runtime, scale).cast<List<*>>()
+
+    return Contribution(
+        amount = bindNumber(dynamicInstance[0]),
+        memo = bindString(dynamicInstance[1])
+    )
+}

feature-crowdloan-api/src/main/java/jp/co/soramitsu/feature_crowdloan_api/data/network/blockhain/binding/FundInfo.kt

@@ -9,6 +9,8 @@ import jp.co.soramitsu.common.utils.Modules
 import jp.co.soramitsu.fearless_utils.runtime.AccountId
 import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
 import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct
+import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.u32
+import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toByteArray
 import java.math.BigInteger
 
 class FundInfo(
@@ -19,10 +21,13 @@ class FundInfo(
     val firstSlot: BigInteger,
     val end: BigInteger,
     val cap: BigInteger,
-    val verifier: Any?
+    val verifier: Any?,
+    val trieIndex: TrieIndex,
+    val paraId: ParaId,
+    val bidderAccountId: AccountId
 )
 
-fun bindFundInfo(scale: String, runtime: RuntimeSnapshot): FundInfo {
+fun bindFundInfo(scale: String, runtime: RuntimeSnapshot, paraId: ParaId): FundInfo {
     val type = runtime.metadata.storageReturnType(Modules.CROWDLOAN, "Funds")
 
     val dynamicInstance = type.fromHexOrIncompatible(scale, runtime)
@@ -36,6 +41,18 @@ fun bindFundInfo(scale: String, runtime: RuntimeSnapshot): FundInfo {
         cap = bindNumber(dynamicInstance["cap"]),
         firstSlot = bindNumber(dynamicInstance["firstPeriod"] ?: dynamicInstance["firstSlot"]),
         lastSlot = bindNumber(dynamicInstance["lastPeriod"] ?: dynamicInstance["lastSlot"]),
-        verifier = dynamicInstance["verifier"]
+        verifier = dynamicInstance["verifier"],
+        trieIndex = bindTrieIndex(dynamicInstance["trieIndex"]),
+        bidderAccountId = createBidderAccountId(runtime, paraId),
+        paraId = paraId
     )
 }
+
+private val ADDRESS_PADDING = ByteArray(32)
+private val ADDRESS_PREFIX = "modlpy/cfund".encodeToByteArray()
+
+private fun createBidderAccountId(runtime: RuntimeSnapshot, paraId: ParaId): AccountId {
+    val fullKey = ADDRESS_PREFIX + u32.toByteArray(runtime, paraId) + ADDRESS_PADDING
+
+    return fullKey.copyOfRange(0, 32)
+}

feature-crowdloan-api/src/main/java/jp/co/soramitsu/feature_crowdloan_api/data/network/blockhain/binding/Leases.kt

@@ -0,0 +1,34 @@
+package jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding
+
+import jp.co.soramitsu.common.data.network.runtime.binding.BalanceOf
+import jp.co.soramitsu.common.data.network.runtime.binding.bindAccountId
+import jp.co.soramitsu.common.data.network.runtime.binding.bindNumber
+import jp.co.soramitsu.common.data.network.runtime.binding.cast
+import jp.co.soramitsu.common.data.network.runtime.binding.fromHexOrIncompatible
+import jp.co.soramitsu.common.data.network.runtime.binding.returnType
+import jp.co.soramitsu.common.utils.slots
+import jp.co.soramitsu.fearless_utils.runtime.AccountId
+import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
+import jp.co.soramitsu.fearless_utils.runtime.metadata.storage
+
+class LeaseEntry(
+    val accountId: AccountId,
+    val locked: BalanceOf
+)
+
+fun bindLeases(scale: String, runtimeSnapshot: RuntimeSnapshot): List<LeaseEntry?> {
+    val type = runtimeSnapshot.metadata.slots().storage("Leases").returnType()
+
+    val dynamicInstance = type.fromHexOrIncompatible(scale, runtimeSnapshot).cast<List<*>>()
+
+    return dynamicInstance.map {
+        it?.let {
+            val (accountIdRaw, balanceRaw) = it.cast<List<*>>()
+
+            LeaseEntry(
+                accountId = bindAccountId(accountIdRaw),
+                locked = bindNumber(balanceRaw)
+            )
+        }
+    }
+}

feature-crowdloan-api/src/main/java/jp/co/soramitsu/feature_crowdloan_api/data/network/blockhain/binding/TrieIndex.kt

@@ -0,0 +1,10 @@
+package jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding
+
+import jp.co.soramitsu.common.data.network.runtime.binding.HelperBinding
+import jp.co.soramitsu.common.data.network.runtime.binding.bindNumber
+import java.math.BigInteger
+
+typealias TrieIndex = BigInteger
+
+@HelperBinding
+fun bindTrieIndex(dynamicInstance: Any?) = bindNumber(dynamicInstance)

feature-crowdloan-api/src/main/java/jp/co/soramitsu/feature_crowdloan_api/data/repository/CrowdloanRepository.kt

@@ -1,8 +1,11 @@
 package jp.co.soramitsu.feature_crowdloan_api.data.repository
 
 import jp.co.soramitsu.core.model.Node
+import jp.co.soramitsu.fearless_utils.runtime.AccountId
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.Contribution
 import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.FundInfo
 import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.ParaId
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.TrieIndex
 import kotlinx.coroutines.flow.Flow
 import java.math.BigDecimal
 import java.math.BigInteger
@@ -13,8 +16,12 @@ interface CrowdloanRepository {
 
     suspend fun allFundInfos(): Map<ParaId, FundInfo>
 
+    suspend fun getWinnerInfo(funds: Map<ParaId, FundInfo>): Map<ParaId, Boolean>
+
     suspend fun getParachainMetadata(): Map<ParaId, ParachainMetadata>
 
+    suspend fun getContribution(accountId: AccountId, paraId: ParaId, trieIndex: TrieIndex): Contribution?
+
     suspend fun blocksPerLeasePeriod(): BigInteger
 
     fun fundInfoFlow(parachainId: ParaId, networkType: Node.NetworkType): Flow<FundInfo>

feature-crowdloan-api/src/main/java/jp/co/soramitsu/feature_crowdloan_api/data/repository/CrowdloanRepositoryExt.kt

@@ -0,0 +1,28 @@
+package jp.co.soramitsu.feature_crowdloan_api.data.repository
+
+import jp.co.soramitsu.fearless_utils.runtime.AccountId
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.Contribution
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.FundInfo
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.ParaId
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.binding.TrieIndex
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.withContext
+
+suspend fun CrowdloanRepository.getContributions(
+    accountId: AccountId,
+    keys: Map<ParaId, TrieIndex>
+): Map<ParaId, Contribution?> = withContext(Dispatchers.Default) {
+    keys.map { (paraId, trieIndex) ->
+        async { paraId to getContribution(accountId, paraId, trieIndex) }
+    }
+        .awaitAll()
+        .toMap()
+}
+
+suspend fun CrowdloanRepository.hasWonAuction(fundInfo: FundInfo): Boolean {
+    val paraId = fundInfo.paraId
+
+    return getWinnerInfo(mapOf(paraId to fundInfo)).getValue(paraId)
+}

feature-crowdloan-impl/src/main/java/jp/co/soramitsu/feature_crowdloan_impl/data/network/api/bifrost/BifrostApi.kt

@@ -0,0 +1,17 @@
+package jp.co.soramitsu.feature_crowdloan_impl.data.network.api.bifrost
+
+import jp.co.soramitsu.common.data.network.subquery.SubQueryResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface BifrostApi {
+
+    companion object {
+        const val BASE_URL = "https://salp-api.bifrost.finance"
+    }
+
+    @POST("/")
+    suspend fun getAccountByReferralCode(@Body body: BifrostReferralCheckRequest): SubQueryResponse<GetAccountByReferralCodeResponse>
+}
+
+suspend fun BifrostApi.getAccountByReferralCode(code: String) = getAccountByReferralCode(BifrostReferralCheckRequest(code))