anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

rewrite from scratch tests for TxProposalSet

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-07-31 23:32:24 -03:00
commit 42c73f9a01
6 changed files with 92 additions and 722 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/models/core/TxProposal.js
View file

@ -96,6 +96,7 @@ TxProposal._verifySignatures = function(inKeys, scriptSig, txSigHash) {
if (scriptSig.chunks[0] !== 0)
throw new Error('Invalid scriptSig');
var keys = TxProposal._formatKeys(inKeys);
var ret = [];
for (var i = 1; i <= scriptSig.countSignatures(); i++) {
@ -116,13 +117,14 @@ TxProposal._infoFromRedeemScript = function(s) {
var redeemScript = new Script(s.chunks[s.chunks.length - 1]);
if (!redeemScript)
throw new Error('Bad scriptSig');
var pubkeys = redeemScript.capture();
if (!pubkeys || !pubkeys.length)
throw new Error('Bad scriptSig');
return {
keys: pubkeys,
scriptBuf: redeemScript.getBuffer()
script: redeemScript,
};
};
@ -134,7 +136,7 @@ TxProposal.prototype._updateSignedBy = function() {
var scriptSig = new Script(tx.ins[i].s);
var signatureCount = scriptSig.countSignatures();
var info = TxProposal._infoFromRedeemScript(scriptSig);
var txSigHash = tx.hashForSignature(info.scriptBuf, i, Transaction.SIGHASH_ALL);
var txSigHash = tx.hashForSignature(info.script, parseInt(i), Transaction.SIGHASH_ALL);
var signatureIndexes = TxProposal._verifySignatures(info.keys, scriptSig, txSigHash);
if (signatureIndexes.length !== signatureCount)
throw new Error('Invalid signature');
@ -154,8 +156,8 @@ TxProposal.prototype._check = function() {
if (!tx.ins.length)
throw new Error('Invalid tx proposal: no ins');
var scriptSigs = this.builder.vanilla.scriptSigs;
if (!scriptSigs || !scriptSigs.length) {
var scriptSig = this.builder.vanilla.scriptSig;
if (!scriptSig || !scriptSig.length) {
throw new Error('Invalid tx proposal: no signatures');
}