From 52d589ea8d14517813c2c41ba7f5c5b9f144821d Mon Sep 17 00:00:00 2001 From: Ian Coleman Date: Tue, 21 Feb 2017 12:35:10 +1100 Subject: [PATCH] Network order is alphabetical. Closes #56 --- bip39-standalone.html | 66 +++++++++++++++++++++--------------------- src/js/index.js | 66 +++++++++++++++++++++--------------------- tests.js | 67 ++++++++++++++++++++++++++++++++----------- 3 files changed, 117 insertions(+), 82 deletions(-) diff --git a/bip39-standalone.html b/bip39-standalone.html index ee26c14..43b588a 100644 --- a/bip39-standalone.html +++ b/bip39-standalone.html @@ -42309,10 +42309,10 @@ window.Entropy = new (function() { }, }, { - name: "Litecoin", + name: "CLAM", onSelect: function() { - network = bitcoin.networks.litecoin; - DOM.bip44coin.val(2); + network = bitcoin.networks.clam; + DOM.bip44coin.val(23); }, }, { @@ -42323,73 +42323,73 @@ window.Entropy = new (function() { }, }, { - name: "ShadowCash", + name: "DASH", onSelect: function() { - network = bitcoin.networks.shadow; - DOM.bip44coin.val(35); + network = bitcoin.networks.dash; + DOM.bip44coin.val(5); }, }, { - name: "ShadowCash Testnet", + name: "Ethereum", onSelect: function() { - network = bitcoin.networks.shadowtn; - DOM.bip44coin.val(1); + network = bitcoin.networks.bitcoin; + DOM.bip44coin.val(60); }, }, { - name: "Viacoin", + name: "Jumbucks", onSelect: function() { - network = bitcoin.networks.viacoin; - DOM.bip44coin.val(14); + network = bitcoin.networks.jumbucks; + DOM.bip44coin.val(26); }, }, { - name: "Viacoin Testnet", + name: "Litecoin", onSelect: function() { - network = bitcoin.networks.viacointestnet; - DOM.bip44coin.val(1); + network = bitcoin.networks.litecoin; + DOM.bip44coin.val(2); }, }, { - name: "Jumbucks", + name: "Namecoin", onSelect: function() { - network = bitcoin.networks.jumbucks; - DOM.bip44coin.val(26); + network = bitcoin.networks.namecoin; + DOM.bip44coin.val(7); }, }, { - name: "CLAM", + name: "Peercoin", onSelect: function() { - network = bitcoin.networks.clam; - DOM.bip44coin.val(23); + network = bitcoin.networks.peercoin; + DOM.bip44coin.val(6); }, }, { - name: "DASH", + name: "ShadowCash", onSelect: function() { - network = bitcoin.networks.dash; - DOM.bip44coin.val(5); + network = bitcoin.networks.shadow; + DOM.bip44coin.val(35); }, }, { - name: "Namecoin", + name: "ShadowCash Testnet", onSelect: function() { - network = bitcoin.networks.namecoin; - DOM.bip44coin.val(7); + network = bitcoin.networks.shadowtn; + DOM.bip44coin.val(1); }, }, { - name: "Peercoin", + name: "Viacoin", onSelect: function() { - network = bitcoin.networks.peercoin; - DOM.bip44coin.val(6); + network = bitcoin.networks.viacoin; + DOM.bip44coin.val(14); }, }, { - name: "Ethereum", + name: "Viacoin Testnet", onSelect: function() { - network = bitcoin.networks.bitcoin; - DOM.bip44coin.val(60); + network = bitcoin.networks.viacointestnet; + DOM.bip44coin.val(1); }, }, ] diff --git a/src/js/index.js b/src/js/index.js index 29cf06b..757d088 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -1086,10 +1086,10 @@ }, }, { - name: "Litecoin", + name: "CLAM", onSelect: function() { - network = bitcoin.networks.litecoin; - DOM.bip44coin.val(2); + network = bitcoin.networks.clam; + DOM.bip44coin.val(23); }, }, { @@ -1100,73 +1100,73 @@ }, }, { - name: "ShadowCash", + name: "DASH", onSelect: function() { - network = bitcoin.networks.shadow; - DOM.bip44coin.val(35); + network = bitcoin.networks.dash; + DOM.bip44coin.val(5); }, }, { - name: "ShadowCash Testnet", + name: "Ethereum", onSelect: function() { - network = bitcoin.networks.shadowtn; - DOM.bip44coin.val(1); + network = bitcoin.networks.bitcoin; + DOM.bip44coin.val(60); }, }, { - name: "Viacoin", + name: "Jumbucks", onSelect: function() { - network = bitcoin.networks.viacoin; - DOM.bip44coin.val(14); + network = bitcoin.networks.jumbucks; + DOM.bip44coin.val(26); }, }, { - name: "Viacoin Testnet", + name: "Litecoin", onSelect: function() { - network = bitcoin.networks.viacointestnet; - DOM.bip44coin.val(1); + network = bitcoin.networks.litecoin; + DOM.bip44coin.val(2); }, }, { - name: "Jumbucks", + name: "Namecoin", onSelect: function() { - network = bitcoin.networks.jumbucks; - DOM.bip44coin.val(26); + network = bitcoin.networks.namecoin; + DOM.bip44coin.val(7); }, }, { - name: "CLAM", + name: "Peercoin", onSelect: function() { - network = bitcoin.networks.clam; - DOM.bip44coin.val(23); + network = bitcoin.networks.peercoin; + DOM.bip44coin.val(6); }, }, { - name: "DASH", + name: "ShadowCash", onSelect: function() { - network = bitcoin.networks.dash; - DOM.bip44coin.val(5); + network = bitcoin.networks.shadow; + DOM.bip44coin.val(35); }, }, { - name: "Namecoin", + name: "ShadowCash Testnet", onSelect: function() { - network = bitcoin.networks.namecoin; - DOM.bip44coin.val(7); + network = bitcoin.networks.shadowtn; + DOM.bip44coin.val(1); }, }, { - name: "Peercoin", + name: "Viacoin", onSelect: function() { - network = bitcoin.networks.peercoin; - DOM.bip44coin.val(6); + network = bitcoin.networks.viacoin; + DOM.bip44coin.val(14); }, }, { - name: "Ethereum", + name: "Viacoin Testnet", onSelect: function() { - network = bitcoin.networks.bitcoin; - DOM.bip44coin.val(60); + network = bitcoin.networks.viacointestnet; + DOM.bip44coin.val(1); }, }, ] diff --git a/tests.js b/tests.js index debedab..e9f0a31 100644 --- a/tests.js +++ b/tests.js @@ -280,7 +280,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=1]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Bitcoin Testnet"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -308,7 +310,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=2]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Litecoin"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -336,7 +340,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=3]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Dogecoin"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -364,7 +370,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=4]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "ShadowCash"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -392,7 +400,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=5]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "ShadowCash Testnet"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -420,7 +430,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=6]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Viacoin"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -448,7 +460,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=7]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Viacoin Testnet"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -476,7 +490,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=8]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Jumbucks"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -504,7 +520,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=9]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "CLAM"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -532,7 +550,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=10]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "DASH"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -560,7 +580,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=11]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Namecoin"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -588,7 +610,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=12]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Peercoin"; + }).prop("selected", true); $(".network").trigger("change"); }); // check the address is generated correctly @@ -617,7 +641,9 @@ page.open(url, function(status) { $(".phrase").val("abandon abandon ability"); $(".phrase").trigger("input"); $(".network option[selected]").removeAttr("selected"); - $(".network option[value=13]").prop("selected", true); + $(".network option").filter(function() { + return $(this).html() == "Ethereum"; + }).prop("selected", true); $(".network").trigger("change"); }); waitForGenerate(function() { @@ -1838,7 +1864,10 @@ page.open(url, function(status) { waitForGenerate(function() { // 4) switch from bitcoin to litecoin page.evaluate(function() { - $(".network").val("2").trigger("change"); + $(".network option").filter(function() { + return $(this).html() == "Litecoin"; + }).prop("selected", true); + $(".network").trigger("change"); }); waitForGenerate(function() { // 5) Check derivation path is displayed correctly @@ -1881,7 +1910,10 @@ page.open(url, function(status) { waitForGenerate(function() { // switch from bitcoin to clam page.evaluate(function() { - $(".network").val("9").trigger("change"); + $(".network option").filter(function() { + return $(this).html() == "CLAM"; + }).prop("selected", true); + $(".network").trigger("change"); }); waitForGenerate(function() { // check derivation path is displayed correctly @@ -1912,7 +1944,10 @@ page.open(url, function(status) { waitForGenerate(function() { // 4) switch from bitcoin to viacoin page.evaluate(function() { - $(".network").val("6").trigger("change"); + $(".network option").filter(function() { + return $(this).html() == "Viacoin"; + }).prop("selected", true); + $(".network").trigger("change"); }); waitForGenerate(function() { // 5) ensure the derived address is correct -- 2.41.0