From: iancoleman <1281387+iancoleman@users.noreply.github.com> Date: Thu, 1 Aug 2019 00:02:07 +0000 (+1000) Subject: Merge pull request #345 from flyfoxuk/master X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=e440d504fbc80fe11366e24dccf945c43aaf52df;hp=45e40c288fe0d6cfba2c57a68f421eeb34d41385 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 2443829..b37f58f 100644 --- 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 bda124c..4fac6f1 100644 --- 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 b2c72c2..aab7df0 100644 --- 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 c21d8b5..6f9fd4f 100644 --- 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) {