some changes and bug fixes to the fees page
This commit is contained in:
parent
40d514e0f0
commit
bb8abb4ded
3 changed files with 10 additions and 11 deletions
|
@ -903,7 +903,7 @@
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<p>Enter your unsigned or signed hex encoded transaction below:</p>
|
<p>Enter your unsigned or signed hex encoded transaction below:</p>
|
||||||
<textarea class="form-control txhex" style="height:160px"></textarea><br>
|
<textarea class="form-control txhex" style="height:160px"></textarea><br>
|
||||||
<button type="button" class="btn btn-primary" id="analyseBtn">Analyse Transaction</button>
|
<button type="button" class="btn btn-primary" id="feesAnalyseBtn">Analyse Transaction</button>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
|
|
|
@ -646,7 +646,7 @@ $(document).ready(function() {
|
||||||
|
|
||||||
if($("#feesestnewtx").attr('est')=='y'){
|
if($("#feesestnewtx").attr('est')=='y'){
|
||||||
$("#fees .txhex").val($("#transactionCreate textarea").val());
|
$("#fees .txhex").val($("#transactionCreate textarea").val());
|
||||||
$("#analyseBtn").click();
|
$("#feesAnalyseBtn").click();
|
||||||
$("#fees .txhex").val("");
|
$("#fees .txhex").val("");
|
||||||
window.location = "#fees";
|
window.location = "#fees";
|
||||||
} else {
|
} else {
|
||||||
|
@ -1886,7 +1886,7 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#analyseBtn").click(function(){
|
$("#feesAnalyseBtn").click(function(){
|
||||||
if(!$("#fees .txhex").val().match(/^[a-f0-9]+$/ig)){
|
if(!$("#fees .txhex").val().match(/^[a-f0-9]+$/ig)){
|
||||||
alert('You must provide a hex encoded transaction');
|
alert('You must provide a hex encoded transaction');
|
||||||
return;
|
return;
|
||||||
|
@ -1911,10 +1911,9 @@ $(document).ready(function() {
|
||||||
} else {
|
} else {
|
||||||
size += $("#est_txi_segwit").val()*1;
|
size += $("#est_txi_segwit").val()*1;
|
||||||
}
|
}
|
||||||
size = size.toFixed(0);
|
|
||||||
$("#fees .segwit .inputno").html(($("#fees .segwit .inputno").html()*1)+1);
|
$("#fees .segwit .inputno").html(($("#fees .segwit .inputno").html()*1)+1);
|
||||||
$("#fees .txi_segwit").val(($("#fees .txi_segwit").val()*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'){
|
} else if(script.type == 'multisig'){
|
||||||
var s = coinjs.script();
|
var s = coinjs.script();
|
||||||
|
@ -1922,13 +1921,13 @@ $(document).ready(function() {
|
||||||
size += 4 + ((script.script.length / 2) + (73 * rs.signaturesRequired));
|
size += 4 + ((script.script.length / 2) + (73 * rs.signaturesRequired));
|
||||||
$("#fees .multisig .inputno").html(($("#fees .multisig .inputno").html()*1)+1);
|
$("#fees .multisig .inputno").html(($("#fees .multisig .inputno").html()*1)+1);
|
||||||
$("#fees .txi_multisig").val(($("#fees .txi_multisig").val()*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'){
|
} else if(script.type == 'hodl'){
|
||||||
size += 78;
|
size += 78;
|
||||||
$("#fees .hodl .inputno").html(($("#fees .hodl .inputno").html()*1)+1);
|
$("#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 .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'){
|
} else if(script.type == 'empty' || script.type == 'scriptpubkey'){
|
||||||
if(script.signatures == 1){
|
if(script.signatures == 1){
|
||||||
|
@ -1961,7 +1960,7 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//feeStats();
|
feeStats();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#feeStatsReload").click(function(){
|
$("#feeStatsReload").click(function(){
|
||||||
|
|
6
sha1sum
6
sha1sum
|
@ -1,8 +1,8 @@
|
||||||
---- Version 1.3 2018.01.11 ---
|
---- Version 1.3 2018.01.15 ---
|
||||||
77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js
|
77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js
|
||||||
3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js
|
3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js
|
||||||
253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js
|
253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js
|
||||||
3da25f92194894512a5793a14f9180e7a273de0f ./js/coinbin.js
|
106646cb21653e8eeaa36dbf7ba4c572efbef08c ./js/coinbin.js
|
||||||
2d48b86fe5c7d485c6613afcb0d52d5352ecf01b ./js/coin.js
|
2d48b86fe5c7d485c6613afcb0d52d5352ecf01b ./js/coin.js
|
||||||
988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js
|
988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js
|
||||||
9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js
|
9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js
|
||||||
|
@ -31,4 +31,4 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s
|
||||||
278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff
|
278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff
|
||||||
44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf
|
44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf
|
||||||
d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md
|
d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md
|
||||||
f79b6378651ba17f3179cc7b62435ee30852cfec ./index.html
|
2334df7122e15cae4f045a7e15bc24abbbe79aa7 ./index.html
|
||||||
|
|
Loading…
Reference in a new issue