Improve private key import/export via Gemstone

Author: furenster

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/operators/walletcore/WCLoadPrivateDataOperator.kt

@@ -1,21 +1,29 @@
 package com.gemwallet.android.blockchain.operators.walletcore
 
 import com.gemwallet.android.blockchain.operators.LoadPrivateDataOperator
+import com.gemwallet.android.ext.toChainType
 import com.gemwallet.android.math.decodeHex
 import com.gemwallet.android.math.toHexString
+import com.wallet.core.primitives.ChainType
 import com.wallet.core.primitives.Wallet
 import com.wallet.core.primitives.WalletType
+import wallet.core.jni.Base58
 import wallet.core.jni.StoredKey
 
 class WCLoadPrivateDataOperator(
     private val keyStoreDir: String
 ) : LoadPrivateDataOperator {
     override suspend fun invoke(wallet: Wallet, password: String): String {
         val storeKey = StoredKey.load("$keyStoreDir/${wallet.id}")
-        return if (wallet.type == WalletType.PrivateKey)
-            storeKey.decryptPrivateKey(password.decodeHex()).toHexString()
-        else
+        return if (wallet.type == WalletType.PrivateKey) {
+            val bytes = storeKey.decryptPrivateKey(password.decodeHex())
+            when (wallet.accounts.first().chain.toChainType()) {
+                ChainType.Bitcoin, ChainType.Solana -> Base58.encodeNoCheck(bytes)
+                else -> bytes.toHexString()
+            }
+        } else {
             storeKey.decryptMnemonic(password.decodeHex())
+        }
     }
 
 }

data/repositories/src/main/kotlin/com/gemwallet/android/data/repositoreis/wallets/PhraseAddressImportWalletService.kt

@@ -15,22 +15,15 @@ import com.gemwallet.android.cases.wallet.ImportError
 import com.gemwallet.android.cases.wallet.ImportWalletService
 import com.gemwallet.android.data.repositoreis.assets.AssetsRepository
 import com.gemwallet.android.data.repositoreis.session.SessionRepository
-import com.gemwallet.android.ext.keyEncodingTypes
-import com.gemwallet.android.math.decodeHex
 import com.gemwallet.android.math.toHexString
 import com.gemwallet.android.model.ImportType
 import com.wallet.core.primitives.AddressStatus
 import com.wallet.core.primitives.BannerEvent
 import com.wallet.core.primitives.BannerState
 import com.wallet.core.primitives.Chain
-import com.wallet.core.primitives.EncodingType
 import com.wallet.core.primitives.Wallet
 import com.wallet.core.primitives.WalletSource
 import com.wallet.core.primitives.WalletType
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import wallet.core.jni.Base32
-import wallet.core.jni.Base58
 import wallet.core.jni.PrivateKey
 
 class PhraseAddressImportWalletService(
@@ -172,43 +165,7 @@ class PhraseAddressImportWalletService(
     companion object {
 
         fun decodePrivateKey(chain: Chain, data: String): ByteArray {
-            chain.keyEncodingTypes.forEach { type ->
-                when (type) {
-                    EncodingType.Base58 -> {
-                        val decoded = Base58.decodeNoCheck(data)
-                            ?.takeIf { it.size % 32 == 0 }?.slice(0..< 32)
-                            ?.toByteArray()
-                        if (decoded != null) {
-                            return decoded
-                        }
-                    }
-                    EncodingType.Base32 -> {
-                        val decoded = decodeBase32(chain, data)
-                        if (decoded != null) {
-                            return decoded
-                        }
-                    }
-                    EncodingType.Hex -> return data.decodeHex()
-                }
-            }
-            throw IllegalArgumentException("Invalid private key encoding")
-        }
-
-        fun decodeBase32(chain: Chain, data: String): ByteArray? {
-            return when (chain) {
-                Chain.Stellar -> {
-                    if (data.length != 56 || !data.startsWith("S")) {
-                        return null
-                    }
-                    val decoded = Base32.decode(data)
-                    if (decoded.size == 35 && decoded[0] == 0x90.toByte()) {
-                        decoded.slice(1 .. 32).toByteArray()
-                    } else {
-                        null
-                    }
-                }
-                else -> null
-            }
+            return uniffi.gemstone.decodePrivateKey(chain = chain.string, data)
         }
     }
 }

gemcore/src/main/kotlin/com/gemwallet/android/ext/Chain.kt

@@ -226,13 +226,6 @@ fun BitcoinChain.fullAddress(address: String) = when (this) {
     else -> address
 }
 
-val Chain.keyEncodingTypes: List<EncodingType>
-    get() = when (this) {
-        Chain.Solana -> listOf(EncodingType.Base58, EncodingType.Hex)
-        Chain.Stellar -> listOf(EncodingType.Base32, EncodingType.Hex)
-        else -> listOf(EncodingType.Hex)
-    }
-
 fun uniffi.gemstone.Chain.toChain(): Chain? {
     return Chain.entries.firstOrNull { it.string == this }
 }