Merge pull request #324 from jestevez/master

Add Bolivarcoin (BOLI)

diff --git a/src/js/index.js b/src/js/index.js
index e0d0b44452f1a5b4ad795d9e9724d4b59e4d396b..6085f1bb2824c33d27ae22827e0defcb0c0a7905 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -918,7 +918,10 @@
                     || (networks[DOM.network.val()].name == "POA - Poa")
                     || (networks[DOM.network.val()].name == "EXP - Expanse")
                     || (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 == "ESN - Ethersocial Network")
+                ) {
                     var privKeyBuffer = keyPair.d.toBuffer(32);
                     privkey = privKeyBuffer.toString('hex');
                     var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
@@ -1984,6 +1987,14 @@
                 setHdCoin(78);
             },
         },
+        {
+            name: "ELLA - Ellaism",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(163);
+            },
+        },
         {
             name: "EMC2 - Einsteinium",
             onSelect: function() {
@@ -1998,6 +2009,14 @@
                 setHdCoin(151);
             },
         },
+        {
+            name: "ESN - Ethersocial Network",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(31102);
+            },
+        },
         {
             name: "ETC - Ethereum Classic",
             segwitAvailable: false,

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 1449c009227254cdcc3824d273eeb0b38c99e9e4..f24b4ac0930b051d546bddc06cff13af253ad772 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1441,6 +1441,20 @@ it('Allows selection of DEXON', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of Ellaism', function(done) {
+    var params = {
+        selectText: "ELLA - Ellaism",
+        firstAddress: "0xa8B0BeA09eeBc41062308546a01d6E544277e2Ca",
+    };
+    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
 it('Sets the bip39 seed from the prhase', function(done) {