Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 19:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Matthew Fosse 2024-05-10 12:17:23 -07:00
parent 68e20b25c3
commit 999058cae4
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cw_bitcoin/lib/bitcoin_wallet.dart
View file

@ -151,10 +151,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
} }
} }
print(walletInfo.derivationInfo!.derivationType);
print(walletInfo.derivationInfo!.derivationPath);
print("@@@@@@@@@@@@@@@");
return BitcoinWallet( return BitcoinWallet(
mnemonic: snp.mnemonic, mnemonic: snp.mnemonic,
xpub: snp.xpub, xpub: snp.xpub,

8
cw_bitcoin/lib/electrum_derivations.dart
View file

@ -4,7 +4,7 @@ Map<DerivationType, List<DerivationInfo>> electrum_derivations = {
DerivationType.electrum: [ DerivationType.electrum: [
DerivationInfo( DerivationInfo(
derivationType: DerivationType.electrum, derivationType: DerivationType.electrum,
derivationPath: "m/0'", derivationPath: "m/0'/0",
description: "Electrum", description: "Electrum",
scriptType: "p2wpkh", scriptType: "p2wpkh",
), ),
@ -30,19 +30,19 @@ Map<DerivationType, List<DerivationInfo>> electrum_derivations = {
), ),
DerivationInfo( DerivationInfo(
derivationType: DerivationType.bip39, derivationType: DerivationType.bip39,
derivationPath: "m/0'", derivationPath: "m/0'/0",
description: "Non-standard legacy", description: "Non-standard legacy",
scriptType: "p2pkh", scriptType: "p2pkh",
), ),
DerivationInfo( DerivationInfo(
derivationType: DerivationType.bip39, derivationType: DerivationType.bip39,
derivationPath: "m/0'", derivationPath: "m/0'/0",
description: "Non-standard compatibility segwit", description: "Non-standard compatibility segwit",
scriptType: "p2wpkh-p2sh", scriptType: "p2wpkh-p2sh",
), ),
DerivationInfo( DerivationInfo(
derivationType: DerivationType.bip39, derivationType: DerivationType.bip39,
derivationPath: "m/0'", derivationPath: "m/0'/0",
description: "Non-standard native segwit", description: "Non-standard native segwit",
scriptType: "p2wpkh", scriptType: "p2wpkh",
), ),

4
cw_bitcoin/lib/electrum_wallet.dart
View file

@ -1371,7 +1371,9 @@ abstract class ElectrumWalletBase
final HD = index == null ? hd : hd.derive(index); final HD = index == null ? hd : hd.derive(index);
final priv = ECPrivate.fromHex(HD.privKey!); final priv = ECPrivate.fromHex(HD.privKey!);
String messagePrefix = '\x18Bitcoin Signed Message:\n'; String messagePrefix = '\x18Bitcoin Signed Message:\n';
return priv.signMessage(utf8.encode(message), messagePrefix: messagePrefix); final hexEncoded = priv.signMessage(utf8.encode(message), messagePrefix: messagePrefix);
final decodedSig = hex.decode(hexEncoded);
return base64Encode(decodedSig);
} }
@override @override

11
lib/entities/default_settings_migration.dart
View file

@ -766,6 +766,17 @@ Future<void> changeDefaultMoneroNode(
} }
} }
Future<void> fixBtcDerivationPaths(Box<WalletInfo> walletsInfoSource) async {
for (WalletInfo walletInfo in walletsInfoSource.values) {
if (walletInfo.type == WalletType.bitcoin) {
if (walletInfo.derivationInfo?.derivationPath == "m/0'") {
walletInfo.derivationInfo!.derivationPath = "m/0'/0";
}
}
await walletInfo.save();
}
}
Future<void> updateBtcNanoWalletInfos(Box<WalletInfo> walletsInfoSource) async { Future<void> updateBtcNanoWalletInfos(Box<WalletInfo> walletsInfoSource) async {
for (WalletInfo walletInfo in walletsInfoSource.values) { for (WalletInfo walletInfo in walletsInfoSource.values) {
if (walletInfo.type == WalletType.nano || walletInfo.type == WalletType.bitcoin) { if (walletInfo.type == WalletType.nano || walletInfo.type == WalletType.bitcoin) {