Make HD wallet compatible with wallets generated on https://bip32.org and bitcoin-cli.

index.html

@@ -597,7 +597,7 @@
 						<h2>Transaction <small>Create a new transaction</small></h2>
 						<p>Use this page to create a raw transaction</p>
 
-						<b>Address, WIF key or Redeem Script</b>:
+						<b>Address, WIF key, Redeem Script or Transaction ID</b>:
 						<div class="input-group">
 							<span class="input-group-btn">
 								<button class="btn btn-info qrcodeScanner" type="button" data-toggle="modal" data-target="#modalQrcodeScanner" forward-result="#redeemFrom"><span class="glyphicon glyphicon-camera"></span></button>
@@ -1193,14 +1193,14 @@
 							<div class="row">
 								<div class="col-md-8">
 									<b>Path</b><br>
-									<select class="form-control" id="hdpathtype"">
+									<select class="form-control" id="hdpathtype">
 										<option value="simple">Simple: m/i</option>
 										<option value="custom">Custom</option>
 									</select>
 
 									<div id="hdpath" class="hidden" style="margin-top:4px">
 										<span class="input-group">
-											<input type="text" class="form-control" value="m/0/1">  <br>
+											<input type="text" class="form-control" value="m/0/1" title="WARNING: see #settings page when using hardened paths!">  <br>
 											<span class="input-group-addon"> / </span>
 										</span>
 									</div>
@@ -1456,6 +1456,19 @@
 							</div>
 						</div>
 
+						<hr>
+
+						<div class="row">
+							<div class="col-md-12">
+								<b>HD wallet hardened path derivation</b>: <br>
+								<p class="text-muted">The path derivation for hardened paths was calculated wrong in earlier versions of coinb.in. Please select the old path derivation to recover HD wallet keys generated with older version of coinb.in.</p>
+								<select class="form-control" id="coinjs_derivation">
+									<option value="bip32_derivation">BIP32 compliant derivation</option>
+									<option value="coinbin_broken">Old (broken) coinb.in path derivation</option>
+								</select>
+							</div>
+						</div>
+
 						<br>
 
 						<div id="statusSettings" class="hidden alert">

js/coin.js

@@ -18,6 +18,8 @@
 
 	coinjs.compressed = false;
 
+	coinjs.hd_derivation = "bip32_derivation";
+
 	/* other vars */
 	coinjs.developer = '33tht1bKDgZVxb39MnZsWa8oxHXHvUYE4G'; //bitcoin
 
@@ -685,7 +687,11 @@
 		r.derive = function(i){
 
 			i = (i)?i:0;
-			var blob = (Crypto.util.hexToBytes(this.keys.pubkey)).concat(coinjs.numToBytes(i,4).reverse());
+			if ((i >= 0x80000000) && (coinjs.hd_derivation == "bip32_derivation")) {
+				var blob = (Crypto.util.hexToBytes("00").concat(Crypto.util.hexToBytes(this.keys.privkey)).concat(coinjs.numToBytes(i,4).reverse()));
+			} else {
+				var blob = (Crypto.util.hexToBytes(this.keys.pubkey)).concat(coinjs.numToBytes(i,4).reverse());
+			}
 
 			var j = new jsSHA(Crypto.util.bytesToHex(blob), 'HEX');
  			var hash = j.getHMAC(Crypto.util.bytesToHex(r.chain_code), "HEX", "SHA-512", "HEX");
@@ -1092,32 +1098,37 @@
 
 				var unspent = xmlDoc.getElementsByTagName("unspent")[0];
 
-				for(i=1;i<=unspent.childElementCount;i++){
-					var u = xmlDoc.getElementsByTagName("unspent_"+i)[0]
-					var txhash = (u.getElementsByTagName("tx_hash")[0].childNodes[0].nodeValue).match(/.{1,2}/g).reverse().join("")+'';
-					var n = u.getElementsByTagName("tx_output_n")[0].childNodes[0].nodeValue;
-					var scr = script || u.getElementsByTagName("script")[0].childNodes[0].nodeValue;
+				if(unspent){ 
+					for(i=1;i<=unspent.childElementCount;i++){
+						var u = xmlDoc.getElementsByTagName("unspent_"+i)[0]
+						var txhash = (u.getElementsByTagName("tx_hash")[0].childNodes[0].nodeValue).match(/.{1,2}/g).reverse().join("")+'';
+						var n = u.getElementsByTagName("tx_output_n")[0].childNodes[0].nodeValue;
+						var scr = script || u.getElementsByTagName("script")[0].childNodes[0].nodeValue;
 
-					if(segwit){
-						/* this is a small hack to include the value with the redeemscript to make the signing procedure smoother. 
-						It is not standard and removed during the signing procedure. */
+						if(segwit){
+							/* this is a small hack to include the value with the redeemscript to make the signing procedure smoother. 
+							It is not standard and removed during the signing procedure. */
 
-						s = coinjs.script();
-						s.writeBytes(Crypto.util.hexToBytes(script));
-						s.writeOp(0);
-						s.writeBytes(coinjs.numToBytes(u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1, 8));
-						scr = Crypto.util.bytesToHex(s.buffer);
+							s = coinjs.script();
+							s.writeBytes(Crypto.util.hexToBytes(script));
+							s.writeOp(0);
+							s.writeBytes(coinjs.numToBytes(u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1, 8));
+							scr = Crypto.util.bytesToHex(s.buffer);
+						}
+
+						var seq = sequence || false;
+						self.addinput(txhash, n, scr, seq);
+						value += u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1;
+						total++;
 					}
-
-					var seq = sequence || false;
-					self.addinput(txhash, n, scr, seq);
-					value += u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1;
-					total++;
 				}
 
-				x.unspent = $(xmlDoc).find("unspent");
+				x.result = xmlDoc.getElementsByTagName("result")[0].childNodes[0].nodeValue;
+				x.unspent = unspent;
 				x.value = value;
 				x.total = total;
+				x.response = xmlDoc.getElementsByTagName("response")[0].childNodes[0].nodeValue;
+
 				return callback(x);
 			});
 		}

js/coinbin.js

@@ -1076,9 +1076,7 @@ $(document).ready(function() {
 					var n = $(o).find("output_no").text();
 					var amount = (($(o).find("value").text()*1)).toFixed(8);
 
-					var script = coinjs.script();
-					var s = script.spendToScript($(o).find("address").text());
-					var scr = Crypto.util.bytesToHex(s.buffer);
+					var scr = $(o).find("script").text();
 
 					addOutput(tx, n, scr, amount);
 
@@ -1703,15 +1701,23 @@ $(document).ready(function() {
 
 	function deriveHDaddress() {
 		var hd = coinjs.hd($("#verifyHDaddress .hdKey").html());
-		var index_start = $("#verifyHDaddress .derivation_index_start").val()*1;
-		var index_end = $("#verifyHDaddress .derivation_index_end").val()*1;
+		var index_start = $("#verifyHDaddress .derivation_index_start").val();
+		if ((index_start.length > 1) && (index_start[index_start.length - 1] == '\'')) {
+			var use_private_index = '\'';
+			index_start = index_start.replace(/[']/, "") * 1;
+		} else {
+			var use_private_index = '';
+			index_start = index_start.replace(/[']/, "") * 1;
+		}
+		var index_end = $("#verifyHDaddress .derivation_index_end").val().replace(/[']/, "") * 1;
+		$("#verifyHDaddress .derivation_index_end").val(index_end + use_private_index);
 		var html = '';
 		$("#verifyHDaddress .derived_data table tbody").html("");
 		for(var i=index_start;i<=index_end;i++){
 			if($("#hdpathtype option:selected").val()=='simple'){
 				var derived = hd.derive(i);
 			} else {
-				var derived = hd.derive_path(($("#hdpath input").val().replace(/\/+$/, ""))+'/'+i);
+				var derived = hd.derive_path(($("#hdpath input").val().replace(/\/+$/, ""))+'/'+i+use_private_index);
 			}
 			html += '<tr>';
 			html += '<td>'+i+'</td>';
@@ -1916,6 +1922,8 @@ $(document).ready(function() {
 			coinjs.hdkey.pub =  $("#coinjs_hdpub").val()*1;
 			coinjs.hdkey.prv =  $("#coinjs_hdprv").val()*1;
 
+			coinjs.hd_derivation =  $("#coinjs_derivation").val();
+
 			configureBroadcast();
 			configureGetUnspentTx();
 
@@ -1961,6 +1969,7 @@ $(document).ready(function() {
 		$("#coinjs_multisig").val(o[2]);
 		$("#coinjs_hdpub").val(o[3]);
 		$("#coinjs_hdprv").val(o[4]);
+		$("#coinjs_derivation").val(o[7]);
 
 		// hide/show custom screen
 		if($("option:selected",this).val()=="custom"){

sha1sum

@@ -1,9 +1,9 @@
----- Version 1.6 2020.07.06 ----
+---- Version 1.6 2020.10.02 ----
 77e4519962e2f6a9fc93342137dbb31c33b76b04  ./js/aes.js
 3a09a8fc0cfe828b57fc798d668234d0490ee1a6  ./js/bootstrap-datetimepicker.min.js
 253711c6d825de55a8360552573be950da180614  ./js/bootstrap.min.js
-7dd75e07389808d57261bca630a5bab55ce9faef  ./js/coinbin.js
-228cdcf29d33a5eadd360e85a6220e4853ee4590  ./js/coin.js
+cb5717166bf1c99abbd75a06013067c4a5897d5a  ./js/coinbin.js
+911fb7bdba24269029f27659e4040cd991b2307c  ./js/coin.js
 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5  ./js/collapse.js
 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f  ./js/crypto-min.js
 f7c09f2f5a721371e7d478050119f7e2d58e3ef9  ./js/crypto-sha256-hmac.js
@@ -31,5 +31,5 @@ de51a8494180a6db074af2dee2383f0a363c5b08  ./fonts/glyphicons-halflings-regular.s
 278e49a86e634da6f2a02f3b47dd9d2a8f26210f  ./fonts/glyphicons-halflings-regular.woff
 44bc1850f570972267b169ae18f1cb06b611ffa2  ./fonts/glyphicons-halflings-regular.ttf
 ee481606d8d48f402d152fa632ba9e5f9da7f169  ./README.md
-5054e03cff2cfcd1ce5296fe2659ca2d46d64fe4  ./index.html
+a706e95f6436ee4a31dc26b17a9ac8ab1f0d3750  ./index.html
 7130b64e3ef4cf6f2f1550e902f081c58dc053de  ./test.html