Merge pull request #397 from aitorp6/master

Added DeepOnion Segwit parameters

diff --git a/src/js/index.js b/src/js/index.js
index 92772f6840013a41e1f08ef6ae34b6c5de4163c8..102c7c5fb70435d93990799305fe0fe5e5e7f412 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1838,6 +1838,7 @@
                     || (name == "ELLA - Ellaism")
                     || (name == "ESN - Ethersocial Network")
                     || (name == "VET - VeChain")
+                    || (name == "ERE - EtherCore")
     }
 
     function networkHasSegwit() {
@@ -2417,6 +2418,14 @@
                 setHdCoin(194);
             },
         },
+        {
+            name: "ERE - EtherCore",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = libs.bitcoin.networks.bitcoin;
+                setHdCoin(466);
+            },
+        },
         {
             name: "ESN - Ethersocial Network",
             segwitAvailable: false,
@@ -2947,6 +2956,20 @@
                 setHdCoin(175);
             },
         },
+        {
+            name: "RBTC - RSK",
+            onSelect: function() {
+                network = libs.bitcoin.networks.rubycoin;
+                setHdCoin(137);
+            },
+        },
+        {
+            name: "tRBTC - RSK Testnet",
+            onSelect: function() {
+                network = libs.bitcoin.networks.rubycoin;
+                setHdCoin(37310);
+            },
+        },
         {
             name: "RBY - Rubycoin",
             onSelect: function() {

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 0e85eccf8ac96736e9fb7bcc558dcfaa56d3cc6e..62647d2663640b7bfae798ed5d3358630dc755db 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1635,6 +1635,13 @@ it('Allows selection of Thought', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of EtherCore', function(done) {
+    var params = {
+        selectText: "ERE - EtherCore",
+        firstAddress: "0xDeeAD0297F06dfe6c7Ad0C1D0CF5B06D6047bEEe",
+    };
+    testNetwork(done, params);
+});
 
 // BIP39 seed is set from phrase
 it('Sets the bip39 seed from the prhase', function(done) {