android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 20:39:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: missing addresses on ltc & bch

Browse source
This commit is contained in:
Rafael Saes 2025-04-28 16:58:03 -03:00
parent fe7e419b42
commit a094cd885a
1 changed files with 73 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

92
cw_bitcoin/lib/electrum_wallet.dart
View file

@ -326,7 +326,9 @@ abstract class ElectrumWalletBase<T extends ElectrumWalletAddresses>
// NOTE: will initiate by priority from the first walletAddressTypes // NOTE: will initiate by priority from the first walletAddressTypes
// then proceeds to following ones after got fully discovered response from worker response // then proceeds to following ones after got fully discovered response from worker response
for (final addressType in walletAddresses.walletAddressTypes) { for (final addressType in walletAddresses.walletAddressTypes) {
if (isHardwareWallet && addressType != SegwitAddressType.p2wpkh) continue; if (currency == CryptoCurrency.btc &&
isHardwareWallet &&
addressType != SegwitAddressType.p2wpkh) continue;
final bitcoinDerivationInfo = BitcoinAddressUtils.getDerivationFromType( final bitcoinDerivationInfo = BitcoinAddressUtils.getDerivationFromType(
addressType, addressType,
@ -342,21 +344,7 @@ abstract class ElectrumWalletBase<T extends ElectrumWalletAddresses>
isChange: isChange, isChange: isChange,
); );
if (isDiscovered == false) { if (isDiscovered == false) break;
break;
}
// else if (sync == true)
// subscribeForStatuses(
// walletAddresses.addressesRecords
// .getRecords(
// addressType: addressType,
// seedBytesType: seedBytesType,
// derivationPath: derivationPath,
// isChange: isChange,
// )
// .whereType<BitcoinAddressRecord>()
// .toList(),
// );
} }
if (isDiscovered == false) { if (isDiscovered == false) {
@ -369,9 +357,75 @@ abstract class ElectrumWalletBase<T extends ElectrumWalletAddresses>
} }
} }
// if (isDiscovered == true && sync == false) if (currency != CryptoCurrency.btc) {
// initAddresses(true); for (final addressType in walletAddresses.walletAddressTypes) {
// else if (isDiscovered == false && discovered == false) initAddresses(sync); for (final seedBytesType in hdWallets.keys) {
final bitcoinDerivationInfo = BitcoinAddressUtils.getDerivationFromType(
addressType,
network: network,
isElectrum: seedBytesType.isElectrum,
);
bool alreadyDidDerivation = false;
for (final derivationInfo in [
bitcoinDerivationInfo,
BitcoinDerivationInfos.BIP84,
BitcoinDerivationInfos.ELECTRUM,
]) {
final derivationPath = derivationInfo.derivationPath.toString();
if (alreadyDidDerivation &&
derivationPath == bitcoinDerivationInfo.derivationPath.toString()) {
continue;
}
alreadyDidDerivation = true;
for (final isChange in [true, false]) {
isDiscovered = walletAddresses.discoveredAddressesRecord.getIsDiscovered(
addressType: addressType,
seedBytesType: seedBytesType,
derivationPath: derivationPath,
isChange: isChange,
);
if (isDiscovered == false) {
break;
} else if (sync == true)
subscribeForStatuses(
walletAddresses.addressesRecords
.getRecords(
addressType: addressType,
seedBytesType: seedBytesType,
derivationPath: derivationPath,
isChange: isChange,
)
.whereType<BitcoinAddressRecord>()
.toList(),
);
}
if (isDiscovered == false) {
discovered = await generateInitialAddresses(
addressType: addressType,
seedBytesType: seedBytesType,
bitcoinDerivationInfo: derivationInfo,
);
break;
}
}
if (isDiscovered == false) break;
}
if (isDiscovered == false) break;
}
if (isDiscovered == true && sync == false)
initAddresses(true);
else if (isDiscovered == false && discovered == false) initAddresses(sync);
}
if (isDiscovered == true && syncStatus is SynchronizingSyncStatus) if (isDiscovered == true && syncStatus is SynchronizingSyncStatus)
syncStatus = SyncedSyncStatus(); syncStatus = SyncedSyncStatus();