Merge branch 'master' into master

diff --git a/changelog.md b/changelog.md
index 39a1531bb087775ebb76b4f0a5ef1fe621641f5c..29a2b6f88931e48187d32ea2b5977dd97b66d007 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+# 0.3.13
+
+* Add Thought network
+
 # 0.3.12
 
 * Fix typos

diff --git a/src/index.html b/src/index.html
index 096274de2c6c403a19796e2899cdbc33547d8fd9..b669addf7e28ad2bb0e169d920ec4fcbedd9dd3d 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.12</p>
+            <p class="version">v0.3.13</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 b6d2de68a0729fad813d1dd155b4c9440afead14..4536783b877b903bff5e3639261d4727f33e771a 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1717,6 +1717,17 @@ bitcoinjs.bitcoin.networks.aryacoin = {
   wif: 0x97
 };
 
+bitcoinjs.bitcoin.networks.thought = {
+  messagePrefix: 'unused',
+  bip32: {
+    public: 0xFbC6A00D,
+    private: 0x5AEBD8C6
+  },
+  pubKeyHash: 0x07,
+  scriptHash: 0x09,
+  wif: 0x7B
+};
+
 bitcoinjs.bitcoin.networks.elastos = {
     messagePrefix: 'unused',
     bip32: {

diff --git a/src/js/index.js b/src/js/index.js
index 23eaa4700e4ce016dab4c5d13211d9d1d27e6c06..9807449b0758bbe13192cfe462d2e5a87f4aeae1 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2959,6 +2959,13 @@
                 setHdCoin(113);
             },
         },
+        {
+            name: "THT - Thought",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.thought;
+                setHdCoin(1618);
+            },
+        },
         {
             name: "TOA - Toa",
             onSelect: function() {