mirror of
https://github.com/ok2/coinbin.git
synced 2026-05-10 02:25:21 +02:00
few minor changes, plus the wallet now enables rbf by default
This commit is contained in:
+3
-2
@@ -882,7 +882,7 @@
|
||||
}
|
||||
|
||||
/* add unspent to transaction */
|
||||
r.addUnspent = function(address, callback, script, segwit){
|
||||
r.addUnspent = function(address, callback, script, segwit, sequence){
|
||||
var self = this;
|
||||
this.listUnspent(address, function(data){
|
||||
var s = coinjs.script();
|
||||
@@ -919,7 +919,8 @@
|
||||
scr = Crypto.util.bytesToHex(s.buffer);
|
||||
}
|
||||
|
||||
self.addinput(txhash, n, scr);
|
||||
var seq = sequence || false;
|
||||
self.addinput(txhash, n, scr, seq);
|
||||
value += u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1;
|
||||
total++;
|
||||
}
|
||||
|
||||
+9
-1
@@ -146,6 +146,11 @@ $(document).ready(function() {
|
||||
script = sw.redeemscript;
|
||||
}
|
||||
|
||||
var sequence = false;
|
||||
if($("#walletRBF").is(":checked")){
|
||||
sequence = 0xffffffff-2;
|
||||
}
|
||||
|
||||
tx.addUnspent($("#walletAddress").html(), function(data){
|
||||
|
||||
var dvalue = (data.value/100000000).toFixed(8) * 1;
|
||||
@@ -186,7 +191,7 @@ $(document).ready(function() {
|
||||
|
||||
$("#walletLoader").addClass("hidden");
|
||||
|
||||
}, script, script);
|
||||
}, script, script, sequence);
|
||||
});
|
||||
|
||||
$("#walletSendBtn").click(function(){
|
||||
@@ -1471,6 +1476,9 @@ $(document).ready(function() {
|
||||
if(pubkey.length==66 || pubkey.length==130){
|
||||
try {
|
||||
$("#verifyPubKey .address").val(coinjs.pubkey2address(pubkey));
|
||||
var sw = coinjs.segwitAddress(pubkey);
|
||||
$("#verifyPubKey .addressSegWit").val(sw.address);
|
||||
$("#verifyPubKey .addressSegWitRedeemScript").val(sw.redeemscript);
|
||||
$("#verifyPubKey").removeClass("hidden");
|
||||
$(".verifyLink").attr('href','?verify='+$("#verifyScript").val());
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user