RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: require pubkey for watchonly

Browse Source
This commit is contained in:
Matthew Zipkin 2018-11-22 23:36:48 -08:00 committed by Braydon Fuller
parent 7c64fd845c
commit 1696b3c7bb
No known key found for this signature in database
GPG Key ID: F24F232D108B3AD4
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wallet/wallet.js
View File

@ -575,7 +575,7 @@ class Wallet extends EventEmitter {
await this.unlock(passphrase);
let key;
if (this.watchOnly && options.accountKey) {
if (this.watchOnly) {
key = options.accountKey;
if (typeof key === 'string')

42
test/wallet-test.js
View File

@ -18,6 +18,7 @@ const Input = require('../lib/primitives/input');
const Outpoint = require('../lib/primitives/outpoint');
const Script = require('../lib/script/script');
const HD = require('../lib/hd');
const PrivateKey = require('../lib/hd/private');
const KEY1 = 'xprv9s21ZrQH143K3Aj6xQBymM31Zb4BVc7wxqfUhMZrzewdDVCt'
+ 'qUP9iWfcHgJofs25xbaUpCps9GDXj83NiWvQCAkWQhVj5J4CorfnpKX94AZ';
@ -34,6 +35,7 @@ let importedWallet = null;
let importedKey = null;
let doubleSpendWallet = null;
let doubleSpendCoin = null;
let watchWallet = null;
function fromU32(num) {
const data = Buffer.allocUnsafe(4);
@ -1301,37 +1303,49 @@ describe('Wallet', function() {
importedKey = key;
});
it('should require account key to create watch only wallet', async () => {
try {
watchWallet = await wdb.create({
watchOnly: true
});
} catch (e) {
assert.strictEqual(
e.message,
'Must add HD public keys to watch only wallet.'
);
}
const privateKey = PrivateKey.generate();
const xpub = privateKey.xpubkey('main');
watchWallet = await wdb.create({
watchOnly: true,
accountKey: xpub
});
});
it('should import pubkey', async () => {
const key = KeyRing.generate();
const pub = new KeyRing(key.publicKey);
const wallet = await wdb.create({
watchOnly: true
});
await watchWallet.importKey('default', pub);
await wallet.importKey('default', pub);
const path = await wallet.getPath(pub.getHash());
const path = await watchWallet.getPath(pub.getHash());
assert.bufferEqual(path.hash, pub.getHash());
const wkey = await wallet.getKey(pub.getHash());
const wkey = await watchWallet.getKey(pub.getHash());
assert(wkey);
});
it('should import address', async () => {
const key = KeyRing.generate();
const wallet = await wdb.create({
watchOnly: true
});
await watchWallet.importAddress('default', key.getAddress());
await wallet.importAddress('default', key.getAddress());
const path = await wallet.getPath(key.getHash());
const path = await watchWallet.getPath(key.getHash());
assert(path);
assert.bufferEqual(path.hash, key.getHash());
const wkey = await wallet.getKey(key.getHash());
const wkey = await watchWallet.getKey(key.getHash());
assert(!wkey);
});