zervo/bitaddress.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compress vanity wallet output if any input is compressed

Browse source
This commit is contained in:
RyanC 2017-01-22 17:55:41 -08:00
parent 72aefc03e0
commit f0a0260617
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ninja.vanitywallet.js
View file

@ -29,10 +29,17 @@ ninja.wallets.vanitywallet = {
var privateKeyWif = ninja.translator.get("vanityinvalidinputcouldnotcombinekeys"); var privateKeyWif = ninja.translator.get("vanityinvalidinputcouldnotcombinekeys");
var bitcoinAddress = ninja.translator.get("vanityinvalidinputcouldnotcombinekeys"); var bitcoinAddress = ninja.translator.get("vanityinvalidinputcouldnotcombinekeys");
var publicKeyHex = ninja.translator.get("vanityinvalidinputcouldnotcombinekeys"); var publicKeyHex = ninja.translator.get("vanityinvalidinputcouldnotcombinekeys");
var compressedOutput = false;
try { try {
var input1KeyString = document.getElementById("vanityinput1").value; var input1KeyString = document.getElementById("vanityinput1").value;
var input2KeyString = document.getElementById("vanityinput2").value; var input2KeyString = document.getElementById("vanityinput2").value;
// if any input is in a compressed format, compress the output
compressedOutput = compressedOutput || ninja.publicKey.isCompressedPublicKeyHexFormat(input1KeyString);
compressedOutput = compressedOutput || ninja.publicKey.isCompressedPublicKeyHexFormat(input2KeyString);
compressedOutput = compressedOutput || Bitcoin.ECKey.isCompressedWalletImportFormat(input1KeyString);
compressedOutput = compressedOutput || Bitcoin.ECKey.isCompressedWalletImportFormat(input2KeyString);
// both inputs are public keys // both inputs are public keys
if (ninja.publicKey.isPublicKeyHexFormat(input1KeyString) && ninja.publicKey.isPublicKeyHexFormat(input2KeyString)) { if (ninja.publicKey.isPublicKeyHexFormat(input1KeyString) && ninja.publicKey.isPublicKeyHexFormat(input2KeyString)) {
// add both public keys together // add both public keys together
@ -88,6 +95,7 @@ ninja.wallets.vanitywallet = {
alert(ninja.translator.get("vanityalertinvalidinputprivatekeysmatch")); alert(ninja.translator.get("vanityalertinvalidinputprivatekeysmatch"));
} }
else { else {
combinedPrivateKey.compressed = compressedOutput;
bitcoinAddress = combinedPrivateKey.getBitcoinAddress(); bitcoinAddress = combinedPrivateKey.getBitcoinAddress();
privateKeyWif = combinedPrivateKey.getBitcoinWalletImportFormat(); privateKeyWif = combinedPrivateKey.getBitcoinWalletImportFormat();
publicKeyHex = combinedPrivateKey.getPubKeyHex(); publicKeyHex = combinedPrivateKey.getPubKeyHex();
@ -115,4 +123,4 @@ ninja.wallets.vanitywallet = {
document.getElementById("vanitystep" + num + "icon").setAttribute("class", "less"); document.getElementById("vanitystep" + num + "icon").setAttribute("class", "less");
} }
} }
}; };