add test for bare multisig

lib/transaction/transaction.js

@@ -20,6 +20,7 @@ var Input = require('./input');
 var PublicKeyHashInput = Input.PublicKeyHash;
 var PublicKeyInput = Input.PublicKey;
 var MultiSigScriptHashInput = Input.MultiSigScriptHash;
+var MultiSigInput = Input.MultiSig;
 var Output = require('./output');
 var Script = require('../script');
 var PrivateKey = require('../privatekey');
@@ -577,8 +578,16 @@ Transaction.prototype._fromNonP2SH = function(utxo) {
 Transaction.prototype._fromMultisigUtxo = function(utxo, pubkeys, threshold) {
   $.checkArgument(threshold <= pubkeys.length,
     'Number of required signatures must be greater than the number of public keys');
+  var clazz;
   utxo = new UnspentOutput(utxo);
-  this.addInput(new MultiSigScriptHashInput({
+  if (utxo.script.isMultisigOut()) {
+    clazz = MultiSigInput;
+  } else if (utxo.script.isScriptHashOut()) {
+    clazz = MultiSigScriptHashInput;
+  } else {
+    throw new Error("@TODO");
+  }
+  this.addInput(new clazz({
     output: new Output({
       script: utxo.script,
       satoshis: utxo.satoshis

test/transaction/input/multisig.js

@@ -0,0 +1,113 @@
+'use strict';
+/* jshint unused: false */
+
+var should = require('chai').should();
+var expect = require('chai').expect;
+var _ = require('lodash');
+
+var bitcore = require('../../..');
+var Transaction = bitcore.Transaction;
+var PrivateKey = bitcore.PrivateKey;
+var Address = bitcore.Address;
+var Script = bitcore.Script;
+var Signature = bitcore.crypto.Signature;
+var MultiSigInput = bitcore.Transaction.Input.MultiSig;
+
+describe('MultiSigInput', function() {
+
+  var privateKey1 = new PrivateKey('KwF9LjRraetZuEjR8VqEq539z137LW5anYDUnVK11vM3mNMHTWb4');
+  var privateKey2 = new PrivateKey('L4PqnaPTCkYhAqH3YQmefjxQP6zRcF4EJbdGqR8v6adtG9XSsadY');
+  var privateKey3 = new PrivateKey('L4CTX79zFeksZTyyoFuPQAySfmP7fL3R41gWKTuepuN7hxuNuJwV');
+  var public1 = privateKey1.publicKey;
+  var public2 = privateKey2.publicKey;
+  var public3 = privateKey3.publicKey;
+  var address = new Address('33zbk2aSZYdNbRsMPPt6jgy6Kq1kQreqeb');
+
+  var output = {
+    txId: '66e64ef8a3b384164b78453fa8c8194de9a473ba14f89485a0e433699daec140',
+    outputIndex: 0,
+    script: new Script("5221025c95ec627038e85b5688a9b3d84d28c5ebe66e8c8d697d498e20fe96e3b1ab1d2102cdddfc974d41a62f1f80081deee70592feb7d6e6cf6739d6592edbe7946720e72103c95924e02c240b5545089c69c6432447412b58be43fd671918bd184a5009834353ae"),
+    satoshis: 1000000
+  };
+  it('can count missing signatures', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000);
+    var input = transaction.inputs[0];
+
+    input.countSignatures().should.equal(0);
+
+    transaction.sign(privateKey1);
+    input.countSignatures().should.equal(1);
+    input.countMissingSignatures().should.equal(1);
+    input.isFullySigned().should.equal(false);
+
+    transaction.sign(privateKey2);
+    input.countSignatures().should.equal(2);
+    input.countMissingSignatures().should.equal(0);
+    input.isFullySigned().should.equal(true);
+  });
+  it('returns a list of public keys with missing signatures', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000);
+    var input = transaction.inputs[0];
+
+    _.all(input.publicKeysWithoutSignature(), function(publicKeyMissing) {
+      var serialized = publicKeyMissing.toString();
+      return serialized === public1.toString() ||
+              serialized === public2.toString() ||
+              serialized === public3.toString();
+    }).should.equal(true);
+    transaction.sign(privateKey1);
+    _.all(input.publicKeysWithoutSignature(), function(publicKeyMissing) {
+      var serialized = publicKeyMissing.toString();
+      return serialized === public2.toString() ||
+              serialized === public3.toString();
+    }).should.equal(true);
+  });
+  it('can clear all signatures', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000)
+      .sign(privateKey1)
+      .sign(privateKey2);
+
+    var input = transaction.inputs[0];
+    input.isFullySigned().should.equal(true);
+    input.clearSignatures();
+    input.isFullySigned().should.equal(false);
+  });
+  it('can estimate how heavy is the output going to be', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000);
+    var input = transaction.inputs[0];
+    input._estimateSize().should.equal(257);
+  });
+  it('uses SIGHASH_ALL by default', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000);
+    var input = transaction.inputs[0];
+    var sigs = input.getSignatures(transaction, privateKey1, 0);
+    sigs[0].sigtype.should.equal(Signature.SIGHASH_ALL);
+  });
+  it('roundtrips to/from object', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000)
+      .sign(privateKey1);
+    var input = transaction.inputs[0];
+    var roundtrip = new MultiSigInput(input.toObject());
+    roundtrip.toObject().should.deep.equal(input.toObject());
+  });
+  it('roundtrips to/from object when not signed', function() {
+    var transaction = new Transaction()
+      .from(output, [public1, public2, public3], 2)
+      .to(address, 1000000);
+    var input = transaction.inputs[0];
+    var roundtrip = new MultiSigInput(input.toObject());
+    roundtrip.toObject().should.deep.equal(input.toObject());
+  });
+});