- (3.0.0)
+ (3.0.1)
527B 5C82 B1F6 B2DB 72A0
ECBF 8749 7B91 6397 4F5A
@@ -7190,7 +7191,6 @@
}
// remove this ECKey from the pool (because user does not see it)
var userKeyPool = Bitcoin.KeyPool.getArray();
- Bitcoin.KeyPool.reset();
var kp = new Bitcoin.ECKey(passfactor);
var passpoint = kp.setCompressed(true).getPub();
Bitcoin.KeyPool.setArray(userKeyPool);
@@ -7657,8 +7657,6 @@
document.getElementById("statusunittests").innerHTML = "×"; //×
unitTestsCase = "bad";
}
- // show session log icon
- document.getElementById("statuskeypool").innerHTML = "≣"; //≣
};
var showCrypto = function () {
@@ -10559,6 +10557,7 @@
div.setAttribute("class", "unittests");
div.setAttribute("id", "unittests");
}
+ var userKeyPool = Bitcoin.KeyPool.getArray(); // get the user key pool before test keys get added to it
var testResults = "";
var passCount = 0;
var testCount = 0;
@@ -10590,7 +10589,7 @@
document.body.appendChild(div);
document.getElementById("busyblock").className = "";
}
- Bitcoin.KeyPool.reset(); // reset the key pool so users don't see the test keys
+ Bitcoin.KeyPool.setArray(userKeyPool); // set the key pool so users don't see the test keys
return { passCount: passCount, testCount: testCount };
},
@@ -10606,7 +10605,7 @@
var userKeyPool = Bitcoin.KeyPool.getArray();
// run the asynchronous tests one after another so we don't crash the browser
ninja.foreachSerialized(ninja.unitTests.asynchronousTests, function (name, cb) {
- Bitcoin.KeyPool.reset();
+ //Bitcoin.KeyPool.reset();
document.getElementById("busyblock").className = "busy";
ninja.unitTests.asynchronousTests[name](cb);
}, function () {
diff --git a/bitaddress.org.html.sig b/bitaddress.org.html.sig
index 997f950d..43fcba77 100644
--- a/bitaddress.org.html.sig
+++ b/bitaddress.org.html.sig
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (MingW32)
-iQEcBAABAgAGBQJWLSSUAAoJEIdJe5Fjl09aOCEIAI4GIeb3WpHoEFzGs0hEaJ/k
-UHBlr716hqOyl0bmeTIABYMncJBxXsVtSphtGJChAAw4tdklRmCpXnauSrEnBqMO
-bTkjrLXcif5Xot4bJ1+mKJZtDtDj57bpICA/Am7tSchlK/tJNlW5WhV8egd6IF1M
-nkcWRz5Jx5VV+sDP0O/WgEYwL3dHZ+M4Q2Be+UCjj8G3GYbFOjocpowtab/2QXRF
-Q+3e7XHflMdY04wYc/V/0ZYPx7kUZ456OjNbEIOTkKb0Rb968ERTVGkm0XuDWUuk
-4Bay+IaRN6fSsHRtM1Qj6Z6ATSX4ofVh/qBTwjFJESrDz+4tBpbTTNfhvD7av1I=
-=HQw+
+iQEcBAABAgAGBQJWLWFMAAoJEIdJe5Fjl09arGsIAME5oLCA0YOKC+37MlSGTTbD
+wGuYkYa6nXCxynAyG1E/obKoHBgxmvKEJDP7+5Q+KRIUCaj2M1YgrwYfpDtAYvxR
+hma7BUXJgHQSStOdLTlLNiGOFhn1m0hFHBIV7vxt+eVd//ty0JRZWhdoMFTxjqPf
+OqdvMe6bmo2wJiVog2QoYd19TgUfEWhGEes8uWBrz0RCMKa3J9tKR+iyP+xcBQGV
+ZAxh404PXccFKJa7YKBuuytENwTpyUEOVHJo/gGhLoBl52TPRV7BfgV5/5PtTjlI
+Jdvl3O/gibkknoC8mSyrHqjuFs+92v13JuKzXzWBj4iEYlRAPWGVlAbVuGonYZM=
+=A9BF
-----END PGP SIGNATURE-----
diff --git a/package.json b/package.json
index 7a155ed3..1fb67a88 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "bitaddress.org",
- "version": "3.0.0",
- "sha1sum": "c3838fd668edd5e51aa262916ac7c286db0ddc51",
- "sha256sum": "4781574ca09c07f65d1966619f37a762aac6decd8732cacc85b2f2f972f82751",
+ "version": "3.0.1",
+ "sha1sum": "c24a422a1e1d8eb263c633783b6a030b902e5e56",
+ "sha256sum": "24d2d7f047a9aa217bf69f3ef344c972c151b1e3f6a8aa86ceb9a3be62884bc0",
"description": "Open Source JavaScript Client-Side Bitcoin Wallet Generator",
"main": "Gruntfile.js",
"dependencies": {
diff --git a/src/bitaddress-ui.html b/src/bitaddress-ui.html
index 996a290a..827e5a13 100644
--- a/src/bitaddress-ui.html
+++ b/src/bitaddress-ui.html
@@ -515,7 +515,7 @@
...
...
...
-
+
≣
1NiNja1bUmhSoTXozBRBEtR8LeF9TGbZBN
diff --git a/src/bitcoinjs-lib.eckey.js b/src/bitcoinjs-lib.eckey.js
index d3a03124..e1ab37d7 100644
--- a/src/bitcoinjs-lib.eckey.js
+++ b/src/bitcoinjs-lib.eckey.js
@@ -21,7 +21,8 @@ Bitcoin.KeyPool = (function () {
};
this.getArray = function () {
- return this.keyArray;
+ // copy array
+ return this.keyArray.slice(0);
};
this.setArray = function (ka) {
diff --git a/src/ninja.key.js b/src/ninja.key.js
index c3ef04b0..b07bac43 100644
--- a/src/ninja.key.js
+++ b/src/ninja.key.js
@@ -134,7 +134,6 @@ ninja.privateKey = {
}
// remove this ECKey from the pool (because user does not see it)
var userKeyPool = Bitcoin.KeyPool.getArray();
- Bitcoin.KeyPool.reset();
var kp = new Bitcoin.ECKey(passfactor);
var passpoint = kp.setCompressed(true).getPub();
Bitcoin.KeyPool.setArray(userKeyPool);
diff --git a/src/ninja.misc.js b/src/ninja.misc.js
index 1ec35445..fba70e14 100644
--- a/src/ninja.misc.js
+++ b/src/ninja.misc.js
@@ -35,8 +35,6 @@
document.getElementById("statusunittests").innerHTML = "×"; //×
unitTestsCase = "bad";
}
- // show session log icon
- document.getElementById("statuskeypool").innerHTML = "≣"; //≣
};
var showCrypto = function () {
diff --git a/src/ninja.unittests.js b/src/ninja.unittests.js
index 40f72c9a..5785a180 100644
--- a/src/ninja.unittests.js
+++ b/src/ninja.unittests.js
@@ -7,6 +7,7 @@
div.setAttribute("class", "unittests");
div.setAttribute("id", "unittests");
}
+ var userKeyPool = Bitcoin.KeyPool.getArray(); // get the user key pool before test keys get added to it
var testResults = "";
var passCount = 0;
var testCount = 0;
@@ -38,7 +39,7 @@
document.body.appendChild(div);
document.getElementById("busyblock").className = "";
}
- Bitcoin.KeyPool.reset(); // reset the key pool so users don't see the test keys
+ Bitcoin.KeyPool.setArray(userKeyPool); // set the key pool so users don't see the test keys
return { passCount: passCount, testCount: testCount };
},
@@ -54,7 +55,7 @@
var userKeyPool = Bitcoin.KeyPool.getArray();
// run the asynchronous tests one after another so we don't crash the browser
ninja.foreachSerialized(ninja.unitTests.asynchronousTests, function (name, cb) {
- Bitcoin.KeyPool.reset();
+ //Bitcoin.KeyPool.reset();
document.getElementById("busyblock").className = "busy";
ninja.unitTests.asynchronousTests[name](cb);
}, function () {