Merge branch 'master' into master

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 3d0c6bd5fc8d4c375c791067fd5f49f19fd5619e..b37f58f5255302fb4bd4f2a199cc4fec58116fe3 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1616,6 +1616,18 @@ bitcoinjs.bitcoin.networks.deeponion = {
     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: {

diff --git a/src/js/index.js b/src/js/index.js
index 544e67d19e1ba31b1120cc45364796daae01b108..3afa598b39238553cd1dfc926f4ecf82e3660a00 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1902,6 +1902,13 @@
                 setHdCoin(71);
             },
         },
+        {
+            name: "CPU - CPUchain",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.cpuchain;
+                setHdCoin(363);
+            },
+        },
         {
             name: "CRAVE - Crave",
             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 5e65714c96957a42d7582517a9a5e33cbcd4677f..91a9bec33dbac310ec1d67d0dc3aabd1dccca2c9 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -829,6 +829,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",