Open Source JavaScript Client-Side Bitcoin Wallet Generator
-
+
Single Wallet
@@ -5984,7 +5985,9 @@ body { font-family: Arial; }
Generating Bitcoin Address...
- MOVE your mouse around to add some extra randomness...
+ MOVE your mouse around to add some extra randomness...
+ OR type some random characters into this textbox
+
- MOVE your mouse around to add some extra randomness...
+ MOVE your mouse around to add some extra randomness...
+ OR type some random characters into this textbox
+
@@ -6276,7 +6279,7 @@ body { font-family: Arial; }
- (v2.7.5)
+ (v2.7.6)
(PGP)
527B 5C82 B1F6 B2DB 72A0
ECBF 8749 7B91 6397 4F5A @@ -6655,11 +6658,16 @@ ninja.seeder = { // seed function exists to wait for mouse movement to add more entropy before generating an address seed: function (evt) { if (!evt) var evt = window.event; - - // seed a bunch (minimum seedLimit) of times based on mouse moves + // seed a bunch (minimum seedLimit) of times SecureRandom.seedTime(); + // seed key press character + if (evt.which) { + SecureRandom.seedInt8(evt.which); + } // seed mouse position X and Y - if (evt) SecureRandom.seedInt16((evt.clientX * evt.clientY)); + else if (evt) { + SecureRandom.seedInt16((evt.clientX * evt.clientY)); + } ninja.seeder.seedCount++; // seeding is over now we generate and display the address @@ -6669,23 +6677,18 @@ ninja.seeder = { document.getElementById("generate").style.display = "none"; document.getElementById("menu").style.visibility = "visible"; } + var poolHex; if (SecureRandom.poolCopyOnInit != null) { + var poolHex = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit); document.getElementById("seedpool").innerHTML = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit); + document.getElementById("seedpooldisplay").innerHTML = poolHex; } else { - document.getElementById("seedpool").innerHTML = Crypto.util.bytesToHex(SecureRandom.pool); - } - }, - - // If user has not moved the mouse or if they are on a mobile device - // we will force the generation after a random period of time. - forceGenerate: function () { - // if the mouse has not moved enough - if (ninja.seeder.seedCount < ninja.seeder.seedLimit) { - SecureRandom.seedTime(); - ninja.seeder.seedCount = ninja.seeder.seedLimit - 1; - ninja.seeder.seed(); + var poolHex = Crypto.util.bytesToHex(SecureRandom.pool); + document.getElementById("seedpool").innerHTML = poolHex; + document.getElementById("seedpooldisplay").innerHTML = poolHex; } + document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount); } }; @@ -8902,10 +8905,7 @@ if (ninja.getQueryString()["testnet"] == "true" || ninja.getQueryString()["testn } if (ninja.getQueryString()["showseedpool"] == "true" || ninja.getQueryString()["showseedpool"] == "1") { document.getElementById("seedpoolarea").style.display = "block"; - } -// if users does not move mouse after random amount of time then generate the key anyway. -setTimeout(ninja.seeder.forceGenerate, ninja.seeder.seedLimit * 100); diff --git a/src/bitaddress-ui.html b/src/bitaddress-ui.html index 079fff5..bf12c9b 100644 --- a/src/bitaddress-ui.html +++ b/src/bitaddress-ui.html @@ -110,7 +110,7 @@ //main.css - +
ECBF 8749 7B91 6397 4F5A @@ -6655,11 +6658,16 @@ ninja.seeder = { // seed function exists to wait for mouse movement to add more entropy before generating an address seed: function (evt) { if (!evt) var evt = window.event; - - // seed a bunch (minimum seedLimit) of times based on mouse moves + // seed a bunch (minimum seedLimit) of times SecureRandom.seedTime(); + // seed key press character + if (evt.which) { + SecureRandom.seedInt8(evt.which); + } // seed mouse position X and Y - if (evt) SecureRandom.seedInt16((evt.clientX * evt.clientY)); + else if (evt) { + SecureRandom.seedInt16((evt.clientX * evt.clientY)); + } ninja.seeder.seedCount++; // seeding is over now we generate and display the address @@ -6669,23 +6677,18 @@ ninja.seeder = { document.getElementById("generate").style.display = "none"; document.getElementById("menu").style.visibility = "visible"; } + var poolHex; if (SecureRandom.poolCopyOnInit != null) { + var poolHex = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit); document.getElementById("seedpool").innerHTML = Crypto.util.bytesToHex(SecureRandom.poolCopyOnInit); + document.getElementById("seedpooldisplay").innerHTML = poolHex; } else { - document.getElementById("seedpool").innerHTML = Crypto.util.bytesToHex(SecureRandom.pool); - } - }, - - // If user has not moved the mouse or if they are on a mobile device - // we will force the generation after a random period of time. - forceGenerate: function () { - // if the mouse has not moved enough - if (ninja.seeder.seedCount < ninja.seeder.seedLimit) { - SecureRandom.seedTime(); - ninja.seeder.seedCount = ninja.seeder.seedLimit - 1; - ninja.seeder.seed(); + var poolHex = Crypto.util.bytesToHex(SecureRandom.pool); + document.getElementById("seedpool").innerHTML = poolHex; + document.getElementById("seedpooldisplay").innerHTML = poolHex; } + document.getElementById("mousemovelimit").innerHTML = (ninja.seeder.seedLimit - ninja.seeder.seedCount); } }; @@ -8902,10 +8905,7 @@ if (ninja.getQueryString()["testnet"] == "true" || ninja.getQueryString()["testn } if (ninja.getQueryString()["showseedpool"] == "true" || ninja.getQueryString()["showseedpool"] == "1") { document.getElementById("seedpoolarea").style.display = "block"; - } -// if users does not move mouse after random amount of time then generate the key anyway. -setTimeout(ninja.seeder.forceGenerate, ninja.seeder.seedLimit * 100); diff --git a/src/bitaddress-ui.html b/src/bitaddress-ui.html index 079fff5..bf12c9b 100644 --- a/src/bitaddress-ui.html +++ b/src/bitaddress-ui.html @@ -110,7 +110,7 @@ //main.css - +
Open Source JavaScript Client-Side Bitcoin Wallet Generator
-
+