From dc416c6521a05ea14244292f713c2f78e501e419 Mon Sep 17 00:00:00 2001 From: OutCast3k Date: Fri, 24 May 2019 14:44:47 +0000 Subject: [PATCH] changes made to paper wallet --- index.html | 27 +++++++++++++++++++++------ js/coinbin.js | 30 ++++++++++++++++++------------ sha1sum | 7 ++++--- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/index.html b/index.html index 67cdfb8..f42d700 100644 --- a/index.html +++ b/index.html @@ -338,9 +338,16 @@ - -

- +
+ + + +

@@ -385,9 +392,17 @@ - -

- +
+ + + + +

diff --git a/js/coinbin.js b/js/coinbin.js index e3b1ed1..cf55b44 100644 --- a/js/coinbin.js +++ b/js/coinbin.js @@ -344,17 +344,20 @@ $(document).ready(function() { $("#aes256passStatus").removeClass("hidden"); } $("#newPrivKeyEnc").val(CryptoJS.AES.encrypt(coin.wif, $("#aes256pass").val())+''); - $("#newPaperwalletBtn").prop("disabled", false); }); $("#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.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: 128, height: 128}); - new QRCode(paperwallet.document.getElementById("qrpubkey"), {text: $("#newPubKey").val(), width: 128, height: 128}); - new QRCode(paperwallet.document.getElementById("qrprivkey"), {text: $("#newPrivKey").val(), width: 128, height: 128}); + 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(); }); @@ -402,18 +405,21 @@ $(document).ready(function() { $("#newSegWitPubKey").val(coin.pubkey); $("#newSegWitPrivKey").val(coin.wif); coinjs.compressed = compressed; - $("#newSegwitPaperwalletBtn").prop("disabled", false); }); $("#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.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: 128, height: 128}); - new QRCode(paperwallet.document.getElementById("qrpubkey"), {text: $("#newSegWitPubKey").val(), width: 128, height: 128}); - new QRCode(paperwallet.document.getElementById("qrredeem"), {text: $("#newSegWitRedeemScript").val(), width: 128, height: 128}); - new QRCode(paperwallet.document.getElementById("qrprivkey"), {text: $("#newSegWitPrivKey").val(), width: 128, height: 128}); + 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(); }); @@ -2171,4 +2177,4 @@ $(document).ready(function() { return true; }; -}); \ No newline at end of file +}); diff --git a/sha1sum b/sha1sum index 1318837..f6caa02 100644 --- a/sha1sum +++ b/sha1sum @@ -1,8 +1,8 @@ ----- Version 1.4 2019.05.05 --- +---- Version 1.4 2019.05.24 --- 77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js 3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js 253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js -82b602589fb4cf9be970fb67a9fc1a9b504d8075 ./js/coinbin.js +e78a1273d4e0d98fe7c24a991251f6bb8a0f0da7 .js/coinbin.js d7e828cea4e9af4934cc500d022cb1b6ce12cbb0 ./js/coin.js 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js @@ -31,4 +31,5 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s 278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff 44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf c024021c71cba503979a859d23cbf7a88b570d82 ./README.md -ec9ad10deec0de54879c05fcfe44a96270458265 ./index.html +42541e9411de4550496cea79f2eb1edb4dcf2922 ./index.html +