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

more path stuff.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-07-05 16:21:50 -07:00
parent f8fadb73a7
commit 0dc2b41f5e
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bcoin/spvnode.js
View File

@ -145,8 +145,8 @@ SPVNode.prototype._init = function _init() {
}); });
}); });
this.walletdb.on('save address', function(hash) { this.walletdb.on('save address', function(address) {
self.pool.watch(hash, 'hex'); self.pool.watch(address.getHash());
}); });
}; };

43
lib/bcoin/walletdb.js
View File

@ -749,9 +749,9 @@ WalletDB.prototype.hasAccount = function hasAccount(id, account, callback) {
WalletDB.prototype.saveAddress = function saveAddress(id, addresses, callback) { WalletDB.prototype.saveAddress = function saveAddress(id, addresses, callback) {
var self = this; var self = this;
var hashes = []; var items = [];
var batch = this.db.batch(); var batch = this.db.batch();
var i, address; var i, address, path;
if (!Array.isArray(addresses)) if (!Array.isArray(addresses))
addresses = [addresses]; addresses = [addresses];
@ -759,22 +759,31 @@ WalletDB.prototype.saveAddress = function saveAddress(id, addresses, callback) {
for (i = 0; i < addresses.length; i++) { for (i = 0; i < addresses.length; i++) {
address = addresses[i]; address = addresses[i];
hashes.push([address.getKeyHash('hex'), address]); path = Path.fromKeyRing(address);
items.push([address.getKeyAddress(), path]);
if (address.type === 'multisig') if (address.type === 'multisig') {
hashes.push([address.getScriptHash('hex'), address]); path = Path.fromKeyRing(address);
items.push([address.getScriptAddress(), path]);
}
if (address.witness) if (address.witness) {
hashes.push([address.getProgramHash('hex'), address]); path = Path.fromKeyRing(address);
items.push([address.getProgramAddress(), path]);
}
} }
utils.forEachSerial(hashes, function(hash, next) { utils.forEachSerial(items, function(item, next) {
var address = item[0];
var path = item[1];
var hash = address.getHash('hex');
if (self.tx.filter) if (self.tx.filter)
self.tx.filter.add(hash[0], 'hex'); self.tx.filter.add(hash, 'hex');
self.emit('save address', hash[0], hash[1]); self.emit('save address', address, path);
self.db.fetch('W/' + hash[0], parsePaths, function(err, paths) { self.db.fetch('W/' + hash, parsePaths, function(err, paths) {
if (err) if (err)
return next(err); return next(err);
@ -784,9 +793,9 @@ WalletDB.prototype.saveAddress = function saveAddress(id, addresses, callback) {
if (paths[id]) if (paths[id])
return next(); return next();
paths[id] = Path.fromKeyRing(id, hash[1]); paths[id] = path;
batch.put('W/' + hash[0], serializePaths(paths)); batch.put('W/' + hash, serializePaths(paths));
next(); next();
}); });
@ -1294,8 +1303,8 @@ Path.prototype.toRaw = function toRaw(writer) {
* @param {KeyRing} address * @param {KeyRing} address
*/ */
Path.prototype.fromKeyRing = function fromKeyRing(id, address) { Path.prototype.fromKeyRing = function fromKeyRing(address) {
this.id = id; this.id = address.id;
this.name = address.name; this.name = address.name;
this.account = address.account; this.account = address.account;
this.change = address.change; this.change = address.change;
@ -1310,8 +1319,8 @@ Path.prototype.fromKeyRing = function fromKeyRing(id, address) {
* @returns {Path} * @returns {Path}
*/ */
Path.fromKeyRing = function fromKeyRing(id, address) { Path.fromKeyRing = function fromKeyRing(address) {
return new Path().fromKeyRing(id, address); return new Path().fromKeyRing(address);
}; };
/** /**