aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriancoleman <coleman.ian@gmail.com>2014-10-15 09:49:36 +1100
committeriancoleman <coleman.ian@gmail.com>2014-10-15 09:49:36 +1100
commitea483b4a2e33a48279fc7a740609c7dfd8e200ad (patch)
treeb55f67c3e7f274a15cb29a76583cfc75fc8f3907
parentdc55c6b063a1f9d1fa8677d82a77ce53b0cecce5 (diff)
parent9b5f4cc7dfc2831bb14b1ff11cc40c1ed06bb270 (diff)
downloadBIP39-ea483b4a2e33a48279fc7a740609c7dfd8e200ad.tar.gz
BIP39-ea483b4a2e33a48279fc7a740609c7dfd8e200ad.tar.zst
BIP39-ea483b4a2e33a48279fc7a740609c7dfd8e200ad.zip
Merge pull request #4 from robjohnson189/mycelium_testnet_fix
Mycelium Path Fix Thanks, I had forgotten to test mycelium testnet wallet. Good catch!
-rw-r--r--bip39-standalone.html3
-rw-r--r--src/js/index.js3
2 files changed, 6 insertions, 0 deletions
diff --git a/bip39-standalone.html b/bip39-standalone.html
index 8733864..c015856 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -33893,6 +33893,7 @@ var Mnemonic = function(language) {
33893 DOM.indexToggle = $(".index-toggle"); 33893 DOM.indexToggle = $(".index-toggle");
33894 DOM.addressToggle = $(".address-toggle"); 33894 DOM.addressToggle = $(".address-toggle");
33895 DOM.privateKeyToggle = $(".private-key-toggle"); 33895 DOM.privateKeyToggle = $(".private-key-toggle");
33896 DOM.myceliumPath = $("#mycelium-path");
33896 33897
33897 var derivationPath = $(".tab-pane.active .path").val(); 33898 var derivationPath = $(".tab-pane.active .path").val();
33898 33899
@@ -33924,10 +33925,12 @@ var Mnemonic = function(language) {
33924 if (n == "bitcoin") { 33925 if (n == "bitcoin") {
33925 network = Bitcoin.networks.bitcoin; 33926 network = Bitcoin.networks.bitcoin;
33926 DOM.bip44coin.val(0); 33927 DOM.bip44coin.val(0);
33928 DOM.myceliumPath.val("m/44'/0'/0'/0");
33927 } 33929 }
33928 else if (n == "bitcoin-testnet") { 33930 else if (n == "bitcoin-testnet") {
33929 network = Bitcoin.networks.testnet; 33931 network = Bitcoin.networks.testnet;
33930 DOM.bip44coin.val(1); 33932 DOM.bip44coin.val(1);
33933 DOM.myceliumPath.val("m/44'/1'/0'/0");
33931 } 33934 }
33932 else if (n == "litecoin") { 33935 else if (n == "litecoin") {
33933 network = Bitcoin.networks.litecoin; 33936 network = Bitcoin.networks.litecoin;
diff --git a/src/js/index.js b/src/js/index.js
index bc1682e..bbef50d 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -40,6 +40,7 @@
40 DOM.indexToggle = $(".index-toggle"); 40 DOM.indexToggle = $(".index-toggle");
41 DOM.addressToggle = $(".address-toggle"); 41 DOM.addressToggle = $(".address-toggle");
42 DOM.privateKeyToggle = $(".private-key-toggle"); 42 DOM.privateKeyToggle = $(".private-key-toggle");
43 DOM.myceliumPath = $("#mycelium-path");
43 44
44 var derivationPath = $(".tab-pane.active .path").val(); 45 var derivationPath = $(".tab-pane.active .path").val();
45 46
@@ -71,10 +72,12 @@
71 if (n == "bitcoin") { 72 if (n == "bitcoin") {
72 network = Bitcoin.networks.bitcoin; 73 network = Bitcoin.networks.bitcoin;
73 DOM.bip44coin.val(0); 74 DOM.bip44coin.val(0);
75 DOM.myceliumPath.val("m/44'/0'/0'/0");
74 } 76 }
75 else if (n == "bitcoin-testnet") { 77 else if (n == "bitcoin-testnet") {
76 network = Bitcoin.networks.testnet; 78 network = Bitcoin.networks.testnet;
77 DOM.bip44coin.val(1); 79 DOM.bip44coin.val(1);
80 DOM.myceliumPath.val("m/44'/1'/0'/0");
78 } 81 }
79 else if (n == "litecoin") { 82 else if (n == "litecoin") {
80 network = Bitcoin.networks.litecoin; 83 network = Bitcoin.networks.litecoin;