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

improve address.ownInput.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-02-02 18:03:17 -08:00
parent 13d14b0130
commit f6fe37be6b
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/bcoin/address.js
View File

@ -387,14 +387,15 @@ Address.prototype.ownInput = function ownInput(tx, index) {
var inputs;
inputs = tx.inputs.filter(function(input, i) {
var s;
if (!input.prevout.tx && this.tx._all[input.prevout.hash])
input.prevout.tx = this.tx._all[input.prevout.hash];
if (index != null && index !== i)
return false;
if (input.prevout.tx)
return !!this.ownOutput(input.prevout.tx, input.prevout.index);
// if (bcoin.script.isPubkeyInput(input.script, key, tx, i))
// return true;
@ -409,25 +410,6 @@ Address.prototype.ownInput = function ownInput(tx, index) {
return true;
}
if (!input.prevout.tx)
return false;
s = input.prevout.tx.getSubscript(input.prevout.index);
if (bcoin.script.isPubkey(s, key))
return true;
if (bcoin.script.isPubkeyhash(s, hash))
return true;
if (bcoin.script.isMultisig(s, keys))
return true;
if (scriptHash) {
if (bcoin.script.isScripthash(s, scriptHash))
return true;
}
return false;
}, this);

2
lib/bcoin/wallet.js
View File

@ -429,7 +429,7 @@ Wallet.prototype.createTX = function createTX(outputs, fee) {
Wallet.prototype.scriptInputs = function scriptInputs(tx) {
this.fillPrevout(tx);
return this.addresses.reduce(function(total, address) {
return total + address.signInputs(tx);
return total + address.scriptInputs(tx);
}, 0);
};