Fix to enable Bitcoin segwit. Update to V1.1.0

Coinomi · Mar 23, 2020 · e78a713 · e78a713
1 parent 66f0847
commit e78a713
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 47 deletions.
diff --git a/bip39-standalone.html b/bip39-standalone.html
@@ -6890,7 +6890,7 @@
 		</div>
         <div class="container">
             <h1 class="text-center">Mnemonic Code Converter</h1>
-            <p class="version">v1.0.1</p>
+            <p class="version">v1.1.0</p>
             <hr>
             <div class="row">
                 <div class="col-md-12">
@@ -7686,6 +7686,11 @@ <h2>Offline Usage</h2>
                     Double-click that file to open it in a browser
                     on any offline computer.
                     </p>
+					<p>
+					<span>Alternatively, download the file from the repository</span>
+					-
+					<a href="https://github.com/Coinomi/bip39-coinomi/releases">https://github.com/Coinomi/bip39-coinomi/releases</a>
+					</p>
                 </div>
             </div>
 
@@ -42001,19 +42006,7 @@ <h2>This project is 100% open-source code</h2>
 }).call(this,require("buffer").Buffer)
 },{"bs58check":83,"buffer":5}]},{},[34])(34)
 });</script>
-        <script>bitcoinjs.bitcoin.networks.groestlcoin = {
-  messagePrefix: '\x1cGroestlCoin Signed Message:\n',
-  bech32: 'grs',
-  bip32: {
-    public: 0x0488b21e,
-    private: 0x0488ade4
-  },
-  pubKeyHash: 0x24,
-  scriptHash: 0x05,
-  wif: 0x80
-};
-
-bitcoinjs.bitcoin.networks.decred = {
+        <script>bitcoinjs.bitcoin.networks.decred = {
   messagePrefix: 'unused',
   bip32: {
     public: 0x02fda926,
@@ -69956,28 +69949,30 @@ <h2>This project is 100% open-source code</h2>
 
 // p2wpkh
 
-bitcoinjs.bitcoin.networks.groestlcoin.p2wpkh = {
-    baseNetwork: "groestlcoin",
-    messagePrefix: '\x1cGroestlCoin Signed Message:\n',
-    bech32: 'grs',
+bitcoinjs.bitcoin.networks.bitcoin.p2wpkh = {
+    baseNetwork: "bitcoin",
+    messagePrefix: '\x18Bitcoin Signed Message:\n',
+    bech32: 'bc',
     bip32: {
         public: 0x04b24746,
         private: 0x04b2430c
     },
-    pubKeyHash: 0x24,
+    pubKeyHash: 0x00,
     scriptHash: 0x05,
     wif: 0x80
 };
 
-bitcoinjs.bitcoin.networks.groestlcoin.p2wpkhInP2sh = {
-    baseNetwork: "groestlcoin",
-    messagePrefix: '\x1cGroestlCoin Signed Message:\n',
-    bech32: 'grs',
+// p2wpkh in p2sh
+
+bitcoinjs.bitcoin.networks.bitcoin.p2wpkhInP2sh = {
+    baseNetwork: "bitcoin",
+    messagePrefix: '\x18Bitcoin Signed Message:\n',
+    bech32: 'bc',
     bip32: {
         public: 0x049d7cb2,
         private: 0x049d7878
     },
-    pubKeyHash: 0x24,
+    pubKeyHash: 0x00,
     scriptHash: 0x05,
     wif: 0x80
 };

diff --git a/src/index.html b/src/index.html
@@ -17,7 +17,7 @@
 		</div>
         <div class="container">
             <h1 class="text-center">Mnemonic Code Converter</h1>
-            <p class="version">v1.0.1</p>
+            <p class="version">v1.1.0</p>
             <hr>
             <div class="row">
                 <div class="col-md-12">
@@ -813,6 +813,11 @@ <h2>Offline Usage</h2>
                     Double-click that file to open it in a browser
                     on any offline computer.
                     </p>
+					<p>
+					<span>Alternatively, download the file from the repository</span>
+					-
+					<a href="https://github.com/Coinomi/bip39-coinomi/releases">https://github.com/Coinomi/bip39-coinomi/releases</a>
+					</p>
                 </div>
             </div>
 

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
@@ -1,15 +1,3 @@
-bitcoinjs.bitcoin.networks.groestlcoin = {
-  messagePrefix: '\x1cGroestlCoin Signed Message:\n',
-  bech32: 'grs',
-  bip32: {
-    public: 0x0488b21e,
-    private: 0x0488ade4
-  },
-  pubKeyHash: 0x24,
-  scriptHash: 0x05,
-  wif: 0x80
-};
-
 bitcoinjs.bitcoin.networks.decred = {
   messagePrefix: 'unused',
   bip32: {

diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js
@@ -2,28 +2,30 @@
 
 // p2wpkh
 
-bitcoinjs.bitcoin.networks.groestlcoin.p2wpkh = {
-    baseNetwork: "groestlcoin",
-    messagePrefix: '\x1cGroestlCoin Signed Message:\n',
-    bech32: 'grs',
+bitcoinjs.bitcoin.networks.bitcoin.p2wpkh = {
+    baseNetwork: "bitcoin",
+    messagePrefix: '\x18Bitcoin Signed Message:\n',
+    bech32: 'bc',
     bip32: {
         public: 0x04b24746,
         private: 0x04b2430c
     },
-    pubKeyHash: 0x24,
+    pubKeyHash: 0x00,
     scriptHash: 0x05,
     wif: 0x80
 };
 
-bitcoinjs.bitcoin.networks.groestlcoin.p2wpkhInP2sh = {
-    baseNetwork: "groestlcoin",
-    messagePrefix: '\x1cGroestlCoin Signed Message:\n',
-    bech32: 'grs',
+// p2wpkh in p2sh
+
+bitcoinjs.bitcoin.networks.bitcoin.p2wpkhInP2sh = {
+    baseNetwork: "bitcoin",
+    messagePrefix: '\x18Bitcoin Signed Message:\n',
+    bech32: 'bc',
     bip32: {
         public: 0x049d7cb2,
         private: 0x049d7878
     },
-    pubKeyHash: 0x24,
+    pubKeyHash: 0x00,
     scriptHash: 0x05,
     wif: 0x80
 };