github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-17 05:41:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix hardware derivation path with accounts bigger than zero (#3203)

Browse Source
This commit is contained in:
Omar Hatem
2026-05-06 23:22:08 +02:00
committed by GitHub
parent a0e1dd7004
commit 813aa348bc
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cw_bitcoin/lib/electrum_wallet.dart
+13 -2
View File
@@ -132,10 +132,11 @@ abstract class ElectrumWalletBase
}
} else if (canDeriveFromSeed) {
final coinType = _coinTypeFor(currency);
final accountIndex = _parseAccountIndex(derivationInfo.derivationPath);
for (final type in supportedTypes) {
final purpose = _purposeForType(type);
final accountPath = "m/$purpose'/$coinType'/0'";
final accountPath = "m/$purpose'/$coinType'/$accountIndex'";
mainHdByType[type] = _masterHD!.derivePath("$accountPath/0") as Bip32Slip10Secp256k1;
sideHdByType[type] = _masterHD!.derivePath("$accountPath/1") as Bip32Slip10Secp256k1;
@@ -197,7 +198,8 @@ abstract class ElectrumWalletBase
final coinType = _coinTypeFor(currency);
final purpose = _purposeForType(record.type);
return "m/$purpose'/$coinType'/0'";
final accountIndex = _parseAccountIndex(derivationInfo.derivationPath);
return "m/$purpose'/$coinType'/$accountIndex'";
}
List<BitcoinAddressType> supportedAddressTypes(WalletType type) {
@@ -259,6 +261,15 @@ abstract class ElectrumWalletBase
static int estimatedTransactionSize(int inputsCount, int outputsCounts) =>
inputsCount * 68 + outputsCounts * 34 + 10;
// Parses the account index from a BIP-44/49/84/86 derivation path.
// e.g. "m/84'/0'/1'" → 1. Returns 0 for unrecognised formats.
static int _parseAccountIndex(String? derivationPath) {
if (derivationPath == null) return 0;
final parts = derivationPath.split('/');
if (parts.length < 4) return 0;
return int.tryParse(parts[3].replaceAll("'", "")) ?? 0;
}
static Bip32KeyNetVersions? getKeyNetVersion(BasedUtxoNetwork network,
[HardwareWalletType? hardwareWalletType]) {
switch (network) {