diff options
author | iancoleman <1281387+iancoleman@users.noreply.github.com> | 2019-04-30 11:07:12 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-30 11:07:12 +1000 |
commit | 8cb07685fd1faf519cb1b02024b7320d0c19ce4b (patch) | |
tree | 5881082a1fe9f35b5829306fb0853548232d5650 /src/js | |
parent | 2885ddd5f7d6dbe6211fd699e58ce0da6ac6295c (diff) | |
parent | 81a5a871d9dffd191c6f25aa9e7303f4b390819c (diff) | |
download | BIP39-8cb07685fd1faf519cb1b02024b7320d0c19ce4b.tar.gz BIP39-8cb07685fd1faf519cb1b02024b7320d0c19ce4b.tar.zst BIP39-8cb07685fd1faf519cb1b02024b7320d0c19ce4b.zip |
Merge branch 'master' into ella-support
Diffstat (limited to 'src/js')
-rw-r--r-- | src/js/index.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/js/index.js b/src/js/index.js index 6428aa7..8dd553d 100644 --- a/src/js/index.js +++ b/src/js/index.js | |||
@@ -920,6 +920,7 @@ | |||
920 | || (networks[DOM.network.val()].name == "CLO - Callisto") | 920 | || (networks[DOM.network.val()].name == "CLO - Callisto") |
921 | || (networks[DOM.network.val()].name == "DXN - DEXON") | 921 | || (networks[DOM.network.val()].name == "DXN - DEXON") |
922 | || (networks[DOM.network.val()].name == "ELLA - Ellaism") | 922 | || (networks[DOM.network.val()].name == "ELLA - Ellaism") |
923 | || (networks[DOM.network.val()].name == "ESN - Ethersocial Network") | ||
923 | ) { | 924 | ) { |
924 | var privKeyBuffer = keyPair.d.toBuffer(32); | 925 | var privKeyBuffer = keyPair.d.toBuffer(32); |
925 | privkey = privKeyBuffer.toString('hex'); | 926 | privkey = privKeyBuffer.toString('hex'); |
@@ -2002,6 +2003,14 @@ | |||
2002 | }, | 2003 | }, |
2003 | }, | 2004 | }, |
2004 | { | 2005 | { |
2006 | name: "ESN - Ethersocial Network", | ||
2007 | segwitAvailable: false, | ||
2008 | onSelect: function() { | ||
2009 | network = bitcoinjs.bitcoin.networks.bitcoin; | ||
2010 | setHdCoin(31102); | ||
2011 | }, | ||
2012 | }, | ||
2013 | { | ||
2005 | name: "ETC - Ethereum Classic", | 2014 | name: "ETC - Ethereum Classic", |
2006 | segwitAvailable: false, | 2015 | segwitAvailable: false, |
2007 | onSelect: function() { | 2016 | onSelect: function() { |