From 437243023ad0962db05256ca111dd113a4aec4e3 Mon Sep 17 00:00:00 2001
From: alamshafil <alamshafil@pm.me>
Date: Fri, 16 Sep 2022 21:43:06 -0400
Subject: [PATCH] Remove RBF

---
 js/coin.js    | 6 +++---
 js/coinbin.js | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/js/coin.js b/js/coin.js
index 4c28fb1..d144f1f 100644
--- a/js/coin.js
+++ b/js/coin.js
@@ -1490,7 +1490,7 @@
 		/* sign a "standard" input */
 		r.signinput = function(index, wif, sigHashType){
 			var key = coinjs.wif2pubkey(wif);
-			var shType = sigHashType+64 || 1;
+			var shType = sigHashType || 1;
 			var signature = this.transactionSig(index, wif, shType);
 			var s = coinjs.script();
 			s.writeBytes(Crypto.util.hexToBytes(signature));
@@ -1501,7 +1501,7 @@
 
 		/* signs a time locked / hodl input */
 		r.signhodl = function(index, wif, sigHashType){
-			var shType = sigHashType+64 || 1;
+			var shType = sigHashType || 1;
 			var signature = this.transactionSig(index, wif, shType);
 			var redeemScript = this.ins[index].script.buffer
 			var s = coinjs.script();
@@ -1541,7 +1541,7 @@
 			var pubkeyList = scriptListPubkey(coinjs.script(redeemScript));
 			var sigsList = scriptListSigs(this.ins[index].script);
 
-			var shType = sigHashType+64 || 1;
+			var shType = sigHashType || 1;
 			var sighash = Crypto.util.hexToBytes(this.transactionHash(index, shType));
 			var signature = Crypto.util.hexToBytes(this.transactionSig(index, wif, shType));
 
diff --git a/js/coinbin.js b/js/coinbin.js
index 8fb6bf9..fa36506 100644
--- a/js/coinbin.js
+++ b/js/coinbin.js
@@ -176,9 +176,6 @@ $(document).ready(function() {
 		}
 
 		var sequence = 0xffffffff-1;
-		if($("#walletRBF").is(":checked")){
-			sequence = 0xffffffff-2;
-		}
 
 		tx.addUnspent($("#walletAddress").html(), function(data){
 
@@ -1011,7 +1008,7 @@ $(document).ready(function() {
 
 			$("#inputs .row:last input").attr('disabled',true);
 
-			var txid = ((tx).match(/.{1,2}/g).reverse()).join("")+'';
+			var txid = tx;
 
 			$("#inputs .txId:last").val(txid);
 			$("#inputs .txIdN:last").val(n);
@@ -1116,7 +1113,7 @@ $(document).ready(function() {
 				if(data.result && data.error == null){
 					$("#redeemFromAddress").removeClass('hidden').html('<span class="glyphicon glyphicon-info-sign"></span> Retrieved unspent inputs from address <a href="'+explorer_addr+redeem.addr+'" target="_blank">'+redeem.addr+'</a>');
 					data.result.forEach(i => {
-						addOutput(i.txid, i.index, i.script, (i.value/100000000));
+						addOutput(i.txid, i.index+1, i.script, (i.value/100000000));
 					});
 				} else {
 					$("#redeemFromStatus").removeClass('hidden').html('<span class="glyphicon glyphicon-exclamation-sign"></span> Unexpected error, unable to retrieve unspent outputs.');
@@ -1539,7 +1536,7 @@ $(document).ready(function() {
 				var tx = coinjs.transaction();
 				var t = tx.deserialize(script.val());
 
-				var signed = t.sign(wifkey.val(), $("#sighashType option:selected").val());
+				var signed = t.sign(wifkey.val(), $("#sighashType option:selected").val()+64);
 				$("#signedData textarea").val(signed);
 				$("#signedData .txSize").html(t.size());
 				$("#signedData").removeClass('hidden').fadeIn();