From 497fcf0e4863138ecdad1b13c9d204310a2598a6 Mon Sep 17 00:00:00 2001 From: Pawel Cioch Date: Wed, 20 Feb 2019 10:26:02 -0600 Subject: [PATCH 1/3] deimos not present commenting out --- src/js/segwit-parameters.js | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js index 8a3557e..f7f9220 100644 --- a/src/js/segwit-parameters.js +++ b/src/js/segwit-parameters.js @@ -184,29 +184,29 @@ bitcoinjs.bitcoin.networks.digibyte.p2wpkhInP2sh = { scriptHash: 0x3f, wif: 0x80 }; - bitcoinjs.bitcoin.networks.deimos.p2wpkh = { - baseNetwork: "deimos", - messagePrefix: '\x18Deimos Signed Message:\n', - bech32: 'dei', - bip32: { - public: 0x0488B21E, - private: 0x0488ADE4 - }, - pubKeyHash: 0x1f, - scriptHash: 0x21, - wif: 0x8a -}; - -bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = { - baseNetwork: "deimos", - messagePrefix: '\x18Deimos Signed Message:\n', - bech32: 'dei', - bip32: { - public: 0x0488B21E, - private: 0x0488ADE4 - }, - pubKeyHash: 0x1f, - scriptHash: 0x21, - wif: 0x8a -}; +// bitcoinjs.bitcoin.networks.deimos.p2wpkh = { +// baseNetwork: "deimos", +// messagePrefix: '\x18Deimos Signed Message:\n', +// bech32: 'dei', +// bip32: { +// public: 0x0488B21E, +// private: 0x0488ADE4 +// }, +// pubKeyHash: 0x1f, +// scriptHash: 0x21, +// wif: 0x8a +//}; +// +//bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = { +// baseNetwork: "deimos", +// messagePrefix: '\x18Deimos Signed Message:\n', +// bech32: 'dei', +// bip32: { +// public: 0x0488B21E, +// private: 0x0488ADE4 +// }, +// pubKeyHash: 0x1f, +// scriptHash: 0x21, +// wif: 0x8a +//}; })(); From f22f7677a6070e2cbb5aa6d1bf0f672c95083ed4 Mon Sep 17 00:00:00 2001 From: Pawel Cioch Date: Wed, 20 Feb 2019 10:41:11 -0600 Subject: [PATCH 2/3] Added BST - BlockStamp --- src/js/bitcoinjs-extensions.js | 11 +++++++++++ src/js/index.js | 7 +++++++ src/js/segwit-parameters.js | 27 +++++++++++++++++++++++++++ tests/spec/tests.js | 7 +++++++ 4 files changed, 52 insertions(+) diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js index b20d6df..ead1660 100644 --- a/src/js/bitcoinjs-extensions.js +++ b/src/js/bitcoinjs-extensions.js @@ -1485,4 +1485,15 @@ bitcoinjs.bitcoin.networks.litecoinz = { pubKeyHash: 0x0AB3, scriptHash: 0x0AB8, wif: 0x80, +}; + +bitcoinjs.bitcoin.networks.blockstamp = { + messagePrefix: '\x18BlockStamp Signed Message:\n', + bip32: { + public: 0x0488B21E, + private: 0x0488ADE4, + }, + pubKeyHash: 0x00, + scriptHash: 0x05, + wif: 0x80, }; \ No newline at end of file diff --git a/src/js/index.js b/src/js/index.js index cbe0255..affcc61 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -1729,6 +1729,13 @@ network = bitcoinjs.bitcoin.networks.bitsend; setHdCoin(91); }, + }, + { + name: "BST - BlockStamp", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.blockstamp; + setHdCoin(254); + }, }, { name: "BTA - Bata", diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js index f7f9220..14b5569 100644 --- a/src/js/segwit-parameters.js +++ b/src/js/segwit-parameters.js @@ -184,6 +184,33 @@ bitcoinjs.bitcoin.networks.digibyte.p2wpkhInP2sh = { scriptHash: 0x3f, wif: 0x80 }; + +bitcoinjs.bitcoin.networks.blockstamp.p2wpkh = { + baseNetwork: "blockstamp", + messagePrefix: '\x18BlockStamp Signed Message:\n', + bech32: 'bc', + bip32: { + public: 0x0488B21E, + private: 0x0488ADE4, + }, + pubKeyHash: 0x00, + scriptHash: 0x05, + wif: 0x80, +}; + +bitcoinjs.bitcoin.networks.blockstamp.p2wpkhInP2sh = { + baseNetwork: "blockstamp", + messagePrefix: '\x18BlockStamp Signed Message:\n', + bech32: 'bc', + bip32: { + public: 0x0488B21E, + private: 0x0488ADE4, + }, + pubKeyHash: 0x00, + scriptHash: 0x05, + wif: 0x80, +}; + // bitcoinjs.bitcoin.networks.deimos.p2wpkh = { // baseNetwork: "deimos", // messagePrefix: '\x18Deimos Signed Message:\n', diff --git a/tests/spec/tests.js b/tests/spec/tests.js index 6718a0e..dcc9b0a 100644 --- a/tests/spec/tests.js +++ b/tests/spec/tests.js @@ -1390,6 +1390,13 @@ it('Allows selection of LitecoinZ', function(done) { }; testNetwork(done, params); }); +it('Allows selection of BlockStamp', function(done) { + var params = { + selectText: "BST - BlockStamp", + firstAddress: "15gypKtim4cVTj137ApfryG17RkvSbPazZ", + }; + testNetwork(done, params); +}); // BIP39 seed is set from phrase it('Sets the bip39 seed from the prhase', function(done) { From d2be7b6fd681a2247a155205e75a9903f5554f9b Mon Sep 17 00:00:00 2001 From: Pawel Cioch Date: Thu, 21 Feb 2019 21:56:59 -0600 Subject: [PATCH 3/3] restored deimos per project owner request https://github.com/iancoleman/bip39/pull/296#issuecomment-466240668 --- src/js/segwit-parameters.js | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js index 14b5569..f935c5d 100644 --- a/src/js/segwit-parameters.js +++ b/src/js/segwit-parameters.js @@ -211,29 +211,29 @@ bitcoinjs.bitcoin.networks.blockstamp.p2wpkhInP2sh = { wif: 0x80, }; -// bitcoinjs.bitcoin.networks.deimos.p2wpkh = { -// baseNetwork: "deimos", -// messagePrefix: '\x18Deimos Signed Message:\n', -// bech32: 'dei', -// bip32: { -// public: 0x0488B21E, -// private: 0x0488ADE4 -// }, -// pubKeyHash: 0x1f, -// scriptHash: 0x21, -// wif: 0x8a -//}; -// -//bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = { -// baseNetwork: "deimos", -// messagePrefix: '\x18Deimos Signed Message:\n', -// bech32: 'dei', -// bip32: { -// public: 0x0488B21E, -// private: 0x0488ADE4 -// }, -// pubKeyHash: 0x1f, -// scriptHash: 0x21, -// wif: 0x8a -//}; + bitcoinjs.bitcoin.networks.deimos.p2wpkh = { + baseNetwork: "deimos", + messagePrefix: '\x18Deimos Signed Message:\n', + bech32: 'dei', + bip32: { + public: 0x0488B21E, + private: 0x0488ADE4 + }, + pubKeyHash: 0x1f, + scriptHash: 0x21, + wif: 0x8a +}; + +bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = { + baseNetwork: "deimos", + messagePrefix: '\x18Deimos Signed Message:\n', + bech32: 'dei', + bip32: { + public: 0x0488B21E, + private: 0x0488ADE4 + }, + pubKeyHash: 0x1f, + scriptHash: 0x21, + wif: 0x8a +}; })();