In verify for HD wallets add field to choose the address format.

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>
@@ -1191,7 +1191,7 @@
 							<p>The path of key derivation</p>
 
 							<div class="row">
-								<div class="col-md-8">
+								<div class="col-md-6">
 									<b>Path</b><br>
 									<select class="form-control" id="hdpathtype"">
 										<option value="simple">Simple: m/i</option>
@@ -1216,6 +1216,15 @@
 									<input type="text" class="form-control derivation_index_end" value="1">
 								</div>
 
+								<div class="col-md-2">
+									<b>Address format</b><br>
+									<select class="form-control derivation_addr_format">
+										<option value="bech32">Bech32</option>
+										<option value="segwit">SegWit</option>
+										<option value="legacy">Legacy</option>
+									</select>
+								</div>
+
 							</div>
 
 							<hr>
@@ -1226,7 +1235,7 @@
 							<div class="derived_data">
 								<table class="table table-striped table-hover">
 									<thead>
-										<tr><td><b>Index</b></td><td><b>Address</b><td><b>Private Key (WIF)</b></td></td><td><b>Extended xPub</b></td><td><b>Extended xPrv</b></td></tr>
+										<tr><td><b>Index</b></td><td><b>Address</b></td><td><b>Redeem script</b></td><td><b>Private Key (WIF)</b></td><td><b>Extended xPub</b></td><td><b>Extended xPrv</b></td></tr>
 									</thead>
 									<tbody>
 									</tbody>

js/coin.js

@@ -618,10 +618,20 @@
 					var privkey = (r.key_bytes).slice(1, 33);
 					var privkeyHex = Crypto.util.bytesToHex(privkey);
 					var pubkey = coinjs.newPubkey(privkeyHex);
+					var addr_format = $("#verifyHDaddress .derivation_addr_format").val();
+					if (addr_format == "bech32") {
+						var address = coinjs.bech32Address(pubkey);
+					} else if (addr_format == "segwit") {
+						var address = coinjs.segwitAddress(pubkey);
+					} else {
+						var address = {'address': coinjs.pubkey2address(pubkey),
+							'redeemscript': ''};
+					}
 
 					r.keys = {'privkey':privkeyHex,
 						'pubkey':pubkey,
-						'address':coinjs.pubkey2address(pubkey),
+						'address':address.address,
+						'script':address.redeemscript,
 						'wif':coinjs.privkey2wif(privkeyHex)};
 
 				} else if(r.key_bytes[0] == 0x02 || r.key_bytes[0] == 0x03) {
@@ -696,23 +706,34 @@
 			var ecparams = EllipticCurve.getSECCurveByName("secp256k1");
 			var curve = ecparams.getCurve();
 
-			var k, key, pubkey, o;
+			var k, key, pubkey, o, addr_format, address_fun, address;
 
 			o = coinjs.clone(this);
 			o.chain_code = ir;
 			o.child_index = i;
 
+			addr_format = $("#verifyHDaddress .derivation_addr_format").val();
+			if (addr_format == "bech32") {
+				address_fun = function(pk) { return coinjs.bech32Address(pk); };
+			} else if (addr_format == "segwit") {
+				address_fun = function(pk) { return coinjs.segwitAddress(pk); };
+			} else {
+				address_fun = function(pk) {
+					return {'address': coinjs.pubkey2address(pk), 'redeemscript': ''};
+				};
+			}
 			if(this.type=='private'){
 				// derive key pair from from a xprv key
 				k = il.add(new BigInteger([0].concat(Crypto.util.hexToBytes(this.keys.privkey)))).mod(ecparams.getN());
 				key = Crypto.util.bytesToHex(k.toByteArrayUnsigned());
 
 				pubkey = coinjs.newPubkey(key);
-
+				address = address_fun(pubkey);
 				o.keys = {'privkey':key,
 					'pubkey':pubkey,
 					'wif':coinjs.privkey2wif(key),
-					'address':coinjs.pubkey2address(pubkey)};
+					'address':address.address,
+					'script':address.redeemscript};
 
 			} else if (this.type=='public'){
 				// derive xpub key from an xpub key
@@ -729,9 +750,11 @@
 					publicKeyBytesCompressed.unshift(0x03)
 				}
 				pubkey = Crypto.util.bytesToHex(publicKeyBytesCompressed);
+				address = address_fun(pubkey);
 
 				o.keys = {'pubkey':pubkey,
-					'address':coinjs.pubkey2address(pubkey)}
+					'address':address.address,
+					'script':address.redeemscript}
 			} else {
 				// fail
 			}
@@ -1092,32 +1115,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);
 
@@ -1716,6 +1714,7 @@ $(document).ready(function() {
 			html += '<tr>';
 			html += '<td>'+i+'</td>';
 			html += '<td><input type="text" class="form-control" value="'+derived.keys.address+'" readonly></td>';
+			html += '<td><input type="text" class="form-control" value="'+derived.keys.script+'" readonly></td>';
 			html += '<td><input type="text" class="form-control" value="'+((derived.keys.wif)?derived.keys.wif:'')+'" readonly></td>';
 			html += '<td><input type="text" class="form-control" value="'+derived.keys_extended.pubkey+'" readonly></td>';
 			html += '<td><input type="text" class="form-control" value="'+((derived.keys_extended.privkey)?derived.keys_extended.privkey:'')+'" readonly></td>';

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