Bring back the wallet details and clean it

Gruntfile.js

@@ -35,7 +35,7 @@ module.exports = function (grunt) {
 					{ token: "//ninja.bulkwallet.js", file: "./src/ninja.bulkwallet.js" },
 					{ token: "//ninja.brainwallet.js", file: "./src/ninja.brainwallet.js" },
 					{ token: "//ninja.vanitywallet.js", file: "./src/ninja.vanitywallet.js" },
-					//{ token: "//ninja.detailwallet.js", file: "./src/ninja.detailwallet.js" },
+					{ token: "//ninja.detailwallet.js", file: "./src/ninja.detailwallet.js" },
                     { token: "//ninja.donatetab.js", file: "./src/ninja.donatetab.js" },
 					{ token: "//qrcode.js", file: "./src/qrcode.js" },
 					{ token: "//securerandom.js", file: "./src/securerandom.js" },

index.html

@@ -6071,7 +6071,7 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); height:
 			<div class="tab" id="bulkwallet" onclick="ninja.tabSwitch(this);">Bulk Wallet</div>
 			<div class="tab" id="brainwallet" onclick="ninja.tabSwitch(this);">Brain Wallet</div>
 			<div class="tab" id="vanitywallet" onclick="ninja.tabSwitch(this);">Vanity Wallet</div>
-			<!--<div class="tab" id="detailwallet" onclick="ninja.tabSwitch(this);">Wallet Details</div>-->
+			<div class="tab" id="detailwallet" onclick="ninja.tabSwitch(this);">Wallet Details</div>
       <div class="tab" id="donate" onclick="ninja.tabSwitch(this);">Support</div>
 		</div>
 		
@@ -6345,18 +6345,17 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); height:
 				</div>
 				<div id="detailkeyarea">
 					<div class="notes">
-						<span id="detaillabelnote1">Your Private Key is a unique secret number that only you know. It can 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, WIFC, HEX, B64, MINI).</span>
+						<span id="detaillabelnote1">Your Private Key is a unique secret number that only you know. It can be encoded in a number of different formats. Below we show the Public Address and Public Key that corresponds to your Private Key as well as your Private Key in the most popular encoding formats (WIF, WIFC, HEX, B64, MINI).</span>
 						<br /><br />
-						<span id="detaillabelnote2">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.</span>
 					</div>
 					<div class="pubqr">
 						<div class="item">
-							<span class="label" id="detaillabelbitcoinaddress">Bitcoin Address</span>
+							<span class="label" id="detaillabelbitcoinaddress">Public Address</span>
 							<div id="detailqrcodepublic" class="qrcode_public"></div>
 							<span class="output" id="detailaddress"></span>
 						</div>					
 						<div class="item right">
-							<span class="label" id="detaillabelbitcoinaddresscomp">Bitcoin Address Compressed</span>
+							<span class="label" id="detaillabelbitcoinaddresscomp">Public Address Compressed</span>
 							<div id="detailqrcodepubliccomp" class="qrcode_public"></div>
 							<span class="output" id="detailaddresscomp"></span>
 						</div>
@@ -8635,7 +8634,146 @@ ninja.wallets.vanitywallet = {
 };
 	</script>
 	<script type="text/javascript">
-//ninja.detailwallet.js
+ninja.wallets.detailwallet = {
+	open: function () {
+		document.getElementById("detailarea").style.display = "block";
+		document.getElementById("detailprivkey").focus();
+	},
+
+	close: function () {
+		document.getElementById("detailarea").style.display = "none";
+	},
+
+	openCloseFaq: function (faqNum) {
+		// do close
+		if (document.getElementById("detaila" + faqNum).style.display == "block") {
+			document.getElementById("detaila" + faqNum).style.display = "none";
+			document.getElementById("detaile" + faqNum).setAttribute("class", "more");
+		}
+		// do open
+		else {
+			document.getElementById("detaila" + faqNum).style.display = "block";
+			document.getElementById("detaile" + faqNum).setAttribute("class", "less");
+		}
+	},
+
+	viewDetails: function () {
+		var bip38 = false;
+		var key = document.getElementById("detailprivkey").value.toString().replace(/^\s+|\s+$/g, ""); // trim white space
+		document.getElementById("detailprivkey").value = key;
+		var bip38CommandDisplay = document.getElementById("detailbip38commands").style.display;
+		ninja.wallets.detailwallet.clear();
+		if (key == "") {
+			return;
+		}
+		if (ninja.privateKey.isBIP38Format(key)) {
+			document.getElementById("detailbip38commands").style.display = bip38CommandDisplay;
+			if (bip38CommandDisplay != "block") {
+				document.getElementById("detailbip38commands").style.display = "block";
+				document.getElementById("detailprivkeypassphrase").focus();
+				return;
+			}
+			var passphrase = document.getElementById("detailprivkeypassphrase").value.toString().replace(/^\s+|\s+$/g, ""); // trim white space
+			if (passphrase == "") {
+				alert(ninja.translator.get("bip38alertpassphraserequired"));
+				return;
+			}
+			document.getElementById("busyblock").className = "busy";
+			// show Private Key BIP38 Format
+			document.getElementById("detailprivbip38").innerHTML = key;
+			document.getElementById("detailbip38").style.display = "block";
+			ninja.privateKey.BIP38EncryptedKeyToByteArrayAsync(key, passphrase, function (btcKeyOrError) {
+				document.getElementById("busyblock").className = "";
+				if (btcKeyOrError.message) {
+					alert(btcKeyOrError.message);
+					ninja.wallets.detailwallet.clear();
+				} else {
+					ninja.wallets.detailwallet.populateKeyDetails(new Bitcoin.ECKey(btcKeyOrError));
+				}
+			});
+		}
+		else {
+			if (Bitcoin.ECKey.isMiniFormat(key)) {
+				// show Private Key Mini Format
+				document.getElementById("detailprivmini").innerHTML = key;
+				document.getElementById("detailmini").style.display = "block";
+			}
+			else if (Bitcoin.ECKey.isBase6Format(key)) {
+				// show Private Key Base6 Format
+				document.getElementById("detailprivb6").innerHTML = key;
+				document.getElementById("detailb6").style.display = "block";
+			}
+			var btcKey = new Bitcoin.ECKey(key);
+			if (btcKey.priv == null) {
+				// enforce a minimum passphrase length
+				if (key.length >= ninja.wallets.brainwallet.minPassphraseLength) {
+					// Deterministic Wallet confirm box to ask if user wants to SHA256 the input to get a private key
+					var usePassphrase = confirm(ninja.translator.get("detailconfirmsha256"));
+					if (usePassphrase) {
+						var bytes = Crypto.SHA256(key, { asBytes: true });
+						var btcKey = new Bitcoin.ECKey(bytes);
+					}
+					else {
+						ninja.wallets.detailwallet.clear();
+					}
+				}
+				else {
+					alert(ninja.translator.get("detailalertnotvalidprivatekey"));
+					ninja.wallets.detailwallet.clear();
+				}
+			}
+			ninja.wallets.detailwallet.populateKeyDetails(btcKey);
+		}
+	},
+
+	populateKeyDetails: function (btcKey) {
+		if (btcKey.priv != null) {
+			btcKey.setCompressed(false);
+			document.getElementById("detailprivhex").innerHTML = btcKey.toString().toUpperCase();
+			document.getElementById("detailprivb64").innerHTML = btcKey.toString("base64");
+			var bitcoinAddress = btcKey.getBitcoinAddress();
+			var wif = btcKey.getBitcoinWalletImportFormat();
+			document.getElementById("detailpubkey").innerHTML = btcKey.getPubKeyHex();
+			document.getElementById("detailaddress").innerHTML = bitcoinAddress;
+			document.getElementById("detailprivwif").innerHTML = wif;
+			btcKey.setCompressed(true);
+			var bitcoinAddressComp = btcKey.getBitcoinAddress();
+			var wifComp = btcKey.getBitcoinWalletImportFormat();
+			document.getElementById("detailpubkeycomp").innerHTML = btcKey.getPubKeyHex();
+			document.getElementById("detailaddresscomp").innerHTML = bitcoinAddressComp;
+			document.getElementById("detailprivwifcomp").innerHTML = wifComp;
+
+			ninja.qrCode.showQrCode({
+				"detailqrcodepublic": bitcoinAddress,
+				"detailqrcodepubliccomp": bitcoinAddressComp,
+				"detailqrcodeprivate": wif,
+				"detailqrcodeprivatecomp": wifComp
+			}, 4);
+		}
+	},
+
+	clear: function () {
+		document.getElementById("detailpubkey").innerHTML = "";
+		document.getElementById("detailpubkeycomp").innerHTML = "";
+		document.getElementById("detailaddress").innerHTML = "";
+		document.getElementById("detailaddresscomp").innerHTML = "";
+		document.getElementById("detailprivwif").innerHTML = "";
+		document.getElementById("detailprivwifcomp").innerHTML = "";
+		document.getElementById("detailprivhex").innerHTML = "";
+		document.getElementById("detailprivb64").innerHTML = "";
+		document.getElementById("detailprivb6").innerHTML = "";
+		document.getElementById("detailprivmini").innerHTML = "";
+		document.getElementById("detailprivbip38").innerHTML = "";
+		document.getElementById("detailqrcodepublic").innerHTML = "";
+		document.getElementById("detailqrcodepubliccomp").innerHTML = "";
+		document.getElementById("detailqrcodeprivate").innerHTML = "";
+		document.getElementById("detailqrcodeprivatecomp").innerHTML = "";
+		document.getElementById("detailb6").style.display = "none";
+		document.getElementById("detailmini").style.display = "none";
+		document.getElementById("detailbip38commands").style.display = "none";
+		document.getElementById("detailbip38").style.display = "none";
+	}
+};
 	</script>
   <script type="text/javascript">
 ninja.wallets.donate = {

src/index.html

@@ -144,7 +144,7 @@
 			<div class="tab" id="bulkwallet" onclick="ninja.tabSwitch(this);">Bulk Wallet</div>
 			<div class="tab" id="brainwallet" onclick="ninja.tabSwitch(this);">Brain Wallet</div>
 			<div class="tab" id="vanitywallet" onclick="ninja.tabSwitch(this);">Vanity Wallet</div>
-			<!--<div class="tab" id="detailwallet" onclick="ninja.tabSwitch(this);">Wallet Details</div>-->
+			<div class="tab" id="detailwallet" onclick="ninja.tabSwitch(this);">Wallet Details</div>
       <div class="tab" id="donate" onclick="ninja.tabSwitch(this);">Support</div>
 		</div>
 		
@@ -418,18 +418,17 @@
 				</div>
 				<div id="detailkeyarea">
 					<div class="notes">
-						<span id="detaillabelnote1">Your Private Key is a unique secret number that only you know. It can 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, WIFC, HEX, B64, MINI).</span>
+						<span id="detaillabelnote1">Your Private Key is a unique secret number that only you know. It can be encoded in a number of different formats. Below we show the Public Address and Public Key that corresponds to your Private Key as well as your Private Key in the most popular encoding formats (WIF, WIFC, HEX, B64, MINI).</span>
 						<br /><br />
-						<span id="detaillabelnote2">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.</span>
 					</div>
 					<div class="pubqr">
 						<div class="item">
-							<span class="label" id="detaillabelbitcoinaddress">Bitcoin Address</span>
+							<span class="label" id="detaillabelbitcoinaddress">Public Address</span>
 							<div id="detailqrcodepublic" class="qrcode_public"></div>
 							<span class="output" id="detailaddress"></span>
 						</div>					
 						<div class="item right">
-							<span class="label" id="detaillabelbitcoinaddresscomp">Bitcoin Address Compressed</span>
+							<span class="label" id="detaillabelbitcoinaddresscomp">Public Address Compressed</span>
 							<div id="detailqrcodepubliccomp" class="qrcode_public"></div>
 							<span class="output" id="detailaddresscomp"></span>
 						</div>