diff --git a/bitaddress.org.html b/bitaddress.org.html index ca8a9e9..a6e6993 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -3920,7 +3920,9 @@ #detailarea .label { display: block; text-decoration: underline; } #detailarea .output { display: block; min-height: 20px; } #detailarea #detailqrcodepublic { position: relative; float: left; margin: 0 10px 0 0; } - #detailarea #detailqrcodeprivate { position: relative; float: right; margin: 0 0 0 10px; } + #detailarea #detailqrcodepubliccomp { position: relative; float: right; margin: 0 0 0 10px; } + #detailarea #detailqrcodeprivate { position: relative; float: left; margin: 0 10px 0 0; } + #detailarea #detailqrcodeprivatecomp { position: relative; float: right; margin: 0 0 0 10px; } .right { text-align: right; } #bulkfaqs { display: none; } @@ -4070,7 +4072,7 @@
- Comma Separated Values: Index,Address,Private Key (WIF),Private Key (WIF compressed) + Comma Separated Values: Index,Address,Private Key (WIF)
@@ -4078,7 +4080,8 @@
Your Bitcoin Private Key is a unique secret number that only you know. It can be be encoded in a number of different formats. Below we show the Bitcoin Address and Public Key that corresponds to your Private Key as well as your Private Key in the most popular encoding formats (WIF, HEX, B64, MINI). - +
+
Bitcoin v0.6+ stores public keys in compressed format. The client now also supports import and export of private keys with importprivkey/dumpprivkey. The format of the exported private key is determined by whether the address was generated in an old or new wallet.
@@ -4088,8 +4091,10 @@ Bitcoin Address: -
- Bitcoin Address (compressed format): +
+
+
+ Bitcoin Address (compressed):

@@ -4098,19 +4103,24 @@
- Public Key (compressed format, 65 characters [0-9A-F]): + Public Key (compressed, 65 characters [0-9A-F]):
-
+
+
Private Key WIF (51 characters base58, starts with a '5'):
-
- Private Key WIF (compressed format, 52 characters base58, starts with a 'K' or 'L'): +
+
+
+
+ Private Key WIF (compressed, 52 characters base58, starts with a 'K' or 'L'):
-

+
+
Private Key Hexadecimal Format (64 characters [0-9A-F]): @@ -4428,8 +4438,10 @@ var key = new Bitcoin.ECKey(false); bulkWallet.csv.push((bulkWallet.csvRowLimit - bulkWallet.csvRowsRemaining + bulkWallet.csvStartIndex) - + ",\"" + key.getBitcoinAddress(0) + "\",\"" + key.toString("wif") + "\",\"" + key.toString("wifcomp") - //+ "\",\"" + key.getBitcoinHexFormat() + "\",\"" + key.toString("base64") // uncomment this line to add different private key formats to the CSV + + ",\"" + key.getBitcoinAddress(0) + "\",\"" + key.toString("wif") + //+ "\",\"" + key.toString("wifcomp") // uncomment these lines to add different private key formats to the CSV + //+ "\",\"" + key.getBitcoinHexFormat() + //+ "\",\"" + key.toString("base64") + "\""); document.getElementById("bulktextarea").value = "Generating addresses... " + bulkWallet.csvRowsRemaining; @@ -4677,16 +4689,22 @@ document.getElementById("detailprivhex").innerHTML = btcKey.toString().toUpperCase(); document.getElementById("detailprivb64").innerHTML = btcKey.toString("base64"); document.getElementById("detailqrcodepublic").innerHTML = ""; + document.getElementById("detailqrcodepubliccomp").innerHTML = ""; document.getElementById("detailqrcodeprivate").innerHTML = ""; + document.getElementById("detailqrcodeprivatecomp").innerHTML = ""; // show QR codes try { document.getElementById("detailqrcodepublic").appendChild(ninja.qrCode.createCanvas(btcKey.getBitcoinAddress(0))); + document.getElementById("detailqrcodepubliccomp").appendChild(ninja.qrCode.createCanvas(btcKey.getBitcoinAddress(1))); document.getElementById("detailqrcodeprivate").appendChild(ninja.qrCode.createCanvas(btcKey.getBitcoinWalletImportFormat(0))); + document.getElementById("detailqrcodeprivatecomp").appendChild(ninja.qrCode.createCanvas(btcKey.getBitcoinWalletImportFormat(1))); } catch (e) { // for browsers that do not support canvas (IE8) document.getElementById("detailqrcodepublic").innerHTML = ninja.qrCode.createTableHtml(btcKey.getBitcoinAddress(0)); + document.getElementById("detailqrcodepubliccomp").innerHTML = ninja.qrCode.createTableHtml(btcKey.getBitcoinAddress(1)); document.getElementById("detailqrcodeprivate").innerHTML = ninja.qrCode.createTableHtml(btcKey.getBitcoinWalletImportFormat(0)); + document.getElementById("detailqrcodeprivatecomp").innerHTML = ninja.qrCode.createTableHtml(btcKey.getBitcoinWalletImportFormat(1)); } } @@ -4703,7 +4721,9 @@ document.getElementById("detailprivb64").innerHTML = ""; document.getElementById("detailprivmini").innerHTML = ""; document.getElementById("detailqrcodepublic").innerHTML = ""; + document.getElementById("detailqrcodepubliccomp").innerHTML = ""; document.getElementById("detailqrcodeprivate").innerHTML = ""; + document.getElementById("detailqrcodeprivatecomp").innerHTML = ""; } } },