From: iancoleman <1281387+iancoleman@users.noreply.github.com> Date: Mon, 27 Apr 2020 23:25:55 +0000 (+1000) Subject: Merge pull request #416 from Argoneum/argoneum X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=d359fe64b2f43f59714815d7ec5e1c82de50afd0;hp=-c Merge pull request #416 from Argoneum/argoneum Add Argoneum (v1.4.1 or above) --- d359fe64b2f43f59714815d7ec5e1c82de50afd0 diff --combined src/js/bitcoinjs-extensions.js index 7446bd7,1ef2aa4..e331c24 --- a/src/js/bitcoinjs-extensions.js +++ b/src/js/bitcoinjs-extensions.js @@@ -1739,17 -1739,6 +1739,17 @@@ libs.bitcoin.networks.elastos = wif: 0xef // TODO set this correctly, same as BTC for now }; +libs.bitcoin.networks.sugarchain = { + messagePrefix: '\x18Sugarchain Signed Message:\n', + bip32: { + public: 0x0488B21E, + private: 0x0488ADE4, + }, + pubKeyHash: 0x3f, + scriptHash: 0x7d, + wif: 0x80 +}; + // https://github.com/libs.bitcoinjs-lib/blob/3f6f5ef97a1ee1b8337865209282c0095e22b2e7/src/networks.js libs.bitcoin.networks.regtest = { messagePrefix: '\x18Bitcoin Signed Message:\n', @@@ -1762,3 -1751,14 +1762,14 @@@ scriptHash: 0xc4, wif: 0xef, }; + + libs.bitcoin.networks.argoneum = { + messagePrefix: 'unused', + bip32: { + public: 0x0488b21e, + private: 0x0488ade4 + }, + pubKeyHash: 0x32, + scriptHash: 0x61, + wif: 0xbf + }; diff --combined src/js/index.js index 841a27f,f711818..0471e86 --- a/src/js/index.js +++ b/src/js/index.js @@@ -2030,6 -2030,13 +2030,13 @@@ setHdCoin(161); }, }, + { + name: "AGM - Argoneum", + onSelect: function() { + network = libs.bitcoin.networks.argoneum; + setHdCoin(421); + }, + }, { name: "ARYA - Aryacoin", onSelect: function() { @@@ -3091,13 -3098,6 +3098,13 @@@ setHdCoin(105); }, }, + { + name: "SUGAR - Sugarchain", + onSelect: function() { + network = libs.bitcoin.networks.sugarchain; + setHdCoin(408); + }, + }, { name: "SWTC - Jingtum", onSelect: function() { diff --combined tests/spec/tests.js index d9a1843,1b92915..e7c81bc --- a/tests/spec/tests.js +++ b/tests/spec/tests.js @@@ -1675,16 -1675,6 +1675,16 @@@ it('Allows selection of Stratis Test', }; testNetwork(done, params); }); +it('Allows selection of Sugarchain', function(done) { + var params = { + selectText: "SUGAR - Sugarchain", + phrase: "abandon abandon ability", + firstAddress: "SYnd31fYr39VgKju87Vz1sYBmEeHg5cudk", + firstPubKey: "035bc9fa22eff2246ec07bb09c9e32f5f9fee517b4f49a8f117508f8fb41905b25", + firstPrivKey: "L2G3axGdZv5EV8osAsBPMese74i4dTHaGvxDh7DsRF5Ky6hKkPDY", + }; + testNetwork(done, params); +}); it('Allows selection of Syscoin', function(done) { var params = { selectText: "SYS - Syscoin", @@@ -2226,6 -2216,16 +2226,16 @@@ it('Allows selection of tRBTC - RSK Tes }; testNetwork(done, params); }); + it('Allows selection of Argoneum', function(done) { + var params = { + selectText: "AGM - Argoneum", + phrase: "abandon abandon ability", + firstAddress: "MWgLPvJkaJwH6hrXFs1MimAC4FwC1kYRhe", + firstPubKey: "0348e5252045fee1d3b1e5bce25dbc16284d5b6c3bfff9c305d4ffa6078c16f3f8", + firstPrivKey: "VJXpuMEFnK8USLyo5tgF7M4cBXU44U8MUor1KRTQ6t9DVno9AAgg", + }; + testNetwork(done, params); + }); // BIP39 seed is set from phrase it('Sets the bip39 seed from the prhase', function(done) {