From 300791f541296e57d062ef00697b07418d34bcd1 Mon Sep 17 00:00:00 2001
From: "Denilson M. Amorim" <dma_2012@hotmail.com>
Date: Thu, 12 Nov 2015 16:23:51 -0300
Subject: [PATCH] Mandatory Multisig

---
 index.html    | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-
 js/coin.js    |  94 +++++++++++++++++++++++++++++++++++--------
 js/coinbin.js | 100 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 283 insertions(+), 20 deletions(-)

diff --git a/index.html b/index.html
index d415f8f9..3272da38 100644
--- a/index.html
+++ b/index.html
@@ -54,6 +54,7 @@
 								<ul class="dropdown-menu">
 									<li><a href="#newAddress" data-toggle="tab">New Address</a></li>
 									<li><a href="#newMultiSig" data-toggle="tab">MultiSig Address</a></li>
+                                    <li><a href="#newMandatoryMultiSig" data-toggle="tab">Mandatory MultiSig Address</a></li>
 									<li><a href="#newHDaddress" data-toggle="tab">HD Address</a></li>
 									<li class="divider"></li>
 									<li><a href="#newTransaction" data-toggle="tab">Transaction</a></li>
@@ -377,6 +378,105 @@ <h2>New Multisig Address <small>Secure multisig address</small></h2>
 						<br>
 					</div>
 
+                    <div class="tab-pane tab-content" id="newMandatoryMultiSig">
+                        <h2>New Mandatory Multisig Address <small>Secure multisig address with some mandatory keys</small></h2>
+
+                        <!-- Not sure how to explain this P2SH
+                        <div class="row">
+
+                            <div class="col-md-11">
+                                <p>Public keys can be <a href="#newAddress">generated in your browser</a> or from your bitcoin client</a>.</p>
+                                <p>Enter the public keys of all the participants, to create a <a href="https://en.bitcoin.it/wiki/Address#Multi-signature_addresses" target="_blank">multi signature address</a>. Maximum of 15 allowed. Compressed and uncompressed public keys are accepted.</p>
+                            </div>
+
+                            <div class="col-md-1">
+                            </div>
+                        </div>
+                        -->
+
+                        <div class="row">
+                            <div class="col-md-11">
+                                <p>Please select the public keys <strong>absolutely necessary</strong> to release the coins. Without the signature of all of the following keys, the coins cannot be released</p>
+                            </div>
+                        </div>
+
+                        <div id="m_multisigMandatoryPubKeys" class="row">
+                            <div class="form-horizontal">
+                                <div class="col-xs-11">
+                                    <input type="text" class="form-control pubkey">
+                                </div>
+                                <a href="javascript:;" class="pubkeyAdd"><span class="glyphicon glyphicon-plus"></span></a>
+                                <br><br>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-11">
+                                <p>Please select the public keys for the multisignature.</p>
+                            </div>
+                        </div>
+
+                        <div id="m_multisigPubKeys" class="row">
+                            <div class="form-horizontal">
+                                <div class="col-xs-11">
+                                    <input type="text" class="form-control pubkey">
+                                </div>
+                                <a href="javascript:;" class="pubkeyAdd"><span class="glyphicon glyphicon-plus"></span></a>
+                                <br><br>
+                            </div>
+                        </div>
+
+                        <p>Enter the amount of signatures required to release the coins</p>
+                        <div class="row">
+                            <div class="col-xs-3">
+                                <select id="m_releaseCoins" class="form-control">
+                                    <option>1</option>
+                                    <option selected>2</option>
+                                    <option>3</option>
+                                    <option>4</option>
+                                    <option>5</option>
+                                    <option>6</option>
+                                    <option>7</option>
+                                    <option>8</option>
+                                    <option>9</option>
+                                    <option>10</option>
+                                    <option>11</option>
+                                    <option>12</option>
+                                    <option>13</option>
+                                    <option>14</option>
+                                    <option>15</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <br>
+
+                        <div id="m_multiSigErrorMsg" class="alert alert-danger" style="display:none;"></div>
+
+                        <div class="alert alert-success hidden" id="m_multiSigData">
+                            <label>Address</label>
+                            <p>Payment should be made to this address:</p>
+                            <div class="row">
+                                <div class="col-lg-6">
+                                    <div class="input-group">
+                                        <input type="text" class="form-control address" value="" readonly>
+                                        <span class="input-group-btn">
+                                            <button class="qrcodeBtn btn btn-default" type="button" data-toggle="modal" data-target="#modalQrcode"><span class="glyphicon glyphicon-qrcode"></span></button>
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <label>Redeem Script</label>
+                            <p>This script should be <i>saved and should be shared with all the participants before a payment is made</i>, so they may validate the authenticity of the address, it will also be used later to release the bitcoins.</p>
+                            <textarea class="form-control script" style="height:160px" readonly></textarea>
+                            <label>Shareable URL</label>
+                            <input type="text" class="scriptUrl form-control" disabled>
+                        </div>
+
+                        <input type="button" class="btn btn-primary" value="Submit" id="newMandatoryMultiSigAddress">
+                        <br>
+                    </div>
+
 					<div class="tab-pane tab-content" id="newHDaddress">
 						<h2>New HD Address <small>making bip32 even easier</small></h2>
 						<p>Use the form below to generate a <i>master</i> hierarchical deterministic address.</p>
@@ -599,10 +699,17 @@ <h4>Redeem Script</h4>
 							<label>Required Signatures</label>
 							<p class="signaturesRequired">?</p>
 							<label>Signatures Required from</label>
-							<table class="table table-striped table-hover">
+							<table id="verifyRsDataPubKeys" class="table table-striped table-hover">
 								<tbody>
 								</tbody>
 							</table>
+                            <div id="verifyRsDataMandatory" class="hidden">
+                                <label>Mandatory Signatures Required from</label>
+                                <table id="verifyRsDataMandatoryKeys" class="table table-striped table-hover">
+                                    <tbody>
+                                    </tbody>
+                                </table>
+                            </div>
 						</div>
 
 						<div class="hidden verifyData" id="verifyTransactionData">
diff --git a/js/coin.js b/js/coin.js
index 25536d3c..37d51ab9 100644
--- a/js/coin.js
+++ b/js/coin.js
@@ -118,7 +118,17 @@
 
 	/* new multisig address, provide the pubkeys AND required signatures to release the funds */
 	coinjs.pubkeys2MultisigAddress = function(pubkeys, required) {
+		return coinjs.pubkeysAndMandatory2MultisigAddress([], pubkeys, required);
+	}
+
+	/* new multisig address with some mandatory signment, provide the mandatory pubkeys, the multisig pubkeys
+	   AND required signatures (of the multisig pubkeys) to release the funds */
+	coinjs.pubkeysAndMandatory2MultisigAddress = function(mandatorykeys, pubkeys, required) {
 		var s = coinjs.script();
+		for(var i = 0; i < mandatorykeys.length; ++i) {
+			s.writeBytes(Crypto.util.hexToBytes(mandatorykeys[i]));
+			s.writeOp(173); // OP_CHECKSIGVERIFY
+		}
 		s.writeOp(81 + (required*1) - 1); //OP_1
 		for (var i = 0; i < pubkeys.length; ++i) {
 			s.writeBytes(Crypto.util.hexToBytes(pubkeys[i]));
@@ -195,7 +205,7 @@
 				if(o.version==coinjs.pub){ // standard address
 					o.type = 'standard';
 
-				} else if (o.version==coinjs.multisig) { // multisig address
+				} else if (o.version==coinjs.multisig) { // multisig address or mandatory multisig
 					o.type = 'multisig';
 
 				} else if (o.version==coinjs.priv){ // wifkey
@@ -638,20 +648,50 @@
 		r.decodeRedeemScript = function(script){
 			var r = false;
 			try {
-				var s = coinjs.script(Crypto.util.hexToBytes(script));
-				if((s.chunks.length>=3) && s.chunks[s.chunks.length-1] == 174){//OP_CHECKMULTISIG
+				var info = coinjs.script(Crypto.util.hexToBytes(script)).listMultisigKeys();
+				if(info) {
 					r = {};
-					r.signaturesRequired = s.chunks[0]-80;
+					r.pubkeys = info.pubkeys;
+					r.mandatorykeys = info.mandatorykeys;
+					r.signaturesRequired = info.signaturesRequired;
+					r.address = coinjs.pubkeysAndMandatory2MultisigAddress(r.mandatorykeys, r.pubkeys, r.signaturesRequired).address;
+				}
+			} catch(e) {
+				// console.log(e);
+				r = false;
+			}
+			return r;
+		}
+
+		/* retrieves the mandatory keys and multisig public keys from a multisig script */
+		r.listMultisigKeys = function() {
+			var r = false;
+			var s = this;
+			try {
+				if((s.chunks.length>=3) && s.chunks[s.chunks.length-1] == 174){//OP_CHECKMULTISIG
+					var npubs = s.chunks[s.chunks.length-2] - 80;
+					var nsigs = s.chunks[s.chunks.length-3-npubs] - 80;
+					
 					var pubkeys = [];
-					for(var i=1;i<s.chunks.length-2;i++){
-						pubkeys.push(Crypto.util.bytesToHex(s.chunks[i]));
+					for(var i=1;i<=npubs;i++){
+						var key = s.chunks[(s.chunks.length-3-npubs) + i];
+						pubkeys.push(Crypto.util.bytesToHex(key));
+					}
+
+					var mandatorykeys = [];
+					if(s.chunks.length > (3 + npubs) && s.chunks[1] == 173){// OP_CHECKSIGVERIFY
+						for(var i=0; i < s.chunks.length-3-npubs; i += 2){
+							var key = s.chunks[i];
+							mandatorykeys.push(Crypto.util.bytesToHex(key));
+						}
 					}
+
+					r = {};
 					r.pubkeys = pubkeys;
-					var multi = coinjs.pubkeys2MultisigAddress(pubkeys, r.signaturesRequired);
-					r.address = multi['address'];
+					r.mandatorykeys = mandatorykeys;
+					r.signaturesRequired = nsigs;
 				}
 			} catch(e) {
-				// console.log(e);
 				r = false;
 			}
 			return r;
@@ -904,8 +944,10 @@
 				} else if (this.ins[index].script.chunks[0]==0 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1][this.ins[index].script.chunks[this.ins[index].script.chunks.length-1].length-1]==174) { // OP_CHECKMULTISIG
 					// multisig script, with signature(s) included
 					return {'type':'multisig', 'signed':'true', 'signatures':this.ins[index].script.chunks.length-2, 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[this.ins[index].script.chunks.length-1])};
-				} else if (this.ins[index].script.chunks[0]>=80 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1]==174) { // OP_CHECKMULTISIG
-					// multisig script, without signature!
+				} else if (this.ins[index].script.chunks.length >= 3 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1]==174 // OP_CHECKMULTISIG
+				       &&  ((this.ins[index].script.chunks[1] == 173 && this.ins[index].script.chunks[0] instanceof Array)//OP_CHECKSIGVERIFY
+				          || this.ins[index].script.chunks[0]>=80)) {
+					// multisig script, without signature!					// multisig script, without signature!
 					return {'type':'multisig', 'signed':'false', 'signatures':0, 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer)};
 				} else if (this.ins[index].script.chunks.length==0) {
 					// empty
@@ -1052,12 +1094,21 @@
 		/* sign a multisig input */
 		r.signmultisig = function(index, wif){
 
-			function scriptListPubkey(redeemScript){
-				var r = {};
-				for(var i=1;i<redeemScript.chunks.length-2;i++){
-					r[i] = Crypto.util.hexToBytes(coinjs.pubkeydecompress(Crypto.util.bytesToHex(redeemScript.chunks[i])));
+			function scriptListKeys(redeemScript){
+				var info = redeemScript.listMultisigKeys();
+
+				var pubkeys = {};
+				for(var i=0; i < info.pubkeys.length; i++){
+					pubkeys[i+1] = Crypto.util.hexToBytes(coinjs.pubkeydecompress(info.pubkeys[i]));
 				}
-				return r;
+
+				var mandatorykeys = {};
+				for(var i=0; i < info.mandatorykeys.length; i++){
+					var idx = info.mandatorykeys.length - i; // mandatorykeys must be signed the other way around
+					mandatorykeys[idx] = Crypto.util.hexToBytes(coinjs.pubkeydecompress(info.mandatorykeys[i]));
+				}
+
+				return {'pubkeys': pubkeys, 'mandatorykeys': mandatorykeys};
 			}
 	
 			function scriptListSigs(scriptSig){
@@ -1081,7 +1132,9 @@
 				s.writeBytes(signature);
 
 			}  else if (this.ins[index].script.chunks[0]==0 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1][this.ins[index].script.chunks[this.ins[index].script.chunks.length-1].length-1]==174){
-				var pubkeyList = scriptListPubkey(coinjs.script(redeemScript));
+				var pkeysList = scriptListKeys(coinjs.script(redeemScript));
+				var pubkeyList = pkeysList.pubkeys;
+				var mandatorykeyList = pkeysList.mandatorykeys;
 				var sigsList = scriptListSigs(this.ins[index].script);
 				sigsList[coinjs.countObject(sigsList)+1] = signature;
 
@@ -1093,6 +1146,13 @@
 					}
 				}
 
+				for(x in mandatorykeyList){
+					for(y in sigsList){
+						if(coinjs.verifySignature(sighash, sigsList[y], mandatorykeyList[x])){
+							s.writeBytes(sigsList[y]);
+						}
+					}
+				}
 			}
 
 			s.writeBytes(redeemScript);
diff --git a/js/coinbin.js b/js/coinbin.js
index 376c043d..3b1ee77d 100644
--- a/js/coinbin.js
+++ b/js/coinbin.js
@@ -360,6 +360,87 @@ $(document).ready(function() {
 		}
 	});
 
+	/* new -> mandatory multisig code */
+
+	$("#newMandatoryMultiSigAddress").click(function(){
+
+		$("#m_multiSigData").removeClass('show').addClass('hidden').fadeOut();
+		$("#m_multisigPubKeys .pubkey").parent().removeClass('has-error');
+		$("#m_multisigMandatoryPubKeys .pubkey").parent().removeClass('has-error');
+		$("#m_releaseCoins").parent().removeClass('has-error');
+		$("#m_multiSigErrorMsg").hide();
+
+		if((isNaN($("#m_releaseCoins option:selected").html())) || ((!isNaN($("#m_releaseCoins option:selected").html())) && ($("#m_releaseCoins option:selected").html()>$("#m_multisigPubKeys .pubkey").length || $("#m_releaseCoins option:selected").html()*1<=0 || $("#m_releaseCoins option:selected").html()*1>8))){
+			$("#m_releaseCoins").parent().addClass('has-error');
+			$("#m_multiSigErrorMsg").html('<span class="glyphicon glyphicon-exclamation-sign"></span> Minimum signatures required is greater than the amount of public keys provided').fadeIn();
+			return false;
+		}
+
+		var keys = [];
+		$.each($("#m_multisigPubKeys .pubkey"), function(i,o){
+			if(coinjs.pubkeydecompress($(o).val())){
+				keys.push($(o).val());
+				$(o).parent().removeClass('has-error');
+			} else {
+				$(o).parent().addClass('has-error');
+			}
+		});
+
+		var mandatoryKeys = [];
+		$.each($("#m_multisigMandatoryPubKeys .pubkey"), function(i,o){
+			if(coinjs.pubkeydecompress($(o).val())){
+				mandatoryKeys.push($(o).val());
+				$(o).parent().removeClass('has-error');
+			} else {
+				$(o).parent().addClass('has-error');
+			}
+		});
+
+		if(keys.length + mandatoryKeys.length > 15){
+			$("#m_multiSigErrorMsg").html('<span class="glyphicon glyphicon-exclamation-sign"></span> Too many keys. Sum of all keys must be less or equal to 15.').fadeIn();
+			return false;
+		}
+
+		if($("#m_multisigPubKeys .pubkey").parent().hasClass('has-error')==false
+		&& $("#m_multisigMandatoryPubKeys .pubkey").parent().hasClass('has-error')==false
+		&& $("#m_releaseCoins").parent().hasClass('has-error')==false){
+			var sigsNeeded = $("#m_releaseCoins option:selected").html();
+			var m_multisig =  coinjs.pubkeysAndMandatory2MultisigAddress(mandatoryKeys, keys, sigsNeeded);
+			$("#m_multiSigData .address").val(m_multisig['address']);
+			$("#m_multiSigData .script").val(m_multisig['redeemScript']);
+			$("#m_multiSigData .scriptUrl").val(document.location.origin+''+document.location.pathname+'?verify='+m_multisig['redeemScript']+'#verify');
+			$("#m_multiSigData").removeClass('hidden').addClass('show').fadeIn();
+			$("#m_releaseCoins").removeClass('has-error');
+		} else {
+			$("#m_multiSigErrorMsg").html('<span class="glyphicon glyphicon-exclamation-sign"></span> One or more public key is invalid!').fadeIn();
+		}
+	});
+
+	$("#m_multisigPubKeys .pubkeyAdd").click(function(){
+		if($("#m_multisigPubKeys .pubkeyRemove").length<14){
+			var clone = '<div class="form-horizontal">'+$(this).parent().html()+'</div>';
+			$("#m_multisigPubKeys").append(clone);
+			$("#m_multisigPubKeys .glyphicon-plus:last").removeClass('glyphicon-plus').addClass('glyphicon-minus');
+			$("#m_multisigPubKeys .glyphicon-minus:last").parent().removeClass('pubkeyAdd').addClass('pubkeyRemove');
+			$("#m_multisigPubKeys .pubkeyRemove").unbind("");
+			$("#m_multisigPubKeys .pubkeyRemove").click(function(){
+				$(this).parent().fadeOut().remove();
+			});
+		}
+	});
+
+	$("#m_multisigMandatoryPubKeys .pubkeyAdd").click(function(){
+		var clone = '<div class="form-horizontal">'+$(this).parent().html()+'</div>';
+		$("#m_multisigMandatoryPubKeys").append(clone);
+		$("#m_multisigMandatoryPubKeys .glyphicon-plus:last").removeClass('glyphicon-plus').addClass('glyphicon-minus');
+		$("#m_multisigMandatoryPubKeys .glyphicon-minus:last").parent().removeClass('pubkeyAdd').addClass('pubkeyRemove');
+		$("#m_multisigMandatoryPubKeys .pubkeyRemove").unbind("");
+		$("#m_multisigMandatoryPubKeys .pubkeyRemove").click(function(){
+			$(this).parent().fadeOut().remove();
+		});
+	});
+
+
 	/* new -> Hd address code */
 
 	$(".deriveHDbtn").click(function(){
@@ -947,10 +1028,22 @@ $(document).ready(function() {
 			for(var i=0;i<decode.pubkeys.length;i++){
 				var pubkey = decode.pubkeys[i];
 				var address = coinjs.pubkey2address(pubkey);
-				$('<tr><td width="30%"><input type="text" class="form-control" value="'+address+'" readonly></td><td><input type="text" class="form-control" value="'+pubkey+'" readonly></td></tr>').appendTo("#verifyRsData table tbody");
+				$('<tr><td width="30%"><input type="text" class="form-control" value="'+address+'" readonly></td><td><input type="text" class="form-control" value="'+pubkey+'" readonly></td></tr>').appendTo("#verifyRsDataPubKeys tbody");
+			}
+			for(var i=0;i<decode.mandatorykeys.length;i++){
+				var pubkey = decode.mandatorykeys[i];
+				var address = coinjs.pubkey2address(pubkey);
+				$('<tr><td width="30%"><input type="text" class="form-control" value="'+address+'" readonly></td><td><input type="text" class="form-control" value="'+pubkey+'" readonly></td></tr>').appendTo("#verifyRsDataMandatoryKeys tbody");
 			}
 			$("#verifyRsData").removeClass("hidden");
 			$(".verifyLink").attr('href','?verify='+$("#verifyScript").val());
+
+			if(decode.mandatorykeys.length>0){
+				$("#verifyRsDataMandatory").removeClass("hidden");
+			} else {
+				$("#verifyRsDataMandatory").addClass("hidden");
+			}
+
 			return true;
 		} else {
 			return false;
@@ -984,7 +1077,9 @@ $(document).ready(function() {
 				if(s['type']=='multisig'){
 					var script = coinjs.script();
 					var rs = script.decodeRedeemScript(s.script);
+					if(rs['mandatorykeys'].length > 0) h += rs['mandatorykeys'].length + " and (";
 					h += rs['signaturesRequired']+' of '+rs['pubkeys'].length;
+					if(rs['mandatorykeys'].length > 0) h += ")";
 				} else {
 					h += '<span class="glyphicon glyphicon-remove-circle"></span>';
 				}
@@ -1260,7 +1355,8 @@ $(document).ready(function() {
 	});
 
 	for(i=1;i<3;i++){
-		$(".pubkeyAdd").click();
+		$("#multisigPubKeys .pubkeyAdd").click();
+		$("#m_multisigPubKeys .pubkeyAdd").click();
 	}
 
 	validateOutputAmount();