diff --git a/index.html b/index.html index 46bfe13..89f6abe 100644 --- a/index.html +++ b/index.html @@ -903,7 +903,7 @@

Enter your unsigned or signed hex encoded transaction below:


- +
diff --git a/js/coinbin.js b/js/coinbin.js index b4cc492..efeb75d 100644 --- a/js/coinbin.js +++ b/js/coinbin.js @@ -646,7 +646,7 @@ $(document).ready(function() { if($("#feesestnewtx").attr('est')=='y'){ $("#fees .txhex").val($("#transactionCreate textarea").val()); - $("#analyseBtn").click(); + $("#feesAnalyseBtn").click(); $("#fees .txhex").val(""); window.location = "#fees"; } else { @@ -1886,7 +1886,7 @@ $(document).ready(function() { } }); - $("#analyseBtn").click(function(){ + $("#feesAnalyseBtn").click(function(){ if(!$("#fees .txhex").val().match(/^[a-f0-9]+$/ig)){ alert('You must provide a hex encoded transaction'); return; @@ -1911,10 +1911,9 @@ $(document).ready(function() { } else { size += $("#est_txi_segwit").val()*1; } - size = size.toFixed(0); $("#fees .segwit .inputno").html(($("#fees .segwit .inputno").html()*1)+1); $("#fees .txi_segwit").val(($("#fees .txi_segwit").val()*1)+1); - $("#fees .segwit .bytes").html(size); + $("#fees .segwit .bytes").html(($("#fees .segwit .bytes").html()*1)+size); } else if(script.type == 'multisig'){ var s = coinjs.script(); @@ -1922,13 +1921,13 @@ $(document).ready(function() { size += 4 + ((script.script.length / 2) + (73 * rs.signaturesRequired)); $("#fees .multisig .inputno").html(($("#fees .multisig .inputno").html()*1)+1); $("#fees .txi_multisig").val(($("#fees .txi_multisig").val()*1)+1); - $("#fees .multisig .bytes").html(size); + $("#fees .multisig .bytes").html(($("#fees .multisig .bytes").html()*1)+size); } else if(script.type == 'hodl'){ size += 78; $("#fees .hodl .inputno").html(($("#fees .hodl .inputno").html()*1)+1); - $("#fees .hodl .bytes").html(size); $("#fees .txi_hodl").val(($("#fees .txi_hodl").val()*1)+1); + $("#fees .hodl .bytes").html(($("#fees .hodl .bytes").html()*1)+size); } else if(script.type == 'empty' || script.type == 'scriptpubkey'){ if(script.signatures == 1){ @@ -1961,7 +1960,7 @@ $(document).ready(function() { } } - //feeStats(); + feeStats(); }); $("#feeStatsReload").click(function(){ diff --git a/sha1sum b/sha1sum index c92c2e5..55d5a9f 100644 --- a/sha1sum +++ b/sha1sum @@ -1,8 +1,8 @@ ----- Version 1.3 2018.01.11 --- +---- Version 1.3 2018.01.15 --- 77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js 3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js 253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js -3da25f92194894512a5793a14f9180e7a273de0f ./js/coinbin.js +106646cb21653e8eeaa36dbf7ba4c572efbef08c ./js/coinbin.js 2d48b86fe5c7d485c6613afcb0d52d5352ecf01b ./js/coin.js 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js @@ -31,4 +31,4 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s 278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff 44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md -f79b6378651ba17f3179cc7b62435ee30852cfec ./index.html +2334df7122e15cae4f045a7e15bc24abbbe79aa7 ./index.html