Compare commits

...

7 Commits
0.2.2 ... 0.2.4

Author SHA1 Message Date
Ian Coleman
8d18f379fd Release v0.2.4 2017-08-28 09:48:48 +10:00
Ian Coleman
3abab9b087 Add a checkbox to switch litecoin key prefixes 2017-08-28 09:45:38 +10:00
Ian Coleman
b18eb97ae3 Show error when using xpub with hardened addresses 2017-08-24 09:37:21 +10:00
Ian Coleman
88ea3e40ee Release v0.2.3 2017-08-23 09:45:09 +10:00
Ian Coleman
8a9f391376 Test for Maza network 2017-08-23 09:41:53 +10:00
iancoleman
e40acc3ab0 Merge pull request #92 from jonspock/master
Add maza coin, update PIVX in bip39-standalone.html
2017-08-23 09:30:43 +10:00
Jon Spock
56ad960105 Add maza coin 2017-08-21 17:13:44 -07:00
7 changed files with 244 additions and 6 deletions

View File

@@ -118,7 +118,7 @@
<div class="container">
<h1 class="text-center">Mnemonic Code Converter</h1>
<p class="version">v0.2.2</p>
<p class="version">v0.2.4</p>
<hr>
<div class="row">
<div class="col-md-12">
@@ -270,6 +270,15 @@
<textarea id="root-key" class="root-key form-control" data-show-qr></textarea>
</div>
</div>
<div class="form-group litecoin-ltub-container hidden">
<label for="litecoin-use-ltub" class="col-sm-2 control-label" data-translate>Prefixes</label>
<div class="col-sm-10 checkbox">
<label>
<input type="checkbox" id="litecoin-use-ltub" class="litecoin-use-ltub">
Use <code>Ltpv / Ltub</code> instead of <code>xprv / xpub</code>
</label>
</div>
</div>
</form>
</div>
</div>
@@ -16926,6 +16935,16 @@ module.exports = {
wif: 0xef
},
litecoin: {
messagePrefix: '\x19Litecoin Signed Message:\n',
bip32: {
public: 0x0488b21e,
private: 0x0488ade4,
},
pubKeyHash: 0x30,
scriptHash: 0x32,
wif: 0xb0
},
litecoinLtub: {
messagePrefix: '\x19Litecoin Signed Message:\n',
bip32: {
public: 0x019da462,
@@ -22104,7 +22123,8 @@ module.exports = {
}).call(this,require("buffer").Buffer)
},{"bs58check":80,"buffer":4}]},{},[33])(33)
});</script>
});
</script>
<script>bitcoinjs.bitcoin.networks.shadow = {
messagePrefix: "unused",
bip32: {
@@ -22160,6 +22180,17 @@ bitcoinjs.bitcoin.networks.dash = {
wif: 0xcc,
};
bitcoinjs.bitcoin.networks.maza = {
messagePrefix: "unused",
bip32: {
public: 0x0488b21e,
private: 0x0488ade4
},
pubKeyHash: 0x32,
scriptHash: 0x09,
wif: 0xe0,
};
bitcoinjs.bitcoin.networks.dashtn = {
messagePrefix: "unused",
bip32: {
@@ -46100,6 +46131,7 @@ window.Entropy = new (function() {
var showPubKey = true;
var showPrivKey = true;
var showQr = false;
var litecoinUseLtub = false;
var entropyChangeTimeoutEvent = null;
var phraseChangeTimeoutEvent = null;
@@ -46129,6 +46161,8 @@ window.Entropy = new (function() {
DOM.generate = $(".generate");
DOM.seed = $(".seed");
DOM.rootKey = $(".root-key");
DOM.litecoinLtubContainer = $(".litecoin-ltub-container");
DOM.litecoinUseLtub = $(".litecoin-use-ltub");
DOM.extendedPrivKey = $(".extended-priv-key");
DOM.extendedPubKey = $(".extended-pub-key");
DOM.bip32tab = $("#bip32-tab");
@@ -46184,6 +46218,7 @@ window.Entropy = new (function() {
DOM.generate.on("click", generateClicked);
DOM.more.on("click", showMore);
DOM.rootKey.on("input", delayedRootKeyChanged);
DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
DOM.bip32path.on("input", calcForDerivationPath);
DOM.bip44account.on("input", calcForDerivationPath);
DOM.bip44change.on("input", calcForDerivationPath);
@@ -46209,6 +46244,7 @@ window.Entropy = new (function() {
function networkChanged(e) {
clearDerivedKeys();
clearAddressesList();
DOM.litecoinLtubContainer.addClass("hidden");
var networkIndex = e.target.value;
var network = networks[networkIndex];
network.onSelect();
@@ -46360,6 +46396,17 @@ window.Entropy = new (function() {
calcForDerivationPath();
}
function litecoinUseLtubChanged() {
litecoinUseLtub = DOM.litecoinUseLtub.prop("checked");
if (litecoinUseLtub) {
network = bitcoinjs.bitcoin.networks.litecoinLtub;
}
else {
network = bitcoinjs.bitcoin.networks.litecoin;
}
phraseChanged();
}
function calcForDerivationPath() {
clearDerivedKeys();
clearAddressesList();
@@ -46618,7 +46665,9 @@ window.Entropy = new (function() {
return "No root key";
}
// Check no hardened derivation path when using xpub keys
var hardened = path.indexOf("'") > -1;
var hardenedPath = path.indexOf("'") > -1;
var hardenedAddresses = bip32TabSelected() && DOM.hardenedAddresses.prop("checked");
var hardened = hardenedPath || hardenedAddresses;
var isXpubkey = bip32RootKey.isNeutered();
if (hardened && isXpubkey) {
return "Hardened derivation path is invalid with xpub key";
@@ -47351,8 +47400,18 @@ window.Entropy = new (function() {
onSelect: function() {
network = bitcoinjs.bitcoin.networks.litecoin;
setHdCoin(2);
DOM.litecoinLtubContainer.removeClass("hidden");
},
},
{
name: "MAZA - Maza",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.maza;
setHdCoin(13);
},
},
{
name: "NMC - Namecoin",
bip49available: false,

View File

@@ -1,3 +1,12 @@
# 0.2.4
* Show error when using xpub with hardened addresses
* Allow switching litecoin prefixes between xprv and Ltpv
# 0.2.3
* Add maza coin
# 0.2.2
* Improve showing feedback for pending calculations

View File

@@ -114,7 +114,7 @@
<div class="container">
<h1 class="text-center">Mnemonic Code Converter</h1>
<p class="version">v0.2.2</p>
<p class="version">v0.2.4</p>
<hr>
<div class="row">
<div class="col-md-12">
@@ -266,6 +266,15 @@
<textarea id="root-key" class="root-key form-control" data-show-qr></textarea>
</div>
</div>
<div class="form-group litecoin-ltub-container hidden">
<label for="litecoin-use-ltub" class="col-sm-2 control-label" data-translate>Prefixes</label>
<div class="col-sm-10 checkbox">
<label>
<input type="checkbox" id="litecoin-use-ltub" class="litecoin-use-ltub">
Use <code>Ltpv / Ltub</code> instead of <code>xprv / xpub</code>
</label>
</div>
</div>
</form>
</div>
</div>

View File

@@ -9649,6 +9649,16 @@ module.exports = {
wif: 0xef
},
litecoin: {
messagePrefix: '\x19Litecoin Signed Message:\n',
bip32: {
public: 0x0488b21e,
private: 0x0488ade4,
},
pubKeyHash: 0x30,
scriptHash: 0x32,
wif: 0xb0
},
litecoinLtub: {
messagePrefix: '\x19Litecoin Signed Message:\n',
bip32: {
public: 0x019da462,
@@ -14827,4 +14837,4 @@ module.exports = {
}).call(this,require("buffer").Buffer)
},{"bs58check":80,"buffer":4}]},{},[33])(33)
});
});

View File

@@ -53,6 +53,17 @@ bitcoinjs.bitcoin.networks.dash = {
wif: 0xcc,
};
bitcoinjs.bitcoin.networks.maza = {
messagePrefix: "unused",
bip32: {
public: 0x0488b21e,
private: 0x0488ade4
},
pubKeyHash: 0x32,
scriptHash: 0x09,
wif: 0xe0,
};
bitcoinjs.bitcoin.networks.dashtn = {
messagePrefix: "unused",
bip32: {

View File

@@ -14,6 +14,7 @@
var showPubKey = true;
var showPrivKey = true;
var showQr = false;
var litecoinUseLtub = false;
var entropyChangeTimeoutEvent = null;
var phraseChangeTimeoutEvent = null;
@@ -43,6 +44,8 @@
DOM.generate = $(".generate");
DOM.seed = $(".seed");
DOM.rootKey = $(".root-key");
DOM.litecoinLtubContainer = $(".litecoin-ltub-container");
DOM.litecoinUseLtub = $(".litecoin-use-ltub");
DOM.extendedPrivKey = $(".extended-priv-key");
DOM.extendedPubKey = $(".extended-pub-key");
DOM.bip32tab = $("#bip32-tab");
@@ -98,6 +101,7 @@
DOM.generate.on("click", generateClicked);
DOM.more.on("click", showMore);
DOM.rootKey.on("input", delayedRootKeyChanged);
DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
DOM.bip32path.on("input", calcForDerivationPath);
DOM.bip44account.on("input", calcForDerivationPath);
DOM.bip44change.on("input", calcForDerivationPath);
@@ -123,6 +127,7 @@
function networkChanged(e) {
clearDerivedKeys();
clearAddressesList();
DOM.litecoinLtubContainer.addClass("hidden");
var networkIndex = e.target.value;
var network = networks[networkIndex];
network.onSelect();
@@ -274,6 +279,17 @@
calcForDerivationPath();
}
function litecoinUseLtubChanged() {
litecoinUseLtub = DOM.litecoinUseLtub.prop("checked");
if (litecoinUseLtub) {
network = bitcoinjs.bitcoin.networks.litecoinLtub;
}
else {
network = bitcoinjs.bitcoin.networks.litecoin;
}
phraseChanged();
}
function calcForDerivationPath() {
clearDerivedKeys();
clearAddressesList();
@@ -532,7 +548,9 @@
return "No root key";
}
// Check no hardened derivation path when using xpub keys
var hardened = path.indexOf("'") > -1;
var hardenedPath = path.indexOf("'") > -1;
var hardenedAddresses = bip32TabSelected() && DOM.hardenedAddresses.prop("checked");
var hardened = hardenedPath || hardenedAddresses;
var isXpubkey = bip32RootKey.isNeutered();
if (hardened && isXpubkey) {
return "Hardened derivation path is invalid with xpub key";
@@ -1265,8 +1283,18 @@
onSelect: function() {
network = bitcoinjs.bitcoin.networks.litecoin;
setHdCoin(2);
DOM.litecoinLtubContainer.removeClass("hidden");
},
},
{
name: "MAZA - Maza",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.maza;
setHdCoin(13);
},
},
{
name: "NMC - Namecoin",
bip49available: false,

112
tests.js
View File

@@ -992,6 +992,36 @@ page.open(url, function(status) {
});
},
// Network can be set to maza
function() {
page.open(url, function(status) {
// set the phrase and coin
var expected = "MGW4Bmi2NEm4PxSjgeFwhP9vg18JHoRnfw";
page.evaluate(function() {
$(".phrase").val("abandon abandon ability");
$(".phrase").trigger("input");
$(".network option[selected]").removeAttr("selected");
$(".network option").filter(function() {
return $(this).html() == "MAZA - Maza";
}).prop("selected", true);
$(".network").trigger("change");
});
// check the address is generated correctly
waitForGenerate(function() {
var actual = page.evaluate(function() {
return $(".address:first").text();
});
if (actual != expected) {
console.log("Maza address is incorrect");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
next();
});
});
},
// BIP39 seed is set from phrase
function() {
page.open(url, function(status) {
@@ -4155,6 +4185,88 @@ page.open(url, function(status) {
});
},
// Github issue 95
// error trying to generate addresses from xpub with hardened derivation
function() {
page.open(url, function(status) {
// set the phrase
page.evaluate(function() {
// Use bip32 tab with hardened addresses
$(".hardened-addresses").prop("checked", true);
$("#bip32-tab a").click();
// set xpub for account 0 of bip44 for 'abandon abandon ability'
var bip44AccountXpub = "xpub6CzDCPbtLrrn4VpVbyyQLHbdSMpZoHN4iuW64VswCyEpfjM2mJGdaHJ2DyuZwtst96E16VvcERb8BBeJdHSCVmAq9RhtRQg6eAZFrTKCNqf";
$("#root-key").val(bip44AccountXpub);
$("#root-key").trigger("input");
});
waitForFeedback(function() {
// check the error message shows
var expected = "Hardened derivation path is invalid with xpub key";
var actual = page.evaluate(function() {
return $(".feedback").text();
});
if (actual != expected) {
console.log("xpub key with hardened addresses does not show feedback");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
next();
});
});
},
// Litecoin uses xprv by default, and can optionally be set to ltpv
// github issue 96
// https://github.com/iancoleman/bip39/issues/96
// Issue with extended keys on Litecoin
function() {
page.open(url, function(status) {
// set the phrase and coin
page.evaluate(function() {
$(".phrase").val("abandon abandon ability");
$(".network option[selected]").removeAttr("selected");
$(".network option").filter(function() {
return $(this).html() == "LTC - Litecoin";
}).prop("selected", true);
$(".network").trigger("change");
$(".phrase").trigger("input");
});
// check the extended key is generated correctly
waitForGenerate(function() {
var expected = "xprv9s21ZrQH143K2jkGDCeTLgRewT9F2pH5JZs2zDmmjXes34geVnFiuNa8KTvY5WoYvdn4Ag6oYRoB6cXtc43NgJAEqDXf51xPm6fhiMCKwpi";
var actual = page.evaluate(function() {
return $(".root-key").val();
});
if (actual != expected) {
console.log("Litecoin root key does not default to xprv");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
// set litecoin to use ltub
page.evaluate(function() {
$(".addresses").empty();
$(".litecoin-use-ltub").prop("checked", true);
$(".litecoin-use-ltub").trigger("change");
});
waitForGenerate(function() {
var expected = "Ltpv71G8qDifUiNesiPqf6h5V6eQ8ic77oxQiYtawiACjBEx3sTXNR2HGDGnHETYxESjqkMLFBkKhWVq67ey1B2MKQXannUqNy1RZVHbmrEjnEU";
var actual = page.evaluate(function() {
return $(".root-key").val();
});
if (actual != expected) {
console.log("Litecoin root key cannot be set to use ltub");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
next();
});
});
});
},
// If you wish to add more tests, do so here...
// Here is a blank test template