latest cointoolkit fixes

index.html

@@ -700,9 +700,9 @@ <h2>New Transaction <small>Create a new transaction</small></h2>
 
 								<hr>
 
-								<label>Lock Time</label>
-								<p>The <a href="https://bitcoin.org/en/developer-guide#locktime-and-sequence-number">locktime</a> indicates the earliest time a transaction can be added to the block chain.</p>
-								<input type="text" class="form-control" value="0" id="nLockTime">
+								<label>Transaction Version</label>
+								<p>Desired version of transaction to be created.</p>
+								<input type="text" class="form-control" value="3" id="nVersion">
 
 								<hr>
 
@@ -714,6 +714,12 @@ <h2>New Transaction <small>Create a new transaction</small></h2>
 									<hr>
 								</div>
 
+								<label>Lock Time</label>
+								<p>The <a href="https://bitcoin.org/en/developer-guide#locktime-and-sequence-number">locktime</a> indicates the earliest time a transaction can be added to the block chain.</p>
+								<input type="text" class="form-control" value="0" id="nLockTime">
+
+								<hr>
+
 								<label>Network</label>
 								<p>The <a href="#settings">settings</a> page can be used to select alternative networks of which you can retrieve your unspent outputs and broadcast a signed transaction into.</p>
 
@@ -1440,7 +1446,7 @@ <h2>Settings</h2>
 									<option value="sparklecoin" rel="0x3f;0x7d;0xbf;0x0488b21e;0x0488ade4;true;true;true;true;true;false;6;SPRK;0x6;44'/239'/0'/0/0;;">Sparklecoin</option>
 									<option value="bitcoin" rel="0x00;0x05;0x80;0x0488b21e;0x0488ade4;false;blockr_io;blockr_io;false;false;false;8;BTC;0x0;44'/0'/0'/0/0;bc;">Bitcoin</option>
 									<option value="bitcoin_cash" rel="0x00;0x05;0x80;0x0488b21e;0x0488ade4;false;blockexplorer;blockexplorer;false;false;false;8;BCH;0x0;44'/0'/0'/0/0;;">Bitcoin Cash</option>
-									<option value="peercoin_testnet" rel="0x6f;0xc4;0xef;0x043587cf;0x04358394;false;false;false;true;true;false;6;tPPC;0x1;;tpc;">Peercoin (testnet)</option>
+									<option value="peercoin_testnet" rel="0x6f;0xc4;0xef;0x043587cf;0x04358394;false;false;false;true;true;false;6;tPPC;0x1;44'/1'/0'/0/0;tpc;">Peercoin (testnet)</option>
 									<option value="sparklecoin_testnet" rel="0x7f;0xc4;0xff;0x043587cf;0x04358394;true;true;true;true;true;false;6;tSPRK;0x1;;;">Sparklecoin (testnet)</option>
 									<option value="bitcoin_testnet" rel="0x6f;0xc4;0xef;0x043587cf;0x04358394;false;blockrio_bitcointestnet;false;false;false;false;8;tBTC;0x1;;tb;">Bitcoin (testnet)</option>
 									<option value="custom" rel="0x00;0x05;0x80;0x0488b21e;0x0488ade4;false;false;false;false;false;false;8;CUSTOM;0x0;;;">Custom</option>

js/coin.js

@@ -19,7 +19,7 @@
 	coinjs.priv = 0x80;
 	coinjs.multisig = 0x05;
 	coinjs.hdkey = {'prv':0x0488ade4, 'pub':0x0488b21e};
-	coinjs.bech32 = {'charset':'qpzry9x8gf2tvdw0s3jn54khce6mua7l', 'version':0, 'hrp':'bc'};
+	coinjs.bech32 = {'charset':'qpzry9x8gf2tvdw0s3jn54khce6mua7l', 'version':0, 'hrp':'pc'};
 	coinjs.txExtraTimeField = false;
 	coinjs.txExtraTimeFieldValue = false;
 	coinjs.txExtraUnitField = false;
@@ -1979,7 +1979,7 @@
 			var buffer = [];
 			buffer = buffer.concat(coinjs.numToBytes(parseInt(this.version),4));
 
-			if (coinjs.txExtraTimeField) {
+			if (coinjs.txExtraTimeField && (['tPPC','PPC'].includes(coinjs.symbol) && this.version<3)) {
 				buffer = buffer.concat(coinjs.numToBytes(parseInt(this.nTime),4));
 			}
 
@@ -2064,7 +2064,7 @@
 
 			obj.version = readAsInt(4);
 
-			if (coinjs.txExtraTimeField) {
+			if (coinjs.txExtraTimeField && (['tPPC','PPC'].includes(coinjs.symbol) && obj.version<3)) {
 				obj.nTime = readAsInt(4);
 			}
 

js/cointoolkit.js

@@ -367,6 +367,13 @@ $(document).ready(function() {
 					h += '<td class="col-xs-1">'+(o.value/("1e"+coinjs.decimalPlaces)).toFixed(coinjs.decimalPlaces)+'</td>';
 					h += '<td class="col-xs-2"><input class="form-control" type="text" value="'+Crypto.util.bytesToHex(o.script.buffer)+'" readonly></td>';
 					h += '</tr>';
+				} else if(o.script.chunks.length==0) {
+					h += '<tr>';
+					h += '<td><input type="text" class="form-control" value="coinstake" readonly></td>';
+					h += '<td></td>'; // to account for known address value
+					h += '<td class="col-xs-1">0.0000000</td>';
+					h += '<td class="col-xs-2"><input class="form-control" type="text" value="" readonly></td>';
+					h += '</tr>';
 				} else {
 
 					var addr = '';
@@ -382,6 +389,9 @@ $(document).ready(function() {
 						});
 					} else if((o.script.chunks.length==2) && o.script.chunks[0]==0){
 						addr = coinjs.bech32_encode(coinjs.bech32.hrp, [coinjs.bech32.version].concat(coinjs.bech32_convert(o.script.chunks[1], 8, 5, true)));
+					} else if((o.script.chunks.length==2) && o.script.chunks[1]==172){
+						var pubKey = Crypto.util.bytesToHex(o.script.chunks[0])
+						addr = coinjs.pubkey2address(pubKey, coinjs.pub);
 					} else {
 						var scriptHash = Crypto.util.bytesToHex(o.script.chunks[1]);
 						addr = coinjs.scripthash2address(scriptHash, coinjs.multisig);
@@ -707,11 +717,12 @@ $(document).ready(function() {
 				{verify: false, format: "legacy"}
 				);
 
+			var hasTimestamp = isPeercoin && currenttransaction.version < 3;
 			var publicKey = result.publicKey;
 			var path = coinjs.ledgerPath;
 
 			console.log("path",path,"address",result.bitcoinAddress,"pubkey",result.publicKey);
-			var txn = appBtc.splitTransaction(currenttransaction.serialize(),false,isPeercoin);
+			var txn = appBtc.splitTransaction(currenttransaction.serialize(),false,hasTimestamp,false);
 			var outputsBuffer = Crypto.util.bytesToHex(appBtc.serializeTransactionOutputs(txn));
 
 			var inputs = [];
@@ -729,7 +740,8 @@ $(document).ready(function() {
 			for (var i = 0; i < currenttransaction.ins.length; i++) {
 				var result = providers[$("#coinSelector").val()].getTransaction[toolkit.getTransaction](currenttransaction.ins[i].outpoint.hash,i,async function(result) {
 				// todo replace !isPeercoin with proper segwit support flag from coinjs params
-					inputs.push([result[1],appBtc.splitTransaction(result[0],!isPeercoin,isPeercoin),currenttransaction.ins[result[1]].outpoint.index,script]);
+					hasTimestamp = isPeercoin && ['1','2'].includes(result[0][1])
+					inputs.push([result[1],appBtc.splitTransaction(result[0],false,hasTimestamp,false),currenttransaction.ins[result[1]].outpoint.index,script]);
 					paths.push(path);
 					if (inputs.length == currenttransaction.ins.length) {
 						// we are ready
@@ -748,14 +760,18 @@ $(document).ready(function() {
 						var result=false;
 						if (currenttransaction.ins[0].script.buffer.slice(-1) == coinjs.opcode.OP_CHECKMULTISIG) {
 							// check if public key is part of multisig
-							result = await appBtc.signP2SHTransaction(inputs, paths, outputsBuffer, undefined, hashType, false, undefined, timeStamp);
+							var params = {inputs:inputs, associatedKeysets:paths, outputScriptHex:outputsBuffer, transactionVersion:currenttransaction.version, sigHashType: hashType, segwit:false};
+							if (timeStamp) {
+								params.initialTimestamp = timeStamp;
+								}
+							result = await appBtc.signP2SHTransaction(params);
 
 							var success=false;
 
 							console.log("signature result",result);
 							$.each(result, function(idx,itm) {
-								var signature = Crypto.util.hexToBytes(itm);
-								if (currenttransaction.signmultisig(idx,undefined,signature.slice(-1)[0]*1,signature)) {
+								var signature = Crypto.util.hexToBytes(itm+hashType.toString(16));
+								if (currenttransaction.signmultisig(idx,undefined,hashType*1,signature)) {
 									success=true;
 									}
 								});
@@ -767,7 +783,12 @@ $(document).ready(function() {
 									}
 								}
 						else {
-							result = await appBtc.createPaymentTransactionNew(inputs, paths, undefined, outputsBuffer, undefined, undefined, undefined, timeStamp);
+							var params = {inputs:inputs, associatedKeysets:paths, outputScriptHex:outputsBuffer, transactionVersion:currenttransaction.version, sigHashType: hashType, segwit:false};
+							if (timeStamp) {
+								params.initialTimestamp = timeStamp;
+								}
+
+							result = await appBtc.createPaymentTransactionNew(params);
 							callback(result);
 							}
 						}
@@ -2164,6 +2185,10 @@ $(document).ready(function() {
 			tx.lock_time = $("#nLockTime").val()*1;
 		}
 
+		if(($("#nVersion").val()).match(/^[0-9]+$/g)){
+			tx.version = $("#nVersion").val()*1;
+		}
+
 		if(($("#nTime").val()).match(/^[0-9]+$/g)){
 			tx.nTime = $("#nTime").val()*1;
 		}
@@ -2349,6 +2374,14 @@ $(document).ready(function() {
 		$(this).val($(this).val().replace(/\s/g, ""));
 	});
 
+	$("#signPrivateKey").focusout(function(){
+		$(this).val($(this).val().replace(/\s/g, ""));
+	});
+
+	$("#signTransaction").focusout(function(){
+		$(this).val($(this).val().replace(/\s/g, ""));
+	});
+
 	/* redeem from button code */
 	$("#redeemFromBtn").click(function(){
 		var redeem = redeemingFrom($("#redeemFrom").val());
@@ -2466,6 +2499,9 @@ $(document).ready(function() {
 
 //				var signed = t.sign(wifkey.val());
 				var signed = t.sign(wifkey.val(), $("#sighashType option:selected").val());
+				if (script.val() == signed) {
+					throw("transaction unchanged");
+				}
 				$("#signedData textarea").val(signed);
 				$("#signedData .txSize").html(t.size());
 				$("#signedData").removeClass('hidden').fadeIn();
@@ -2526,7 +2562,7 @@ $(document).ready(function() {
 				});
 
 				$("#signedData .signedToBroadcast").on( "click", function() {
-					$("#broadcast #rawTransaction").val(signed).fadeOut().fadeIn();
+					$("#broadcast #rawTransaction").val($("#signedData textarea").val()).fadeOut().fadeIn();
 					window.location.hash = "#broadcast";
 				});
 			} catch(e) {