Merge pull request #323 from ellaism/ella-support

add Ellaism(ELLA) suppport

diff --git a/src/js/index.js b/src/js/index.js
index 67dde1c25ff0c534c86b86574841a40221a4ef94..8dd553dccb42807098cb6ede650644533a51e329 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -919,6 +919,7 @@
                     || (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 == "ELLA - Ellaism")
                     || (networks[DOM.network.val()].name == "ESN - Ethersocial Network")
                 ) {
                     var privKeyBuffer = keyPair.d.toBuffer(32);
@@ -1979,6 +1980,14 @@
                 setHdCoin(78);
             },
         },
+        {
+            name: "ELLA - Ellaism",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(163);
+            },
+        },
         {
             name: "EMC2 - Einsteinium",
             onSelect: function() {

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 83fc949bc990b1c1ca7cf13497d4a763542d4cc2..88c91a32da03bdda59d1f24b1da898d776496d47 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1434,6 +1434,13 @@ 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",