Compare commits

...

16 Commits
0.2.0 ... 0.2.2

Author SHA1 Message Date
Ian Coleman
f128bd58c4 Release v0.2.2 2017-08-16 11:26:10 +10:00
Ian Coleman
0eda54f5a7 Improve showing feedback for pending calculations 2017-08-16 11:04:13 +10:00
Ian Coleman
ed6d9d3905 Clear old seed when mnemonic is changed 2017-08-16 10:43:09 +10:00
Ian Coleman
47b64d3ee1 Add PIVX network tests 2017-08-14 15:27:24 +10:00
iancoleman
bc33f5ee53 Merge pull request #89 from alkley/master
Add PIVX
2017-08-14 14:43:04 +10:00
alkley
c0df01895d Added PIVX 2017-08-11 15:08:53 +02:00
Ian Coleman
b3cc3930d0 Release v0.2.1 2017-08-07 19:13:10 +10:00
Ian Coleman
c18511dd0d Add myriadcoin test 2017-08-07 19:01:03 +10:00
Ian Coleman
7ebdf61c99 Order networks alphabetically 2017-08-07 18:57:41 +10:00
Ian Coleman
daab55dc61 Add BCH - Bitcoin Cash network 2017-08-07 18:54:12 +10:00
Ian Coleman
7b742f87d3 Default coin selection is BTC - Bitcoin 2017-08-07 18:54:12 +10:00
iancoleman
4d9c184a84 Merge pull request #87 from alkley/master
Add Myriadcoin
2017-08-07 18:53:46 +10:00
alkley
d5e01cc6e2 placeholder scripthash 2017-08-06 18:20:33 +02:00
alkley
adedbf9169 Added myriad to selectbox 2017-08-06 17:45:22 +02:00
alkley
f36d10080a Added myriad to extensions 2017-08-06 17:40:42 +02:00
Ian Coleman
8335cf17bc Add testing and publishing to release process 2017-08-05 16:26:14 +10:00
7 changed files with 331 additions and 16 deletions

View File

@@ -118,7 +118,7 @@
<div class="container">
<h1 class="text-center">Mnemonic Code Converter</h1>
<p class="version">v0.2.0</p>
<p class="version">v0.2.2</p>
<hr>
<div class="row">
<div class="col-md-12">
@@ -22291,6 +22291,39 @@ bitcoinjs.bitcoin.networks.zetacoin = {
scriptHash: 0x09,
wif: 0xe0,
}
bitcoinjs.bitcoin.networks.myriadcoin = {
messagePrefix: "unused",
bip32: {
public: 0x0488b21e,
private: 0x0488ade4
},
pubKeyHash: 0x32,
scriptHash: 0x00, // TODO set this correctly
wif: 0xb2,
};
bitcoinjs.bitcoin.networks.pivx = {
messagePrefix: "unused",
bip32: {
public: 0x022d2533,
private: 0x0221312b
},
pubKeyHash: 0x1e,
scriptHash: 0x0d,
wif: 0xd4,
};
bitcoinjs.bitcoin.networks.pivxtestnet = {
messagePrefix: "unused",
bip32: {
public: 0x3a8061a0,
private: 0x3a805837
},
pubKeyHash: 0x8b,
scriptHash: 0x13,
wif: 0xef,
};
</script>
<script>(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ethUtil = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
(function (global){
@@ -46228,6 +46261,10 @@ window.Entropy = new (function() {
function delayedPhraseChanged() {
hideValidationError();
seed = null;
bip32RootKey = null;
bip32ExtendedKey = null;
clearAddressesList();
showPending();
if (phraseChangeTimeoutEvent != null) {
clearTimeout(phraseChangeTimeoutEvent);
@@ -46237,7 +46274,6 @@ window.Entropy = new (function() {
function phraseChanged() {
showPending();
hideValidationError();
setMnemonicLanguage();
// Get the mnemonic phrase
var phrase = DOM.phrase.val();
@@ -46250,7 +46286,6 @@ window.Entropy = new (function() {
var passphrase = DOM.passphrase.val();
calcBip32RootKeyFromSeed(phrase, passphrase);
calcForDerivationPath();
hidePending();
}
function delayedEntropyChanged() {
@@ -46326,10 +46361,9 @@ window.Entropy = new (function() {
}
function calcForDerivationPath() {
showPending();
clearDerivedKeys();
clearAddressesList();
hideValidationError();
showPending();
// Don't show bip49 if it's selected but network doesn't support it
if (bip49TabSelected() && !networkHasBip49()) {
return;
@@ -46349,7 +46383,6 @@ window.Entropy = new (function() {
displayBip49Info();
}
displayBip32Info();
hidePending();
}
function generateClicked() {
@@ -46656,17 +46689,19 @@ window.Entropy = new (function() {
for (var i=0; i<rows.length; i++) {
rows[i].shouldGenerate = false;
}
hidePending();
}
for (var i=0; i<total; i++) {
var index = i + start;
rows.push(new TableRow(index));
var isLast = i == total - 1;
rows.push(new TableRow(index, isLast));
}
})());
}
function TableRow(index) {
function TableRow(index, isLast) {
var self = this;
this.shouldGenerate = true;
@@ -46728,6 +46763,9 @@ window.Entropy = new (function() {
address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
}
addAddressToList(indexText, address, pubkey, privkey);
if (isLast) {
hidePending();
}
}, 50)
}
@@ -46871,6 +46909,9 @@ window.Entropy = new (function() {
var option = $("<option>");
option.attr("value", i);
option.text(network.name);
if (network.name == "BTC - Bitcoin") {
option.prop("selected", true);
}
DOM.phraseNetwork.append(option);
}
}
@@ -47216,6 +47257,14 @@ window.Entropy = new (function() {
}
var networks = [
{
name: "BCH - Bitcoin Cash",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(145);
},
},
{
name: "BTC - Bitcoin",
bip49available: true,
@@ -47312,6 +47361,22 @@ window.Entropy = new (function() {
setHdCoin(7);
},
},
{
name: "PIVX - PIVX",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivx;
setHdCoin(119);
},
},
{
name: "PIVX - PIVX Testnet",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivxtestnet;
setHdCoin(1);
},
},
{
name: "PPC - Peercoin",
bip49available: false,
@@ -47368,6 +47433,14 @@ window.Entropy = new (function() {
setHdCoin(1);
},
},
{
name: "XMY - Myriadcoin",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.myriadcoin;
setHdCoin(90);
},
},
{
name: "XRP - Ripple",
bip49available: false,

View File

@@ -1,3 +1,15 @@
# 0.2.2
* Improve showing feedback for pending calculations
* Bugfix: Clear old seed when mnemonic is changed
* Add PIVX network
# 0.2.1
* BTC is the default coin
* Add myriadcoin
* Add Bitcon Cash
# 0.2.0
* BitcoinJS library upgrded to v3.1.1

View File

@@ -1,6 +1,7 @@
Once all code changes for this version have been committed, a release can be
created with the following steps:
1. Run tests and ensure all tests pass
1. Set the version in index.html
1. Update changelog
1. Run `python compile.py`
@@ -15,3 +16,4 @@ created with the following steps:
1. include the signed release notes as text for the release
1. attach the bip39-standalone.html file
1. Add a new post to twitter from @bip39tool with the version, link and hash
1. Publish to any hosted locations (eg iancoleman.github.io/bip39)

View File

@@ -114,7 +114,7 @@
<div class="container">
<h1 class="text-center">Mnemonic Code Converter</h1>
<p class="version">v0.2.0</p>
<p class="version">v0.2.2</p>
<hr>
<div class="row">
<div class="col-md-12">

View File

@@ -184,3 +184,36 @@ bitcoinjs.bitcoin.networks.zetacoin = {
scriptHash: 0x09,
wif: 0xe0,
}
bitcoinjs.bitcoin.networks.myriadcoin = {
messagePrefix: "unused",
bip32: {
public: 0x0488b21e,
private: 0x0488ade4
},
pubKeyHash: 0x32,
scriptHash: 0x00, // TODO set this correctly
wif: 0xb2,
};
bitcoinjs.bitcoin.networks.pivx = {
messagePrefix: "unused",
bip32: {
public: 0x022d2533,
private: 0x0221312b
},
pubKeyHash: 0x1e,
scriptHash: 0x0d,
wif: 0xd4,
};
bitcoinjs.bitcoin.networks.pivxtestnet = {
messagePrefix: "unused",
bip32: {
public: 0x3a8061a0,
private: 0x3a805837
},
pubKeyHash: 0x8b,
scriptHash: 0x13,
wif: 0xef,
};

View File

@@ -175,6 +175,10 @@
function delayedPhraseChanged() {
hideValidationError();
seed = null;
bip32RootKey = null;
bip32ExtendedKey = null;
clearAddressesList();
showPending();
if (phraseChangeTimeoutEvent != null) {
clearTimeout(phraseChangeTimeoutEvent);
@@ -184,7 +188,6 @@
function phraseChanged() {
showPending();
hideValidationError();
setMnemonicLanguage();
// Get the mnemonic phrase
var phrase = DOM.phrase.val();
@@ -197,7 +200,6 @@
var passphrase = DOM.passphrase.val();
calcBip32RootKeyFromSeed(phrase, passphrase);
calcForDerivationPath();
hidePending();
}
function delayedEntropyChanged() {
@@ -273,10 +275,9 @@
}
function calcForDerivationPath() {
showPending();
clearDerivedKeys();
clearAddressesList();
hideValidationError();
showPending();
// Don't show bip49 if it's selected but network doesn't support it
if (bip49TabSelected() && !networkHasBip49()) {
return;
@@ -296,7 +297,6 @@
displayBip49Info();
}
displayBip32Info();
hidePending();
}
function generateClicked() {
@@ -603,17 +603,19 @@
for (var i=0; i<rows.length; i++) {
rows[i].shouldGenerate = false;
}
hidePending();
}
for (var i=0; i<total; i++) {
var index = i + start;
rows.push(new TableRow(index));
var isLast = i == total - 1;
rows.push(new TableRow(index, isLast));
}
})());
}
function TableRow(index) {
function TableRow(index, isLast) {
var self = this;
this.shouldGenerate = true;
@@ -675,6 +677,9 @@
address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
}
addAddressToList(indexText, address, pubkey, privkey);
if (isLast) {
hidePending();
}
}, 50)
}
@@ -818,6 +823,9 @@
var option = $("<option>");
option.attr("value", i);
option.text(network.name);
if (network.name == "BTC - Bitcoin") {
option.prop("selected", true);
}
DOM.phraseNetwork.append(option);
}
}
@@ -1163,6 +1171,14 @@
}
var networks = [
{
name: "BCH - Bitcoin Cash",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(145);
},
},
{
name: "BTC - Bitcoin",
bip49available: true,
@@ -1259,6 +1275,22 @@
setHdCoin(7);
},
},
{
name: "PIVX - PIVX",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivx;
setHdCoin(119);
},
},
{
name: "PIVX - PIVX Testnet",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivxtestnet;
setHdCoin(1);
},
},
{
name: "PPC - Peercoin",
bip49available: false,
@@ -1315,6 +1347,14 @@
setHdCoin(1);
},
},
{
name: "XMY - Myriadcoin",
bip49available: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.myriadcoin;
setHdCoin(90);
},
},
{
name: "XRP - Ripple",
bip49available: false,

155
tests.js
View File

@@ -872,6 +872,126 @@ page.open(url, function(status) {
});
},
// Network can be set to bitcoin cash
function() {
page.open(url, function(status) {
// set the phrase and coin
var expected = "1JKvb6wKtsjNoCRxpZ4DGrbniML7z5U16A";
page.evaluate(function() {
$(".phrase").val("abandon abandon ability");
$(".phrase").trigger("input");
$(".network option[selected]").removeAttr("selected");
$(".network option").filter(function() {
return $(this).html() == "BCH - Bitcoin Cash";
}).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("Bitcoin Cash address is incorrect");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
next();
});
});
},
// Network can be set to myriadcoin
function() {
page.open(url, function(status) {
// set the phrase and coin
var expected = "MJEswvRR46wh9BoiVj9DzKYMBkCramhoBV";
page.evaluate(function() {
$(".phrase").val("abandon abandon ability");
$(".phrase").trigger("input");
$(".network option[selected]").removeAttr("selected");
$(".network option").filter(function() {
return $(this).html() == "XMY - Myriadcoin";
}).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("Myriadcoin address is incorrect");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
next();
});
});
},
// Network can be set to pivx
function() {
page.open(url, function(status) {
// set the phrase and coin
var expected = "DBxgT7faCuno7jmtKuu6KWCiwqsVPqh1tS";
page.evaluate(function() {
$(".phrase").val("abandon abandon ability");
$(".phrase").trigger("input");
$(".network option[selected]").removeAttr("selected");
$(".network option").filter(function() {
return $(this).html() == "PIVX - PIVX";
}).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("PIVX address is incorrect");
console.log("Expected: " + expected);
console.log("Actual: " + actual);
fail();
}
next();
});
});
},
// Network can be set to pivx testnet
function() {
page.open(url, function(status) {
// set the phrase and coin
var expected = "yB5U384n6dGkVE3by5y9VdvHHPwPg68fQj";
page.evaluate(function() {
$(".phrase").val("abandon abandon ability");
$(".phrase").trigger("input");
$(".network option[selected]").removeAttr("selected");
$(".network option").filter(function() {
return $(this).html() == "PIVX - PIVX Testnet";
}).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("PIVX Testnet 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) {
@@ -4000,6 +4120,41 @@ page.open(url, function(status) {
});
},
// github issue 43
// Cleared mnemonic and root key still allows addresses to be generated
// https://github.com/iancoleman/bip39/issues/43
function() {
page.open(url, function(status) {
// set the phrase
page.evaluate(function() {
$("#bip49-tab a").click();
$(".phrase").val("abandon abandon ability");
$(".phrase").trigger("input");
});
waitForGenerate(function() {
// clear the mnemonic and root key
page.evaluate(function() {
$(".phrase").val("");
$(".phrase").trigger("input");
$(".root-key").val("");
$(".root-key").trigger("input");
$(".more").click();
});
waitForFeedback(function() {
// check there are no addresses shown
var addressCount = page.evaluate(function() {
return $(".address").length;
});
if (addressCount != 0) {
console.log("Clearing mnemonic should not allow addresses to be generated");
fail();
}
next();
});
});
});
},
// If you wish to add more tests, do so here...
// Here is a blank test template