zervo/bitaddress.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to input your own private key to generate a paper wallet, and to BIP38 encrypt them as well

Browse source
This commit is contained in:
Michael Muré 2014-08-20 23:45:41 +02:00
parent 3e8f5fb2c5
commit a65f6d74b3
5 changed files with 68 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
index.html
View file

@ -9506,6 +9506,8 @@ h1 { margin: 0px; height: 91px; }
transform: rotate(90deg); transform: rotate(90deg);
font-family: Courier, monospace; font-family: Courier, monospace;
} }
#suppliedPrivateKey { width: 420px; }
#papergenerate { margin-left: 10px; margin-right: 0px;}
.displayNone { displa: none; } .displayNone { displa: none; }
.redColor { color: red; } .redColor { color: red; }
@ -9865,9 +9867,13 @@ Walletgenerator.net use the same security measures as the original project. All-
<div id="papercommands" class="row"> <div id="papercommands" class="row">
<span><label id="paperlabelencrypt" for="paperencrypt" class="i18n">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span> <span><label id="paperlabelencrypt" for="paperencrypt" class="i18n">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span>
<span><label id="paperlabelBIPpassphrase" for="paperpassphrase" class="i18n">Passphrase:</label> <input type="text" id="paperpassphrase" /></span> <span><label id="paperlabelBIPpassphrase" for="paperpassphrase" class="i18n">Passphrase:</label> <input type="text" id="paperpassphrase" /></span>
<span><input type="button" id="papergenerate" value="Generate" onclick="ninja.wallets.paperwallet.build(document.getElementById('paperpassphrase').value);" /></span> <br/>
<input type="button" id="papergenerate" value="Randomly generate" onclick="ninja.wallets.paperwallet.build(document.getElementById('paperpassphrase').value);" />
<span>OR</span>
<input placeholder="Enter your own WIF private key" id="suppliedPrivateKey" name="suppliedPrivateKey" spellcheck="false" />&nbsp;
<input type="button" id="papergenerate" value="Apply &raquo;" onClick="ninja.wallets.paperwallet.testAndApplyVanityKey();" />
<span class="print"><input type="button" name="print" value="Print" id="paperprint" onclick="window.print();" /></span> <span class="print"><input type="button" name="print" value="Print" id="paperprint" onclick="window.print();" /></span>
</div> </div>
@ -10046,6 +10052,7 @@ Walletgenerator.net use the same security measures as the original project. All-
<p> <p>
08.2014 -- 08.2014 --
<ul> <ul>
<li>Enter your own private key to print a paper wallet, and BIP38 encrypt them as well !</li>
<li>Add support for Apexcoin, Cassubian Detk, Freicoin, Judgecoin, Myriadcoin and Onyxcoin.</li> <li>Add support for Apexcoin, Cassubian Detk, Freicoin, Judgecoin, Myriadcoin and Onyxcoin.</li>
</ul> </ul>
<p> <p>
@ -10263,7 +10270,7 @@ janin.currency = {
// Reset wallet tab when expensive or not applicable // Reset wallet tab when expensive or not applicable
document.getElementById("bulktextarea").value = ""; document.getElementById("bulktextarea").value = "";
document.getElementById("suppliedPrivateKey").value = "";
// easter egg doge ;) // easter egg doge ;)
if(janin.currency.name() == "Dogecoin") if(janin.currency.name() == "Dogecoin")
@ -11269,22 +11276,33 @@ ninja.wallets.paperwallet = {
ninja.wallets.paperwallet.showArtisticWallet(idPostFix, bitcoinAddress, privateKeyWif); ninja.wallets.paperwallet.showArtisticWallet(idPostFix, bitcoinAddress, privateKeyWif);
} }
}, },
showWallet: function (idPostFix, bitcoinAddress, privateKey) { // Verify that a self-entered key is valid, and compute the corresponding
document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; // public address, render the wallet.
document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; testAndApplyVanityKey: function () {
var keyValuePair = {}; var suppliedKey = document.getElementById('suppliedPrivateKey').value;
keyValuePair["qrcode_public" + idPostFix] = bitcoinAddress; suppliedKey = suppliedKey.trim(); // in case any spaces or whitespace got pasted in
keyValuePair["qrcode_private" + idPostFix] = privateKey; document.getElementById('suppliedPrivateKey').value = suppliedKey;
ninja.qrCode.showQrCode(keyValuePair); if (!ninja.privateKey.isPrivateKey(suppliedKey)) {
document.getElementById("keyarea" + idPostFix).style.display = "block"; 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) { templateArtisticHtml: function (i) {
var keyelement = 'btcprivwif'; var keyelement = 'btcprivwif';
if (ninja.wallets.paperwallet.encrypt)
keyelement = 'btcencryptedkey'
var coinImgUrl = "logos/" + janin.selectedCurrency.name.toLowerCase() + ".png"; var coinImgUrl = "logos/" + janin.selectedCurrency.name.toLowerCase() + ".png";
var walletBackgroundUrl = "wallets/" + 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); ninja.qrCode.showQrCode(keyValuePair, 2.8);
document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress;
document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey;
if (ninja.wallets.paperwallet.encrypt) {
document.getElementById("btcencryptedkey" + idPostFix).innerHTML = privateKey;
}
else {
document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey;
}
}, },
toggleEncrypt: function (element) { toggleEncrypt: function (element) {

9
src/index.html
View file

@ -332,9 +332,13 @@ Walletgenerator.net use the same security measures as the original project. All-
<div id="papercommands" class="row"> <div id="papercommands" class="row">
<span><label id="paperlabelencrypt" for="paperencrypt" class="i18n">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span> <span><label id="paperlabelencrypt" for="paperencrypt" class="i18n">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span>
<span><label id="paperlabelBIPpassphrase" for="paperpassphrase" class="i18n">Passphrase:</label> <input type="text" id="paperpassphrase" /></span> <span><label id="paperlabelBIPpassphrase" for="paperpassphrase" class="i18n">Passphrase:</label> <input type="text" id="paperpassphrase" /></span>
<span><input type="button" id="papergenerate" value="Generate" onclick="ninja.wallets.paperwallet.build(document.getElementById('paperpassphrase').value);" /></span> <br/>
<input type="button" id="papergenerate" value="Randomly generate" onclick="ninja.wallets.paperwallet.build(document.getElementById('paperpassphrase').value);" />
<span>OR</span>
<input placeholder="Enter your own WIF private key" id="suppliedPrivateKey" name="suppliedPrivateKey" spellcheck="false" />&nbsp;
<input type="button" id="papergenerate" value="Apply &raquo;" onClick="ninja.wallets.paperwallet.testAndApplyVanityKey();" />
<span class="print"><input type="button" name="print" value="Print" id="paperprint" onclick="window.print();" /></span> <span class="print"><input type="button" name="print" value="Print" id="paperprint" onclick="window.print();" /></span>
</div> </div>
@ -513,6 +517,7 @@ Walletgenerator.net use the same security measures as the original project. All-
<p> <p>
08.2014 -- 08.2014 --
<ul> <ul>
<li>Enter your own private key to print a paper wallet, and BIP38 encrypt them as well !</li>
<li>Add support for Apexcoin, Cassubian Detk, Freicoin, Judgecoin, Myriadcoin and Onyxcoin.</li> <li>Add support for Apexcoin, Cassubian Detk, Freicoin, Judgecoin, Myriadcoin and Onyxcoin.</li>
</ul> </ul>
<p> <p>

2
src/janin.currency.js
View file

@ -53,7 +53,7 @@ janin.currency = {
// Reset wallet tab when expensive or not applicable // Reset wallet tab when expensive or not applicable
document.getElementById("bulktextarea").value = ""; document.getElementById("bulktextarea").value = "";
document.getElementById("suppliedPrivateKey").value = "";
// easter egg doge ;) // easter egg doge ;)
if(janin.currency.name() == "Dogecoin") if(janin.currency.name() == "Dogecoin")

2
src/main.css
View file

@ -201,6 +201,8 @@ h1 { margin: 0px; height: 91px; }
transform: rotate(90deg); transform: rotate(90deg);
font-family: Courier, monospace; font-family: Courier, monospace;
} }
#suppliedPrivateKey { width: 420px; }
#papergenerate { margin-left: 10px; margin-right: 0px;}
.displayNone { displa: none; } .displayNone { displa: none; }
.redColor { color: red; } .redColor { color: red; }

43
src/ninja.paperwallet.js
View file

@ -93,22 +93,33 @@ ninja.wallets.paperwallet = {
ninja.wallets.paperwallet.showArtisticWallet(idPostFix, bitcoinAddress, privateKeyWif); ninja.wallets.paperwallet.showArtisticWallet(idPostFix, bitcoinAddress, privateKeyWif);
} }
}, },
showWallet: function (idPostFix, bitcoinAddress, privateKey) { // Verify that a self-entered key is valid, and compute the corresponding
document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; // public address, render the wallet.
document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey; testAndApplyVanityKey: function () {
var keyValuePair = {}; var suppliedKey = document.getElementById('suppliedPrivateKey').value;
keyValuePair["qrcode_public" + idPostFix] = bitcoinAddress; suppliedKey = suppliedKey.trim(); // in case any spaces or whitespace got pasted in
keyValuePair["qrcode_private" + idPostFix] = privateKey; document.getElementById('suppliedPrivateKey').value = suppliedKey;
ninja.qrCode.showQrCode(keyValuePair); if (!ninja.privateKey.isPrivateKey(suppliedKey)) {
document.getElementById("keyarea" + idPostFix).style.display = "block"; 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) { templateArtisticHtml: function (i) {
var keyelement = 'btcprivwif'; var keyelement = 'btcprivwif';
if (ninja.wallets.paperwallet.encrypt)
keyelement = 'btcencryptedkey'
var coinImgUrl = "logos/" + janin.selectedCurrency.name.toLowerCase() + ".png"; var coinImgUrl = "logos/" + janin.selectedCurrency.name.toLowerCase() + ".png";
var walletBackgroundUrl = "wallets/" + 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); ninja.qrCode.showQrCode(keyValuePair, 2.8);
document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress;
document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey;
if (ninja.wallets.paperwallet.encrypt) {
document.getElementById("btcencryptedkey" + idPostFix).innerHTML = privateKey;
}
else {
document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKey;
}
}, },
toggleEncrypt: function (element) { toggleEncrypt: function (element) {