Merge pull request #324 from jestevez/master

Add Bolivarcoin (BOLI)

diff --combined src/js/index.js
index 8dd553dccb42807098cb6ede650644533a51e329,e0d0b44452f1a5b4ad795d9e9724d4b59e4d396b..6085f1bb2824c33d27ae22827e0defcb0c0a7905
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -918,10 -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);
@@@ -1692,6 -1689,13 +1692,13 @@@
                  setHdCoin(220);
              },
          },
+         {
+             name: "BOLI - Bolivarcoin",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bolivarcoin;
+                 setHdCoin(278);
+             },
+         },
          {
              name: "BCA - Bitcoin Atom",
              onSelect: function() {
@@@ -1980,14 -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() {
@@@ -2002,14 -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 --combined tests/spec/tests.js
index 88c91a32da03bdda59d1f24b1da898d776496d47,1449c009227254cdcc3824d273eeb0b38c99e9e4..f24b4ac0930b051d546bddc06cff13af253ad772
--- 1/tests/spec/tests.js
--- 2/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -535,6 -535,13 +535,13 @@@ it('Allows selection of lkrcoin', funct
      };
      testNetwork(done, params);
  });
+ it('Allows selection of bolivarcoin', function(done) {
+     var params = {
+         selectText: "BOLI - Bolivarcoin",
+         firstAddress: "bc378wfZiuPpnXuUnhhwpXnLHqiGDQspju",
+     };
+     testNetwork(done, params);
+ });
  it('Allows selection of peercoin', function(done) {
      var params = {
          selectText: "PPC - Peercoin",
@@@ -1434,20 -1441,6 +1441,20 @@@ it('Allows selection of DEXON', functio
      };
      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) {