Merge pull request #345 from flyfoxuk/master

Added CSC (CasinoCoin) with test

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 24438297fbc9dff88760cad717205d08a507b72d..b37f58f5255302fb4bd4f2a199cc4fec58116fe3 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1615,3 +1615,26 @@ bitcoinjs.bitcoin.networks.deeponion = {
     scriptHash: 0x4E,
     wif: 0x9F,
 };
+
+
+bitcoinjs.bitcoin.networks.cpuchain = {
+    messagePrefix: 'x18CPUchain Signed Message:\n',
+    bip32: {
+      public: 0x0488B21E,
+      private: 0x0488ADE4,
+    },
+    pubKeyHash: 0x1C,
+    scriptHash: 0x1E,
+    wif: 0x80,
+};
+
+bitcoinjs.bitcoin.networks.wagerr = {
+  messagePrefix: 'unused',
+  bip32: {
+    public: 0x022d2533,
+    private: 0x0221312b
+  },
+  pubKeyHash: 0x49,
+  scriptHash: 0x3f,
+  wif: 0xc7
+};

diff --git a/src/js/index.js b/src/js/index.js
index bda124cd3c9b4dbc2034eabd08eea553d975204f..4fac6f16c26f2321483d05342ef230ee789b0755 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1907,6 +1907,13 @@
                 setHdCoin(71);
             },
         },
+        {
+            name: "CPU - CPUchain",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.cpuchain;
+                setHdCoin(363);
+            },
+        },
         {
             name: "CRAVE - Crave",
             onSelect: function() {
@@ -2753,6 +2760,13 @@
                 setHdCoin(28);
             },
         },
+        {
+            name: "WGR - Wagerr",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.wagerr;
+                setHdCoin(7825266);
+            },
+        },
         {
             name: "WC - Wincoin",
             onSelect: function() {

diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js
index b2c72c27af0c3646f3b52644ecbdc96e733ae43c..aab7df031cd8a18c616cbc2bd7861312601b82e1 100644 (file)
--- a/src/js/segwit-parameters.js
+++ b/src/js/segwit-parameters.js
@@ -236,4 +236,30 @@ bitcoinjs.bitcoin.networks.nix.p2wpkhInP2sh = {
       scriptHash: 0x35,
       wif: 0x80,
 };
+
+bitcoinjs.bitcoin.networks.cpuchain.p2wpkh = {
+    baseNetwork: "cpuchain",
+    messagePrefix: '\x1DCPUchain Signed Message:\n',
+    bech32: 'cpu',
+    bip32: {
+        public: 0x04b24746,
+        private: 0x04b2430c
+    },
+    pubKeyHash: 0x1c,
+    scriptHash: 0x1e,
+    wif: 0x80,
+};
+
+bitcoinjs.bitcoin.networks.cpuchain.p2wpkhInP2sh = {
+    baseNetwork: "cpuchain",
+    messagePrefix: '\x1DCPUchain Signed Message:\n',
+    bech32: 'cpu',
+    bip32: {
+        public: 0x049d7cb2,
+        private: 0x049d7878
+    },
+    pubKeyHash: 0x1c,
+    scriptHash: 0x1e,
+    wif: 0x80,
+};
 })();

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index c21d8b58d06a26f49ee025d7020071c4d7b49a4c..6f9fd4fd6bc3d8a7e67c2aa0709fa9426625f3e4 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -837,6 +837,13 @@ it('Allows selection of Compcoin', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of CPUchain', function(done) {
+    var params = {
+        selectText: "CPU - CPUchain",
+        firstAddress: "CWWkTPkNRdpTDSfPw7gxUt9cEaC5PSsP3Y",
+    };
+    testNetwork(done, params);
+});
 it('Allows selection of Crave', function(done) {
     var params = {
         selectText: "CRAVE - Crave",
@@ -1544,6 +1551,13 @@ it('Allows selection of Stellar', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of Wagerr', function(done) {
+    var params = {
+        selectText: "WGR - Wagerr",
+        firstAddress: "WYiVgQU39VcQxcnacoCiaZHZZLjDCJoS95",
+    };
+    testNetwork(done, params);
+});
 
 // BIP39 seed is set from phrase
 it('Sets the bip39 seed from the prhase', function(done) {