From: iancoleman <coleman.ian@gmail.com>
Date: Wed, 24 Aug 2016 21:59:39 +0000 (+1000)
Subject: Merge pull request #27 from dangershony/master
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8ecffe72af4091193870d970c58688ae87b4cc59;hp=06c4c6e31411158c1e9ff1943f12886991005120;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

Merge pull request #27 from dangershony/master

Adding DASH and fixing the root key network bug
---

diff --git a/bip39-standalone.html b/bip39-standalone.html
index 5f9cf7c..9b3c4f1 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -13353,6 +13353,17 @@ bitcoin.networks.clam = {
   pubKeyHash: 0x89,
   wif: 0x85,
 };
+
+bitcoin.networks.dash = {
+  bip32: {
+    public: 0x0488b21e,
+    private: 0x0488ade4
+  },
+  pubKeyHash: 0x4c,
+  scriptHash: 0x10,
+  wif: 0xcc,
+};
+
 </script>
         <script>// Select components from sjcl to suit the crypto operations bip39 requires.
 
@@ -15041,7 +15052,7 @@ var Mnemonic = function(language) {
     }
 
     function calcBip32RootKeyFromBase58(rootKeyBase58) {
-        bip32RootKey = bitcoin.HDNode.fromBase58(rootKeyBase58);
+        bip32RootKey = bitcoin.HDNode.fromBase58(rootKeyBase58, network);
     }
 
     function calcBip32ExtendedKey(path) {
@@ -15414,6 +15425,13 @@ var Mnemonic = function(language) {
                 DOM.bip44coin.val(23);
             },
         },
+        {
+            name: "DASH",
+            onSelect: function() {
+                network = bitcoin.networks.dash;
+                DOM.bip44coin.val(5);
+            },
+        },
     ]
 
     init();
diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index a7ca2ec..9f11de8 100644
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -34,3 +34,14 @@ bitcoin.networks.clam = {
   pubKeyHash: 0x89,
   wif: 0x85,
 };
+
+bitcoin.networks.dash = {
+  bip32: {
+    public: 0x0488b21e,
+    private: 0x0488ade4
+  },
+  pubKeyHash: 0x4c,
+  scriptHash: 0x10,
+  wif: 0xcc,
+};
+
diff --git a/src/js/index.js b/src/js/index.js
index 8f7d658..5cd09b6 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -207,7 +207,7 @@
     }
 
     function calcBip32RootKeyFromBase58(rootKeyBase58) {
-        bip32RootKey = bitcoin.HDNode.fromBase58(rootKeyBase58);
+        bip32RootKey = bitcoin.HDNode.fromBase58(rootKeyBase58, network);
     }
 
     function calcBip32ExtendedKey(path) {
@@ -580,6 +580,13 @@
                 DOM.bip44coin.val(23);
             },
         },
+        {
+            name: "DASH",
+            onSelect: function() {
+                network = bitcoin.networks.dash;
+                DOM.bip44coin.val(5);
+            },
+        },
     ]
 
     init();