From a65f6d74b3db3c8a20bb637e2bf0ad99c11199fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Mur=C3=A9?= Date: Wed, 20 Aug 2014 23:45:41 +0200 Subject: [PATCH] Allow to input your own private key to generate a paper wallet, and to BIP38 encrypt them as well --- index.html | 56 ++++++++++++++++++++++++---------------- src/index.html | 9 +++++-- src/janin.currency.js | 2 +- src/main.css | 2 ++ src/ninja.paperwallet.js | 43 ++++++++++++++++-------------- 5 files changed, 68 insertions(+), 44 deletions(-) diff --git a/index.html b/index.html index d8e57a8..c63f6c4 100644 --- a/index.html +++ b/index.html @@ -9506,6 +9506,8 @@ h1 { margin: 0px; height: 91px; } transform: rotate(90deg); font-family: Courier, monospace; } +#suppliedPrivateKey { width: 420px; } +#papergenerate { margin-left: 10px; margin-right: 0px;} .displayNone { displa: none; } .redColor { color: red; } @@ -9865,9 +9867,13 @@ Walletgenerator.net use the same security measures as the original project. All-
- - +
+ + OR +   + +
@@ -10046,6 +10052,7 @@ Walletgenerator.net use the same security measures as the original project. All-

08.2014 --

@@ -10263,7 +10270,7 @@ janin.currency = { // Reset wallet tab when expensive or not applicable document.getElementById("bulktextarea").value = ""; - + document.getElementById("suppliedPrivateKey").value = ""; // easter egg doge ;) if(janin.currency.name() == "Dogecoin") @@ -11269,22 +11276,33 @@ ninja.wallets.paperwallet = { ninja.wallets.paperwallet.showArtisticWallet(idPostFix, bitcoinAddress, privateKeyWif); } }, - - showWallet: function (idPostFix, bitcoinAddress, privateKey) { - document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; - document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; - var keyValuePair = {}; - keyValuePair["qrcode_public" + idPostFix] = bitcoinAddress; - keyValuePair["qrcode_private" + idPostFix] = privateKey; - ninja.qrCode.showQrCode(keyValuePair); - document.getElementById("keyarea" + idPostFix).style.display = "block"; + + // Verify that a self-entered key is valid, and compute the corresponding + // public address, render the wallet. + testAndApplyVanityKey: function () { + var suppliedKey = document.getElementById('suppliedPrivateKey').value; + suppliedKey = suppliedKey.trim(); // in case any spaces or whitespace got pasted in + document.getElementById('suppliedPrivateKey').value = suppliedKey; + if (!ninja.privateKey.isPrivateKey(suppliedKey)) { + alert(ninja.translator.get("detailalertnotvalidprivatekey")); + } else { + var computedPublicAddress = new Bitcoin.ECKey(suppliedKey).getBitcoinAddress(); + if (ninja.wallets.paperwallet.encrypt) { + document.getElementById("busyblock").className = "busy"; + ninja.privateKey.BIP38PrivateKeyToEncryptedKeyAsync(suppliedKey, + document.getElementById('paperpassphrase').value, false, function(encodedKey) { + document.getElementById("busyblock").className = ""; + ninja.wallets.paperwallet.showArtisticWallet(1, computedPublicAddress, encodedKey); + }); + } + else { + ninja.wallets.paperwallet.showArtisticWallet(1, computedPublicAddress, suppliedKey); + } + } }, templateArtisticHtml: function (i) { var keyelement = 'btcprivwif'; - if (ninja.wallets.paperwallet.encrypt) - keyelement = 'btcencryptedkey' - var coinImgUrl = "logos/" + janin.selectedCurrency.name.toLowerCase() + ".png"; var walletBackgroundUrl = "wallets/" + janin.selectedCurrency.name.toLowerCase() + ".png"; @@ -11310,13 +11328,7 @@ ninja.wallets.paperwallet = { ninja.qrCode.showQrCode(keyValuePair, 2.8); document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; - - if (ninja.wallets.paperwallet.encrypt) { - document.getElementById("btcencryptedkey" + idPostFix).innerHTML = privateKey; - } - else { - document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; - } + document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; }, toggleEncrypt: function (element) { diff --git a/src/index.html b/src/index.html index 5620dee..8a7cfa7 100644 --- a/src/index.html +++ b/src/index.html @@ -332,9 +332,13 @@ Walletgenerator.net use the same security measures as the original project. All-

- - +
+ + OR +   + +
@@ -513,6 +517,7 @@ Walletgenerator.net use the same security measures as the original project. All-

08.2014 --

diff --git a/src/janin.currency.js b/src/janin.currency.js index ec43760..224c59e 100644 --- a/src/janin.currency.js +++ b/src/janin.currency.js @@ -53,7 +53,7 @@ janin.currency = { // Reset wallet tab when expensive or not applicable document.getElementById("bulktextarea").value = ""; - + document.getElementById("suppliedPrivateKey").value = ""; // easter egg doge ;) if(janin.currency.name() == "Dogecoin") diff --git a/src/main.css b/src/main.css index ac4ea3d..658c791 100644 --- a/src/main.css +++ b/src/main.css @@ -201,6 +201,8 @@ h1 { margin: 0px; height: 91px; } transform: rotate(90deg); font-family: Courier, monospace; } +#suppliedPrivateKey { width: 420px; } +#papergenerate { margin-left: 10px; margin-right: 0px;} .displayNone { displa: none; } .redColor { color: red; } diff --git a/src/ninja.paperwallet.js b/src/ninja.paperwallet.js index c7ae7c5..1871ec7 100644 --- a/src/ninja.paperwallet.js +++ b/src/ninja.paperwallet.js @@ -93,22 +93,33 @@ ninja.wallets.paperwallet = { ninja.wallets.paperwallet.showArtisticWallet(idPostFix, bitcoinAddress, privateKeyWif); } }, - - showWallet: function (idPostFix, bitcoinAddress, privateKey) { - document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; - document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; - var keyValuePair = {}; - keyValuePair["qrcode_public" + idPostFix] = bitcoinAddress; - keyValuePair["qrcode_private" + idPostFix] = privateKey; - ninja.qrCode.showQrCode(keyValuePair); - document.getElementById("keyarea" + idPostFix).style.display = "block"; + + // Verify that a self-entered key is valid, and compute the corresponding + // public address, render the wallet. + testAndApplyVanityKey: function () { + var suppliedKey = document.getElementById('suppliedPrivateKey').value; + suppliedKey = suppliedKey.trim(); // in case any spaces or whitespace got pasted in + document.getElementById('suppliedPrivateKey').value = suppliedKey; + if (!ninja.privateKey.isPrivateKey(suppliedKey)) { + alert(ninja.translator.get("detailalertnotvalidprivatekey")); + } else { + var computedPublicAddress = new Bitcoin.ECKey(suppliedKey).getBitcoinAddress(); + if (ninja.wallets.paperwallet.encrypt) { + document.getElementById("busyblock").className = "busy"; + ninja.privateKey.BIP38PrivateKeyToEncryptedKeyAsync(suppliedKey, + document.getElementById('paperpassphrase').value, false, function(encodedKey) { + document.getElementById("busyblock").className = ""; + ninja.wallets.paperwallet.showArtisticWallet(1, computedPublicAddress, encodedKey); + }); + } + else { + ninja.wallets.paperwallet.showArtisticWallet(1, computedPublicAddress, suppliedKey); + } + } }, templateArtisticHtml: function (i) { var keyelement = 'btcprivwif'; - if (ninja.wallets.paperwallet.encrypt) - keyelement = 'btcencryptedkey' - var coinImgUrl = "logos/" + janin.selectedCurrency.name.toLowerCase() + ".png"; var walletBackgroundUrl = "wallets/" + janin.selectedCurrency.name.toLowerCase() + ".png"; @@ -134,13 +145,7 @@ ninja.wallets.paperwallet = { ninja.qrCode.showQrCode(keyValuePair, 2.8); document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; - - if (ninja.wallets.paperwallet.encrypt) { - document.getElementById("btcencryptedkey" + idPostFix).innerHTML = privateKey; - } - else { - document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; - } + document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; }, toggleEncrypt: function (element) {