diff options
author | iancoleman <1281387+iancoleman@users.noreply.github.com> | 2019-06-11 09:37:53 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-11 09:37:53 +1000 |
commit | 7d68d5474e9354699b05637a8645a0b749e52c81 (patch) | |
tree | f8eb851f8ed190c7d4b8628d67253d0dff5be802 /src/js/index.js | |
parent | 0ae59396f5407f269206c58392b2638ea37455a8 (diff) | |
parent | 21e2e6c95158c720ce816f1df3a758217a8c2034 (diff) | |
download | BIP39-7d68d5474e9354699b05637a8645a0b749e52c81.tar.gz BIP39-7d68d5474e9354699b05637a8645a0b749e52c81.tar.zst BIP39-7d68d5474e9354699b05637a8645a0b749e52c81.zip |
Merge branch 'master' into eosio-support
Diffstat (limited to 'src/js/index.js')
-rw-r--r-- | src/js/index.js | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/js/index.js b/src/js/index.js index 3b3ebed..f54ff71 100644 --- a/src/js/index.js +++ b/src/js/index.js | |||
@@ -980,11 +980,12 @@ | |||
980 | address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network) | 980 | address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network) |
981 | } | 981 | } |
982 | } | 982 | } |
983 | 983 | ||
984 | if ((networks[DOM.network.val()].name == "CRW - Crown")) { | 984 | if ((networks[DOM.network.val()].name == "CRW - Crown")) { |
985 | address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address); | 985 | address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address); |
986 | } | 986 | } |
987 | if (networks[DOM.network.val()].name == "EOS - EOSIO") { | 987 | |
988 | if (networks[DOM.network.val()].name == "EOS - EOSIO") { | ||
988 | address = "" | 989 | address = "" |
989 | pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer()); | 990 | pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer()); |
990 | privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32)); | 991 | privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32)); |
@@ -1965,6 +1966,13 @@ | |||
1965 | }, | 1966 | }, |
1966 | }, | 1967 | }, |
1967 | { | 1968 | { |
1969 | name: "DOGEt - Dogecoin Testnet", | ||
1970 | onSelect: function() { | ||
1971 | network = bitcoinjs.bitcoin.networks.dogecointestnet; | ||
1972 | setHdCoin(1); | ||
1973 | }, | ||
1974 | }, | ||
1975 | { | ||
1968 | name: "DXN - DEXON", | 1976 | name: "DXN - DEXON", |
1969 | onSelect: function() { | 1977 | onSelect: function() { |
1970 | network = bitcoinjs.bitcoin.networks.bitcoin; | 1978 | network = bitcoinjs.bitcoin.networks.bitcoin; |
@@ -2225,6 +2233,14 @@ | |||
2225 | }, | 2233 | }, |
2226 | }, | 2234 | }, |
2227 | { | 2235 | { |
2236 | name: "LTCt - Litecoin Testnet", | ||
2237 | onSelect: function() { | ||
2238 | network = bitcoinjs.bitcoin.networks.litecointestnet; | ||
2239 | setHdCoin(1); | ||
2240 | DOM.litecoinLtubContainer.removeClass("hidden"); | ||
2241 | }, | ||
2242 | }, | ||
2243 | { | ||
2228 | name: "LTZ - LitecoinZ", | 2244 | name: "LTZ - LitecoinZ", |
2229 | onSelect: function() { | 2245 | onSelect: function() { |
2230 | network = bitcoinjs.bitcoin.networks.litecoinz; | 2246 | network = bitcoinjs.bitcoin.networks.litecoinz; |
@@ -2768,6 +2784,13 @@ | |||
2768 | setHdCoin(121); | 2784 | setHdCoin(121); |
2769 | }, | 2785 | }, |
2770 | }, | 2786 | }, |
2787 | { | ||
2788 | name: "MONK - Monkey Project", | ||
2789 | ` onSelect: function() { | ||
2790 | network = bitcoinjs.bitcoin.networks.monkey; | ||
2791 | setHdCoin(214); | ||
2792 | }, | ||
2793 | } | ||
2771 | ] | 2794 | ] |
2772 | 2795 | ||
2773 | var clients = [ | 2796 | var clients = [ |