From bd8ec49ad04f069ef0cbdd2e580eaefc1bbf03f8 Mon Sep 17 00:00:00 2001 From: pointbiz Date: Sun, 25 Oct 2015 19:16:22 -0400 Subject: [PATCH] v3.0.1 fix to begin session log recording on page load --- CHANGELOG.txt | 4 ++++ CHANGELOG.txt.asc | 18 +++++++++++------- bitaddress.org.html | 19 +++++++++---------- bitaddress.org.html.sig | 14 +++++++------- package.json | 6 +++--- src/bitaddress-ui.html | 2 +- src/bitcoinjs-lib.eckey.js | 3 ++- src/ninja.key.js | 1 - src/ninja.misc.js | 2 -- src/ninja.unittests.js | 5 +++-- 10 files changed, 40 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4d5b15b..7086260 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -28,6 +28,10 @@ END USER NOTES: Here is a signed list of file names and version history. +2015-10-25: status ACTIVE +bitaddress.org-v3.0.1-SHA256-24d2d7f047a9aa217bf69f3ef344c972c151b1e3f6a8aa86ceb9a3be62884bc0.html + - fix for session log not keeping track of keys from "Wallet Details" tab before entropy is collected. + 2015-10-25: status ACTIVE bitaddress.org-v3.0.0-SHA256-4781574ca09c07f65d1966619f37a762aac6decd8732cacc85b2f2f972f82751.html - add session log icon that shows all the key pairs generated during the current session. diff --git a/CHANGELOG.txt.asc b/CHANGELOG.txt.asc index 39bdea2..574f7d5 100644 --- a/CHANGELOG.txt.asc +++ b/CHANGELOG.txt.asc @@ -31,6 +31,10 @@ END USER NOTES: Here is a signed list of file names and version history. +2015-10-25: status ACTIVE +bitaddress.org-v3.0.1-SHA256-24d2d7f047a9aa217bf69f3ef344c972c151b1e3f6a8aa86ceb9a3be62884bc0.html + - fix for session log not keeping track of keys from "Wallet Details" tab before entropy is collected. + 2015-10-25: status ACTIVE bitaddress.org-v3.0.0-SHA256-4781574ca09c07f65d1966619f37a762aac6decd8732cacc85b2f2f972f82751.html - add session log icon that shows all the key pairs generated during the current session. @@ -302,11 +306,11 @@ bitaddress.org-v0.1-SHA1-f40e706490f3eb2be56c31ddbf4c8646cd51ef40.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (MingW32) -iQEcBAEBAgAGBQJWLSSBAAoJEIdJe5Fjl09ajBMIAJobpBphyjpCmkt8CIzILevd -YZ4M9wCXq0rDj8oRmHzwHDU/UEqTQtmw0NK4juogBiBdfQ6SKon2woISYw1jg6g7 -EaL3n14dykaXxCvRCo8uTqLr3zsK0w9bxBa0GQ9uh+xG61vM9B14bFkVn90zXLsw -njn+wyibt4b4NmymKdklU4Ds1jTfquAB/9+dbi7DT5p6hcCGTcvWqekLyVYzVmzO -fiAmbQyWgGC1GvvRsIhi5vgzhLttXaC/K6s4Ypb74Qd5Uw7DO3qje3pmdZF1V/gQ -HOsL43jhqFSeGz2SbdJZLQOi1l9GA04cODJsa18tyiZ5ItbXfp9XKL/EcIG1mV4= -=8hP9 +iQEcBAEBAgAGBQJWLWE7AAoJEIdJe5Fjl09aNdIH/AuVLeRqLu7eQOlZPRU6v1E+ +BNi+bgamlZSyo+IjvCz49QjzB/Yaa0zMtjwfWdlhTaA9UMiw0a0CD2lEMwFumDHw +oDk2mWgUGnSQEQvMT731z9kLVJRg681JUeLluaWSv4B7IAddGXtV2HlgzvX46WnX +ipKkPZcUy+QH596oyYeAfL3PX42KDm9MC3Bz3jS0N32nLvbvzDI+4f1PtVUqLJC3 +NjxZ4pbYpxb6/2pSJRGnDL8IxL8pCfCmxwN1rBi5V1+AngsiQc+NWnXfOxm0NLJN +QZzb8f5FNrbKlQQHkQgcutQK0SlNGrPVc3NZPaLobFUmFpluu/7UNI2bi1Orbxg= +=Y2pw -----END PGP SIGNATURE----- diff --git a/bitaddress.org.html b/bitaddress.org.html index 5f3d067..ef08d03 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -5643,7 +5643,8 @@ Bitcoin.KeyPool = (function () { }; this.getArray = function () { - return this.keyArray; + // copy array + return this.keyArray.slice(0); }; this.setArray = function (ka) { @@ -7006,7 +7007,7 @@ body, html { height: 99%; }
⚠ Think twice! You appear to be running this generator online from a live website. For valuable wallets it is recommended to - download + download the zip file from GitHub and run this generator offline as a local html file.

@@ -7026,17 +7027,17 @@ body, html { height: 99%; } ... ... ... - + ≣ Donations: 1NiNja1bUmhSoTXozBRBEtR8LeF9TGbZBN GitHub Repository - (zip) + (zip)
- Version History (3.0.0) + Version History (3.0.1) 527B 5C82 B1F6 B2DB 72A0
ECBF 8749 7B91 6397 4F5A @@ -7190,7 +7191,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); @@ -7657,8 +7657,6 @@ ninja.publicKey = { document.getElementById("statusunittests").innerHTML = "×"; //× unitTestsCase = "bad"; } - // show session log icon - document.getElementById("statuskeypool").innerHTML = "≣"; //≣ }; var showCrypto = function () { @@ -10559,6 +10557,7 @@ ninja.wallets.splitwallet = { 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 @@ ninja.wallets.splitwallet = { 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 @@ ninja.wallets.splitwallet = { 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 997f950..43fcba7 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 7a155ed..1fb67a8 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 996a290..827e5a1 100644 --- a/src/bitaddress-ui.html +++ b/src/bitaddress-ui.html @@ -515,7 +515,7 @@ ... ... ... - + ≣ Donations: 1NiNja1bUmhSoTXozBRBEtR8LeF9TGbZBN diff --git a/src/bitcoinjs-lib.eckey.js b/src/bitcoinjs-lib.eckey.js index d3a0312..e1ab37d 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 c3ef04b..b07bac4 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 1ec3544..fba70e1 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 40f72c9..5785a18 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 () {