diff --git a/index.html b/index.html index ade8710..23f8d6c 100644 --- a/index.html +++ b/index.html @@ -338,7 +338,16 @@ - +
+ + + +

@@ -383,7 +392,17 @@ - +
+ + + + +

diff --git a/js/coin.js b/js/coin.js index 87a94a6..b25c197 100644 --- a/js/coin.js +++ b/js/coin.js @@ -22,7 +22,8 @@ coinjs.developer = '3K1oFZMks41C7qDYBsr72SYjapLqDuSYuN'; //bitcoin /* bit(coinb.in) api vars */ - coinjs.host = ('https:'==document.location.protocol?'https://':'http://')+'coinb.in/api/'; + coinjs.hostname = ((document.location.hostname.split(".")[(document.location.hostname.split(".")).length-1]) == 'onion') ? '4zpinp6gdkjfplhk.onion' : 'coinb.in'; + coinjs.host = ('https:'==document.location.protocol?'https://':'http://')+coinjs.hostname+'/api/'; coinjs.uid = '1'; coinjs.key = '12345678901234567890123456789012'; diff --git a/js/coinbin.js b/js/coinbin.js index e8e4160..759ddd0 100644 --- a/js/coinbin.js +++ b/js/coinbin.js @@ -344,7 +344,22 @@ $(document).ready(function() { $("#aes256passStatus").removeClass("hidden"); } $("#newPrivKeyEnc").val(CryptoJS.AES.encrypt(coin.wif, $("#aes256pass").val())+''); + }); + + $("#newPaperwalletBtn").click(function(){ + if($("#newBitcoinAddress").val()==""){ + $("#newKeysBtn").click(); + } + var paperwallet = window.open(); + paperwallet.document.write('

BTC PaperWallet


Address (Share)

'+$("#newBitcoinAddress").val()+'


Public Key

'+$("#newPubKey").val()+'


Private Key (KEEP SECRET!)

'+$("#newPrivKey").val()+'

'); + paperwallet.document.close(); + paperwallet.focus(); + new QRCode(paperwallet.document.getElementById("qraddress"), {text: $("#newBitcoinAddress").val(), width: 125, height: 125}); + new QRCode(paperwallet.document.getElementById("qrpubkey"), {text: $("#newPubKey").val(), width: 125, height: 125}); + new QRCode(paperwallet.document.getElementById("qrprivkey"), {text: $("#newPrivKey").val(), width: 125, height: 125}); + paperwallet.print(); + paperwallet.close(); }); $("#newBrainwallet").click(function(){ @@ -392,6 +407,22 @@ $(document).ready(function() { coinjs.compressed = compressed; }); + $("#newSegwitPaperwalletBtn").click(function(){ + if($("#newSegWitAddress").val()==""){ + $("#newSegWitKeysBtn").click(); + } + + var paperwallet = window.open(); + paperwallet.document.write('

BTC SegWit PaperWallet


Address (Share)

'+$("#newSegWitAddress").val()+'


Public Key

'+$("#newSegWitPubKey").val()+'


Redeem Script

'+$("#newSegWitRedeemScript").val()+'


Private Key (KEEP SECRET!)

'+$("#newSegWitPrivKey").val()+'

'); + paperwallet.document.close(); + paperwallet.focus(); + new QRCode(paperwallet.document.getElementById("qraddress"), {text: $("#newSegWitAddress").val(), width: 110, height: 110}); + new QRCode(paperwallet.document.getElementById("qrpubkey"), {text: $("#newSegWitPubKey").val(), width: 110, height: 110}); + new QRCode(paperwallet.document.getElementById("qrredeem"), {text: $("#newSegWitRedeemScript").val(), width: 110, height: 110}); + new QRCode(paperwallet.document.getElementById("qrprivkey"), {text: $("#newSegWitPrivKey").val(), width: 110, height: 110}); + paperwallet.print(); + paperwallet.close(); + }); /* new -> multisig code */ @@ -1198,7 +1229,7 @@ $(document).ready(function() { success: function(data) { $("#rawTransactionStatus").html(unescape($(data).find("response").text()).replace(/\+/g,' ')).removeClass('hidden'); if($(data).find("result").text()==1){ - $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' TXID: ' + $(data).find("txid").text() + '
View on Blockchain Explorer'); + $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' TXID: ' + $(data).find("txid").text() + '
View on Blockchain'); } else { $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').prepend(' '); } @@ -2146,4 +2177,4 @@ $(document).ready(function() { return true; }; -}); \ No newline at end of file +}); diff --git a/sha1sum b/sha1sum index ac250ac..8139109 100644 --- a/sha1sum +++ b/sha1sum @@ -1,9 +1,9 @@ ----- Version 1.4 2019.05.05 --- +---- Version 1.4 2019.06.05 ---- 77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js 3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js 253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js -82b602589fb4cf9be970fb67a9fc1a9b504d8075 ./js/coinbin.js -d7e828cea4e9af4934cc500d022cb1b6ce12cbb0 ./js/coin.js +c151bb100bb186b58407b18055d354abca92042a ./js/coinbin.js +8f1286e72a6b06259ba1892e532cb35b11c88c37 ./js/coin.js 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js f7c09f2f5a721371e7d478050119f7e2d58e3ef9 ./js/crypto-sha256-hmac.js @@ -31,4 +31,4 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s 278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff 44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf c024021c71cba503979a859d23cbf7a88b570d82 ./README.md -b7c566657f4a9c472a6aada2d5ec3a638e23b729 ./index.html +19651268aea16cb448be120d13828f42d208f1f9 ./index.html