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

comments

Browse Source
This commit is contained in:
Christopher Jeffrey 2015-12-04 23:16:02 -08:00
parent 87eea1e398
commit c8e04d8552
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/bcoin/wallet.js
View File

@ -290,6 +290,7 @@ Wallet.prototype.sign = function sign(tx, type, inputs, off) {
var signature = bcoin.ecdsa.sign(hash, this.key).toDER(); var signature = bcoin.ecdsa.sign(hash, this.key).toDER();
signature = signature.concat(bcoin.protocol.constants.hashType[type]); signature = signature.concat(bcoin.protocol.constants.hashType[type]);
// P2PKH and simple tx
if (bcoin.script.isPubkeyhash(s) || bcoin.script.isSimplePubkeyhash(s)) { if (bcoin.script.isPubkeyhash(s) || bcoin.script.isSimplePubkeyhash(s)) {
input.script = [ signature, pub ]; input.script = [ signature, pub ];
return true; return true;
@ -299,7 +300,6 @@ Wallet.prototype.sign = function sign(tx, type, inputs, off) {
// empty array == OP_FALSE == OP_0 // empty array == OP_FALSE == OP_0
// raw format: OP_FALSE [sig-1] [sig-2] ... // raw format: OP_FALSE [sig-1] [sig-2] ...
// p2sh format: OP_FALSE [sig-1] [sig-2] ... [redeem-script] // p2sh format: OP_FALSE [sig-1] [sig-2] ... [redeem-script]
if (bcoin.script.isMultisig(s) || bcoin.script.isScripthash(s)) { if (bcoin.script.isMultisig(s) || bcoin.script.isScripthash(s)) {
// XXX Check own? // XXX Check own?
// || (bcoin.script.isScripthash(s) && utils.isEqual(s[1], this.getP2SHHash())) { // || (bcoin.script.isScripthash(s) && utils.isEqual(s[1], this.getP2SHHash())) {
@ -310,6 +310,7 @@ Wallet.prototype.sign = function sign(tx, type, inputs, off) {
} }
} }
// P2SH requires a redeem script after signatures
if (bcoin.script.isScripthash(s)) { if (bcoin.script.isScripthash(s)) {
if (input.script.length - 1 === this.n) { if (input.script.length - 1 === this.n) {
input.script.push(this.getP2SHRedemption()); input.script.push(this.getP2SHRedemption());
@ -325,7 +326,8 @@ Wallet.prototype.sign = function sign(tx, type, inputs, off) {
Wallet.prototype.signEmpty = function sign(tx, type, inputs, off) { Wallet.prototype.signEmpty = function sign(tx, type, inputs, off) {
if (!type) if (!type)
type = 'all'; type = 'all';
assert.equal(type, 'all');
// assert.equal(type, 'all');
if (!off) if (!off)
off = 0; off = 0;