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

Merge 295afd2fee into 3cd0ae0e8b

Browse source
This commit is contained in:
OKNoah 2015-09-08 21:28:58 +00:00
commit 6eb91134ae
2 changed files with 74 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bitaddress.org.html
View file

@ -9591,12 +9591,22 @@ ninja.wallets.singlewallet = {
// generate bitcoin address and private key and update information in the HTML
generateNewAddressAndKey: function () {
this.generate = function () {
if ( document.getElementById("qrcode_private").innerHTML.length && window.sessionStorage ) {
window.sessionStorage.previous_address = document.getElementById("btcaddress").innerHTML
window.sessionStorage.previous_private_key = document.getElementById("btcprivwif").innerHTML
}
try {
var key = new Bitcoin.ECKey(false);
var bitcoinAddress = key.getBitcoinAddress();
var privateKeyWif = key.getBitcoinWalletImportFormat();
document.getElementById("btcaddress").innerHTML = bitcoinAddress;
document.getElementById("btcprivwif").innerHTML = privateKeyWif;
window.sessionStorage.newest_address = bitcoinAddress
window.sessionStorage.newest_private_key = privateKeyWif
var keyValuePair = {
"qrcode_public": bitcoinAddress,
"qrcode_private": privateKeyWif
@ -9611,6 +9621,14 @@ ninja.wallets.singlewallet = {
document.getElementById("qrcode_public").innerHTML = "";
document.getElementById("qrcode_private").innerHTML = "";
}
}
if ( document.getElementById("qrcode_private").innerHTML.length ) {
if ( confirm( "WARNING: This will permanently erase the current private key that is on the screen. If you have not saved this private key, press cancel now!" ) ) {
return this.generate()
} else return
} else return this.generate()
}
};
</script>

18
src/ninja.singlewallet.js
View file

@ -16,12 +16,22 @@ ninja.wallets.singlewallet = {
// generate bitcoin address and private key and update information in the HTML
generateNewAddressAndKey: function () {
this.generate = function () {
if ( document.getElementById("qrcode_private").innerHTML.length && window.sessionStorage ) {
window.sessionStorage.previous_address = document.getElementById("btcaddress").innerHTML
window.sessionStorage.previous_private_key = document.getElementById("btcprivwif").innerHTML
}
try {
var key = new Bitcoin.ECKey(false);
var bitcoinAddress = key.getBitcoinAddress();
var privateKeyWif = key.getBitcoinWalletImportFormat();
document.getElementById("btcaddress").innerHTML = bitcoinAddress;
document.getElementById("btcprivwif").innerHTML = privateKeyWif;
window.sessionStorage.newest_address = bitcoinAddress
window.sessionStorage.newest_private_key = privateKeyWif
var keyValuePair = {
"qrcode_public": bitcoinAddress,
"qrcode_private": privateKeyWif
@ -36,5 +46,13 @@ ninja.wallets.singlewallet = {
document.getElementById("qrcode_public").innerHTML = "";
document.getElementById("qrcode_private").innerHTML = "";
}
}
if ( document.getElementById("qrcode_private").innerHTML.length ) {
if ( confirm( "WARNING: This will permanently erase the current private key that is on the screen. If you have not saved this private key, press cancel now!" ) ) {
return this.generate()
} else return
} else return this.generate()
}
};