Skip to content

Commit

Permalink
v3.0.1 fix to begin session log recording on page load
Browse files Browse the repository at this point in the history
  • Loading branch information
pointbiz committed Oct 25, 2015
1 parent c26f106 commit bd8ec49
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 34 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
18 changes: 11 additions & 7 deletions CHANGELOG.txt.asc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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-----
19 changes: 9 additions & 10 deletions bitaddress.org.html
Original file line number Diff line number Diff line change
Expand Up @@ -5643,7 +5643,8 @@
};

this.getArray = function () {
return this.keyArray;
// copy array
return this.keyArray.slice(0);
};

this.setArray = function (ka) {
Expand Down Expand Up @@ -7006,7 +7007,7 @@
<div class="tooltip" id="statusprotocolbad">
<span class="statuswarn" id="statuslabelprotocolbad">&#9888; Think twice!</span>
<span id="statuslabelprotocolbad1">You appear to be running this generator online from a live website. For valuable wallets it is recommended to</span>
<a id="statuslabelprotocolbad2" href="https://github.com/pointbiz/bitaddress.org/archive/v3.0.0.zip">download</a>
<a id="statuslabelprotocolbad2" href="https://github.com/pointbiz/bitaddress.org/archive/v3.0.1.zip">download</a>
<span id="statuslabelprotocolbad3">the zip file from GitHub and run this generator offline as a local html file.</span>
<br /><br /><input type="button" value="OK" class="button" id="statusokprotocolbad" onclick="document.getElementById('statusprotocolbad').style.display = 'none';" />
</div>
Expand All @@ -7026,17 +7027,17 @@
<span class="statusicon" id="statusprotocol" onclick="ninja.status.showProtocol();">...</span>
<span class="statusicon" id="statuscrypto" onclick="ninja.status.showCrypto();">...</span>
<span class="statusicon" id="statusunittests" onclick="ninja.status.showUnitTests();">...</span>
<span class="statusicon" id="statuskeypool" onclick="ninja.status.showKeyPool();"></span>
<span class="statusicon" id="statuskeypool" onclick="ninja.status.showKeyPool();">&#8803;</span>
</span>
<span class="item"><span id="footerlabeldonations">Donations:</span> <b>1NiNja</b>1bUmhSoTXozBRBEtR8LeF9TGbZBN</span>
<span class="item" id="footerlabeltranslatedby"></span>
<span class="item"><a href="https://github.com/pointbiz/bitaddress.org" target="_blank" id="footerlabelgithub">GitHub Repository</a>
(<a href="https://github.com/pointbiz/bitaddress.org/archive/v3.0.0.zip" target="_blank" id="footerlabelgithubzip">zip</a>)</span>
(<a href="https://github.com/pointbiz/bitaddress.org/archive/v3.0.1.zip" target="_blank" id="footerlabelgithubzip">zip</a>)</span>
</div>
</div>
<div class="authorpgp">
<span class="item">
<a href="CHANGELOG.txt.asc" target="_blank"><span id="footerlabelversion">Version History</span> (3.0.0)</a>
<a href="CHANGELOG.txt.asc" target="_blank"><span id="footerlabelversion">Version History</span> (3.0.1)</a>

</span>
<span class="item">527B 5C82 B1F6 B2DB 72A0<br />ECBF 8749 7B91 6397 4F5A</span>
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -7657,8 +7657,6 @@
document.getElementById("statusunittests").innerHTML = "&times;"; //×
unitTestsCase = "bad";
}
// show session log icon
document.getElementById("statuskeypool").innerHTML = "&#8803;"; //≣
};

var showCrypto = function () {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 };
},

Expand All @@ -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 () {
Expand Down
14 changes: 7 additions & 7 deletions bitaddress.org.html.sig
Original file line number Diff line number Diff line change
@@ -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-----
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/bitaddress-ui.html
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@
<span class="statusicon" id="statusprotocol" onclick="ninja.status.showProtocol();">...</span>
<span class="statusicon" id="statuscrypto" onclick="ninja.status.showCrypto();">...</span>
<span class="statusicon" id="statusunittests" onclick="ninja.status.showUnitTests();">...</span>
<span class="statusicon" id="statuskeypool" onclick="ninja.status.showKeyPool();"></span>
<span class="statusicon" id="statuskeypool" onclick="ninja.status.showKeyPool();">&#8803;</span>
</span>
<span class="item"><span id="footerlabeldonations">Donations:</span> <b>1NiNja</b>1bUmhSoTXozBRBEtR8LeF9TGbZBN</span>
<span class="item" id="footerlabeltranslatedby"></span>
Expand Down
3 changes: 2 additions & 1 deletion src/bitcoinjs-lib.eckey.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Bitcoin.KeyPool = (function () {
};

this.getArray = function () {
return this.keyArray;
// copy array
return this.keyArray.slice(0);
};

this.setArray = function (ka) {
Expand Down
1 change: 0 additions & 1 deletion src/ninja.key.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions src/ninja.misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
document.getElementById("statusunittests").innerHTML = "&times;"; //×
unitTestsCase = "bad";
}
// show session log icon
document.getElementById("statuskeypool").innerHTML = "&#8803;"; //≣
};

var showCrypto = function () {
Expand Down
5 changes: 3 additions & 2 deletions src/ninja.unittests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 };
},

Expand All @@ -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 () {
Expand Down

0 comments on commit bd8ec49

Please sign in to comment.