Merge pull request #216 from Coinomi/ethereum-like

Add ETC, PIRL, CLO, MIX, MUSIC, POA, EXP, and coinomi/ledger client o…

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index d44ca0da2f3369b5f1a7a5349facba7b00ed9136..4154103c50299082663315b121c7de5b280056fe 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1056,6 +1056,17 @@ bitcoinjs.bitcoin.networks.stratis = {
   wif: 0xbf,
 };
 
+bitcoinjs.bitcoin.networks.stratistest = {
+  messagePrefix: '\x18Stratis Test Signed Message:\n',
+  bip32: {
+    public: 0x0488B21E,
+    private: 0x0488ADE4,
+  },
+  pubKeyHash: 0x41,
+  scriptHash: 0x7d,
+  wif: 0xbf,
+};
+
 bitcoinjs.bitcoin.networks.syscoin = {
   messagePrefix: '\x18Syscoin Signed Message:\n',
   bip32: {
@@ -1064,7 +1075,7 @@ bitcoinjs.bitcoin.networks.syscoin = {
   },
   pubKeyHash: 0x3f,
   scriptHash: 0x05,
-  wif: 0xbf,
+  wif: 0x80,
 };
 
 
@@ -1233,6 +1244,17 @@ bitcoinjs.bitcoin.networks.bitcoinz = {
   wif: 0x80,
 };
 
+bitcoinjs.bitcoin.networks.hush = {
+  messagePrefix: '\x18Hush Signed Message:\n',
+  bip32: {
+    public: 0x0488B21E,
+    private: 0x0488ADE4,
+  },
+  pubKeyHash: 0x1CB8,
+  scriptHash: 0x1CBD,
+  wif: 0x80,
+};
+
 bitcoinjs.bitcoin.networks.zclassic = {
   messagePrefix: '\x18Zcash Signed Message:\n',
   bip32: {
@@ -1264,4 +1286,4 @@ bitcoinjs.bitcoin.networks.energi = {
   pubKeyHash: 0x21,
   scriptHash: 0x35,
   wif: 0x6a,
-};
\ No newline at end of file
+};

diff --git a/src/js/index.js b/src/js/index.js
index 371cea9285d2b053cb1630b2d5a13792691827b5..589ba20fd891d612a0ad41bef636c45f96b23533 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1998,6 +1998,13 @@
                 network = bitcoinjs.bitcoin.networks.helleniccoin;
                 setHdCoin(168);
             },
+        },
+               {
+            name: "HUSH - Hush",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.hush;
+                setHdCoin(197);
+            },
         },
         {
             name: "INSN - Insane",
@@ -2356,6 +2363,13 @@
                 setHdCoin(105);
             },
         },
+        {
+            name: "TSTRAT - Stratis Testnet",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.stratistest;
+                setHdCoin(105);
+            },
+        },
         {
             name: "SYS - Syscoin",
             onSelect: function() {

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 0ffc73bd8d7d96ae2b43bc512fbeac228f2e7286..ddb909a6d67b2b7d6bf4152478f35294fe1f13ad 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1096,6 +1096,13 @@ it('Allows selection of Stratis', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of Stratis Test', function(done) {
+    var params = {
+        selectText: "TSTRAT - Stratis Testnet",
+        firstAddress: "TRLWm3dye4FRrDWouwYUSUZP96xb76mBE3",
+    };
+    testNetwork(done, params);
+});
 it('Allows selection of Syscoin', function(done) {
     var params = {
         selectText: "SYS - Syscoin",