Merge pull request #238 from stashpayio/stash

Stash

diff --git a/changelog.md b/changelog.md
index 670e93ec4b340607b48a915e8e4412a5f26e12ba..61d474cc7c7b781258ae095182d173274b18e5db 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+# 0.3.8s
+
+* Add Stash network 
+
 # 0.3.8
 
 * Add p2wpkh for litecoin

diff --git a/src/index.html b/src/index.html
index 917813a25d44bc37c4c0fc7fbdc94b9c97f001ff..203e6e29867f0041387e222a4c302a7eeeabeead 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -15,7 +15,7 @@
         <div class="container">
 
             <h1 class="text-center">Mnemonic Code Converter</h1>
-            <p class="version">v0.3.8</p>
+            <p class="version">v0.3.8s</p>
             <hr>
             <div class="row">
                 <div class="col-md-12">

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 8744142cd4d783e6de9cc25a703432f71d8262dd..06ad221dd4796f286e154a4c6d6636511933b075 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1045,6 +1045,28 @@ bitcoinjs.bitcoin.networks.solarcoin = {
   wif: 0x92,
 };
 
+bitcoinjs.bitcoin.networks.stash = {
+  messagePrefix: '\x18Stash Signed Message:\n',
+  bip32: {
+    public: 0x0488b21e,
+    private: 0x0488ade4
+  },
+  pubKeyHash: 0x4c,
+  scriptHash: 0x10,
+  wif: 0xcc
+};
+
+bitcoinjs.bitcoin.networks.stashtn = {
+  messagePrefix: '\x18Stash Test Signed Message:\n',
+  bip32: {
+    public: 0x043587cf,
+    private: 0x04358394
+  },
+  pubKeyHash: 0x8c,
+  scriptHash: 0x13,
+  wif: 0xef
+};
+
 bitcoinjs.bitcoin.networks.stratis = {
   messagePrefix: '\x18Stratis Signed Message:\n',
   bip32: {

diff --git a/src/js/index.js b/src/js/index.js
index 589ba20fd891d612a0ad41bef636c45f96b23533..16c5cef5ce1da2837167f64650e843c46102a791 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2356,6 +2356,20 @@
                 setHdCoin(59);
             },
         },
+        {
+            name: "STASH - Stash",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.stash;
+                setHdCoin(0xC0C0);
+            },
+        },
+        {
+            name: "STASH - Stash Testnet",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.stashtn;
+                setHdCoin(0xCAFE);
+            },
+        },
         {
             name: "STRAT - Stratis",
             onSelect: function() {

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 6208bfcd78bc9aba7deec7c41de0388dbc33cb5b..0570514021917db9e9be7daff8e7edc1c668cd9d 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1089,6 +1089,20 @@ it('Allows selection of Solarcoin', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of stash', function(done) {
+    var params = {
+        selectText: "STASH - Stash",
+        firstAddress: "XxwAsWB7REDKmAvHA85SbEZQQtpxeUDxS3",
+    };
+    testNetwork(done, params);
+});
+it('Allows selection of stash testnet', function(done) {
+    var params = {
+        selectText: "STASH - Stash Testnet",
+        firstAddress: "YdbhtMuGsPSkE6bPdNTHoFSszQKmK4S5LT",
+    };
+    testNetwork(done, params);
+});
 it('Allows selection of Stratis', function(done) {
     var params = {
         selectText: "STRAT - Stratis",