mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-04 04:13:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: import wallet descriptors for BIP84 & BIP49, but with xpubs (closes #4993)

Browse source
This commit is contained in:
overtorment 2022-10-23 20:49:02 +01:00 • committed by Overtorment
parent f94e3c0d3a
commit 6c86e6f9f1
2 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
class/wallets/abstract-wallet.ts
View file

@ -223,6 +223,16 @@ export class AbstractWallet {
this._derivationPath = derivationPath;
}
this.secret = m[2];
if (derivationPath.startsWith("m/84'/0'/") && this.secret.toLowerCase().startsWith('xpub')) {
// need to convert xpub to zpub
this.secret = this._xpubToZpub(this.secret);
}
if (derivationPath.startsWith("m/49'/0'/") && this.secret.toLowerCase().startsWith('xpub')) {
// need to convert xpub to ypub
this.secret = this._xpubToYpub(this.secret);
}
}
try {
@ -390,6 +400,22 @@ export class AbstractWallet {
return b58.encode(data);
}
_xpubToZpub(xpub: string): string {
let data = b58.decode(xpub);
data = data.slice(4);
data = Buffer.concat([Buffer.from('04b24746', 'hex'), data]);
return b58.encode(data);
}
_xpubToYpub(xpub: string): string {
let data = b58.decode(xpub);
data = data.slice(4);
data = Buffer.concat([Buffer.from('049d7cb2', 'hex'), data]);
return b58.encode(data);
}
prepareForSerialization(): void {}
/*

22
tests/unit/watch-only-wallet.test.js
View file

@ -309,6 +309,28 @@ describe('Watch only wallet', () => {
assert.ok(!w.useWithHardwareWalletEnabled());
});
it('can import wallet descriptor for BIP84, but with xpub instead of zpub', async () => {
const w = new WatchOnlyWallet();
w.setSecret(
'[dafedf1c/84h/0h/0h]xpub6DFMZMLizqqnyyHoWTG7qzmCR1irpiDEGT4JQX7ubeoFtV838ABKPfgAPQbM1TEekEyCuJF1BrmnA7JPrnzqi2VbycD3tVE3v5xsDQqYA3A',
);
w.init();
assert.ok(w.valid());
assert.strictEqual(w.getMasterFingerprintHex(), 'dafedf1c');
assert.strictEqual(w.getMasterFingerprint(), 484441818);
assert.strictEqual(w.getDerivationPath(), "m/84'/0'/0'");
assert.strictEqual(
w.getSecret(),
'zpub6rutAggZJCvkgZg3BAqNGAxCkx1khxCE6g6jyJugMfZ1zgkVdUWSdnzSRpWX1GYVZXCpQFS87BUsvgXXJBpsJVroiHbu4Js2TY69zbWcTNb',
);
assert.strictEqual(w._getExternalAddressByIndex(0), 'bc1q68y6r45k4kvxe42xl37dgjueg2suqwnh4ze0sr');
assert.ok(!w.useWithHardwareWalletEnabled());
});
it('can combine signed PSBT and prepare it for broadcast', async () => {
const w = new WatchOnlyWallet();
w.setSecret('zpub6rjLjQVqVnj7crz9E4QWj4WgczmEseJq22u2B6k2HZr6NE2PQx3ZYg8BnbjN9kCfHymSeMd2EpwpM5iiz5Nrb3TzvddxW2RMcE3VXdVaXHk');