Merge pull request #310 from boczeratul/master

Add definitions for DEXON (DXN)

2 files changed, 16 insertions, 1 deletions

diff --git a/src/js/index.js b/src/js/index.js
index 9e955ae..bc15559 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -917,7 +917,8 @@
                     || (networks[DOM.network.val()].name == "MUSIC - Musicoin")
                     || (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 == "CLO - Callisto")
+                    || (networks[DOM.network.val()].name == "DXN - DEXON")) {
                     var privKeyBuffer = keyPair.d.toBuffer(32);
                     privkey = privKeyBuffer.toString('hex');
                     var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
@@ -1921,6 +1922,13 @@
             },
         },
         {
+            name: "DXN - DEXON",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(237);
+            },
+        },
+        {
             name: "ECN - Ecoin",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.ecoin;
diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index ad40b95..e0b1161 100644
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1404,6 +1404,13 @@ it('Allows selection of BlockStamp', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of DEXON', function(done) {
+    var params = {
+        selectText: "DXN - DEXON",
+        firstAddress: "0x136a58788033E028CCd740FbDec6734358DB56Ec",
+    };
+    testNetwork(done, params);
+});
 
 // BIP39 seed is set from phrase
 it('Sets the bip39 seed from the prhase', function(done) {