nexus/bip39
2
0
Fork 0
mirror of https://github.com/OneKeyHQ/bip39.git synced 2026-04-18 08:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ella-support

Browse Source
This commit is contained in:
iancoleman
2019-04-30 11:07:12 +10:00
committed by GitHub
parent 2885ddd5f7 81a5a871d9
commit 8cb07685fd
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/index.js
View File

@@ -920,6 +920,7 @@
|| (networks[DOM.network.val()].name == "CLO - Callisto") || (networks[DOM.network.val()].name == "CLO - Callisto")
|| (networks[DOM.network.val()].name == "DXN - DEXON") || (networks[DOM.network.val()].name == "DXN - DEXON")
|| (networks[DOM.network.val()].name == "ELLA - Ellaism") || (networks[DOM.network.val()].name == "ELLA - Ellaism")
|| (networks[DOM.network.val()].name == "ESN - Ethersocial Network")
) { ) {
var privKeyBuffer = keyPair.d.toBuffer(32); var privKeyBuffer = keyPair.d.toBuffer(32);
privkey = privKeyBuffer.toString('hex'); privkey = privKeyBuffer.toString('hex');
@@ -2001,6 +2002,14 @@
setHdCoin(151); setHdCoin(151);
}, },
}, },
{
name: "ESN - Ethersocial Network",
segwitAvailable: false,
onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(31102);
},
},
{ {
name: "ETC - Ethereum Classic", name: "ETC - Ethereum Classic",
segwitAvailable: false, segwitAvailable: false,

7
tests/spec/tests.js
View File

@@ -1441,6 +1441,13 @@ it('Allows selection of Ellaism', function(done) {
}; };
testNetwork(done, params); testNetwork(done, params);
}); });
it('Allows selection of Ethersocial Network', function(done) {
var params = {
selectText: "ESN - Ethersocial Network",
firstAddress: "0x6EE99Be2A0C7F887a71e21C8608ACF0aa0D2b767",
};
testNetwork(done, params);
});
// BIP39 seed is set from phrase // BIP39 seed is set from phrase
it('Sets the bip39 seed from the prhase', function(done) { it('Sets the bip39 seed from the prhase', function(done) {