diff options
author | iancoleman <1281387+iancoleman@users.noreply.github.com> | 2018-08-14 09:02:29 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-14 09:02:29 +1000 |
commit | c1a5e79c5fdb556f2cedfeba583ccafb5a997373 (patch) | |
tree | 31c5317e6b14e80f36f48390aca783a6e0204531 | |
parent | e47cd1970f7f40ede6a97fb284df1701a3f252e5 (diff) | |
parent | 3eee87560ba28593ee82637b5d981b038689d629 (diff) | |
download | BIP39-c1a5e79c5fdb556f2cedfeba583ccafb5a997373.tar.gz BIP39-c1a5e79c5fdb556f2cedfeba583ccafb5a997373.tar.zst BIP39-c1a5e79c5fdb556f2cedfeba583ccafb5a997373.zip |
Merge pull request #238 from stashpayio/stash
Stash
-rw-r--r-- | changelog.md | 4 | ||||
-rw-r--r-- | src/index.html | 2 | ||||
-rw-r--r-- | src/js/bitcoinjs-extensions.js | 22 | ||||
-rw-r--r-- | src/js/index.js | 14 | ||||
-rw-r--r-- | tests/spec/tests.js | 14 |
5 files changed, 55 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md index 670e93e..61d474c 100644 --- a/changelog.md +++ b/changelog.md | |||
@@ -1,3 +1,7 @@ | |||
1 | # 0.3.8s | ||
2 | |||
3 | * Add Stash network | ||
4 | |||
1 | # 0.3.8 | 5 | # 0.3.8 |
2 | 6 | ||
3 | * Add p2wpkh for litecoin | 7 | * Add p2wpkh for litecoin |
diff --git a/src/index.html b/src/index.html index 917813a..203e6e2 100644 --- a/src/index.html +++ b/src/index.html | |||
@@ -15,7 +15,7 @@ | |||
15 | <div class="container"> | 15 | <div class="container"> |
16 | 16 | ||
17 | <h1 class="text-center">Mnemonic Code Converter</h1> | 17 | <h1 class="text-center">Mnemonic Code Converter</h1> |
18 | <p class="version">v0.3.8</p> | 18 | <p class="version">v0.3.8s</p> |
19 | <hr> | 19 | <hr> |
20 | <div class="row"> | 20 | <div class="row"> |
21 | <div class="col-md-12"> | 21 | <div class="col-md-12"> |
diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js index 8744142..06ad221 100644 --- a/src/js/bitcoinjs-extensions.js +++ b/src/js/bitcoinjs-extensions.js | |||
@@ -1045,6 +1045,28 @@ bitcoinjs.bitcoin.networks.solarcoin = { | |||
1045 | wif: 0x92, | 1045 | wif: 0x92, |
1046 | }; | 1046 | }; |
1047 | 1047 | ||
1048 | bitcoinjs.bitcoin.networks.stash = { | ||
1049 | messagePrefix: '\x18Stash Signed Message:\n', | ||
1050 | bip32: { | ||
1051 | public: 0x0488b21e, | ||
1052 | private: 0x0488ade4 | ||
1053 | }, | ||
1054 | pubKeyHash: 0x4c, | ||
1055 | scriptHash: 0x10, | ||
1056 | wif: 0xcc | ||
1057 | }; | ||
1058 | |||
1059 | bitcoinjs.bitcoin.networks.stashtn = { | ||
1060 | messagePrefix: '\x18Stash Test Signed Message:\n', | ||
1061 | bip32: { | ||
1062 | public: 0x043587cf, | ||
1063 | private: 0x04358394 | ||
1064 | }, | ||
1065 | pubKeyHash: 0x8c, | ||
1066 | scriptHash: 0x13, | ||
1067 | wif: 0xef | ||
1068 | }; | ||
1069 | |||
1048 | bitcoinjs.bitcoin.networks.stratis = { | 1070 | bitcoinjs.bitcoin.networks.stratis = { |
1049 | messagePrefix: '\x18Stratis Signed Message:\n', | 1071 | messagePrefix: '\x18Stratis Signed Message:\n', |
1050 | bip32: { | 1072 | bip32: { |
diff --git a/src/js/index.js b/src/js/index.js index 589ba20..16c5cef 100644 --- a/src/js/index.js +++ b/src/js/index.js | |||
@@ -2357,6 +2357,20 @@ | |||
2357 | }, | 2357 | }, |
2358 | }, | 2358 | }, |
2359 | { | 2359 | { |
2360 | name: "STASH - Stash", | ||
2361 | onSelect: function() { | ||
2362 | network = bitcoinjs.bitcoin.networks.stash; | ||
2363 | setHdCoin(0xC0C0); | ||
2364 | }, | ||
2365 | }, | ||
2366 | { | ||
2367 | name: "STASH - Stash Testnet", | ||
2368 | onSelect: function() { | ||
2369 | network = bitcoinjs.bitcoin.networks.stashtn; | ||
2370 | setHdCoin(0xCAFE); | ||
2371 | }, | ||
2372 | }, | ||
2373 | { | ||
2360 | name: "STRAT - Stratis", | 2374 | name: "STRAT - Stratis", |
2361 | onSelect: function() { | 2375 | onSelect: function() { |
2362 | network = bitcoinjs.bitcoin.networks.stratis; | 2376 | network = bitcoinjs.bitcoin.networks.stratis; |
diff --git a/tests/spec/tests.js b/tests/spec/tests.js index 6208bfc..0570514 100644 --- a/tests/spec/tests.js +++ b/tests/spec/tests.js | |||
@@ -1089,6 +1089,20 @@ it('Allows selection of Solarcoin', function(done) { | |||
1089 | }; | 1089 | }; |
1090 | testNetwork(done, params); | 1090 | testNetwork(done, params); |
1091 | }); | 1091 | }); |
1092 | it('Allows selection of stash', function(done) { | ||
1093 | var params = { | ||
1094 | selectText: "STASH - Stash", | ||
1095 | firstAddress: "XxwAsWB7REDKmAvHA85SbEZQQtpxeUDxS3", | ||
1096 | }; | ||
1097 | testNetwork(done, params); | ||
1098 | }); | ||
1099 | it('Allows selection of stash testnet', function(done) { | ||
1100 | var params = { | ||
1101 | selectText: "STASH - Stash Testnet", | ||
1102 | firstAddress: "YdbhtMuGsPSkE6bPdNTHoFSszQKmK4S5LT", | ||
1103 | }; | ||
1104 | testNetwork(done, params); | ||
1105 | }); | ||
1092 | it('Allows selection of Stratis', function(done) { | 1106 | it('Allows selection of Stratis', function(done) { |
1093 | var params = { | 1107 | var params = { |
1094 | selectText: "STRAT - Stratis", | 1108 | selectText: "STRAT - Stratis", |