Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(wallet): fix cardano-client-lib API compatibility

Browse source 
- Rename getNetworks() to getNetwork() in CardanoNetworkConfig
- Return Network type instead of Networks
- Update all callers in CardanoKeyStorageImpl, CardanoWalletManager, DefaultTransactionBuilder
This commit is contained in:
Kayos 2026-03-27 12:33:14 -07:00
parent 11ebaf5042
commit 31d4537a71
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/wallet/impl/src/main/kotlin/io/element/android/features/wallet/impl/cardano/CardanoNetworkConfig.kt
View file

@ -77,9 +77,9 @@ object CardanoNetworkConfig {
} }
/** /**
* Returns the Networks instance for cardano-client-lib. * Returns the Network instance for cardano-client-lib.
*/ */
fun getNetworks(): com.bloxbean.cardano.client.common.model.Networks = when (NETWORK) { fun getNetwork(): com.bloxbean.cardano.client.common.model.Network = when (NETWORK) {
CardanoNetwork.TESTNET -> com.bloxbean.cardano.client.common.model.Networks.preprod() CardanoNetwork.TESTNET -> com.bloxbean.cardano.client.common.model.Networks.preprod()
CardanoNetwork.MAINNET -> com.bloxbean.cardano.client.common.model.Networks.mainnet() CardanoNetwork.MAINNET -> com.bloxbean.cardano.client.common.model.Networks.mainnet()
} }

2
features/wallet/impl/src/main/kotlin/io/element/android/features/wallet/impl/cardano/CardanoWalletManager.kt
View file

@ -157,7 +157,7 @@ class DefaultCardanoWalletManager @Inject constructor(
val mnemonicString = mnemonic.joinToString(" ") val mnemonicString = mnemonic.joinToString(" ")
// Create account and get private key bytes // Create account and get private key bytes
val account = Account(CardanoNetworkConfig.getNetworks(), mnemonicString, addressIndex) val account = Account(CardanoNetworkConfig.getNetwork(), mnemonicString, addressIndex)
val privateKeyBytes = account.privateKeyBytes() val privateKeyBytes = account.privateKeyBytes()
// Clear mnemonic string reference (best effort - JVM strings are immutable) // Clear mnemonic string reference (best effort - JVM strings are immutable)

2
features/wallet/impl/src/main/kotlin/io/element/android/features/wallet/impl/cardano/DefaultTransactionBuilder.kt
View file

@ -137,7 +137,7 @@ class DefaultTransactionBuilder @Inject constructor(
mnemonic: String, mnemonic: String,
): SignedTransaction { ): SignedTransaction {
// Create Account from mnemonic (handles CIP-1852 derivation internally) // Create Account from mnemonic (handles CIP-1852 derivation internally)
val account = Account(CardanoNetworkConfig.getNetworks(), mnemonic) val account = Account(CardanoNetworkConfig.getNetwork(), mnemonic)
// Build transaction using QuickTx (high-level API) // Build transaction using QuickTx (high-level API)
val tx = Tx() val tx = Tx()

8
features/wallet/impl/src/main/kotlin/io/element/android/features/wallet/impl/storage/CardanoKeyStorageImpl.kt
View file

@ -105,7 +105,7 @@ class CardanoKeyStorageImpl @Inject constructor(
// Derive addresses // Derive addresses
val mnemonicString = wordList.joinToString(" ") val mnemonicString = wordList.joinToString(" ")
val account = Account(CardanoNetworkConfig.getNetworks(), mnemonicString) val account = Account(CardanoNetworkConfig.getNetwork(), mnemonicString)
val result = WalletCreationResult( val result = WalletCreationResult(
mnemonic = wordList, mnemonic = wordList,
@ -141,7 +141,7 @@ class CardanoKeyStorageImpl @Inject constructor(
// Verify it produces valid Cardano addresses // Verify it produces valid Cardano addresses
val mnemonicString = mnemonic.joinToString(" ") val mnemonicString = mnemonic.joinToString(" ")
val account = try { val account = try {
Account(CardanoNetworkConfig.getNetworks(), mnemonicString) Account(CardanoNetworkConfig.getNetwork(), mnemonicString)
} catch (e: Exception) { } catch (e: Exception) {
throw IllegalArgumentException("Failed to derive Cardano keys: ${e.message}") throw IllegalArgumentException("Failed to derive Cardano keys: ${e.message}")
} }
@ -166,7 +166,7 @@ class CardanoKeyStorageImpl @Inject constructor(
runCatching { runCatching {
val mnemonic = retrieveMnemonic(sessionId) val mnemonic = retrieveMnemonic(sessionId)
val mnemonicString = mnemonic.joinToString(" ") val mnemonicString = mnemonic.joinToString(" ")
val account = Account(CardanoNetworkConfig.getNetworks(), mnemonicString, addressIndex) val account = Account(CardanoNetworkConfig.getNetwork(), mnemonicString, addressIndex)
account.baseAddress() account.baseAddress()
} }
} }
@ -176,7 +176,7 @@ class CardanoKeyStorageImpl @Inject constructor(
runCatching { runCatching {
val mnemonic = retrieveMnemonic(sessionId) val mnemonic = retrieveMnemonic(sessionId)
val mnemonicString = mnemonic.joinToString(" ") val mnemonicString = mnemonic.joinToString(" ")
val account = Account(CardanoNetworkConfig.getNetworks(), mnemonicString) val account = Account(CardanoNetworkConfig.getNetwork(), mnemonicString)
account.stakeAddress() account.stakeAddress()
} }
} }