Merge branch 'master' of github.com:iancoleman/bip39

diff --git a/src/index.html b/src/index.html
index 36d753b84c401a759d054a1931447408e5b6e43d..fca925b2f89c667d86c2c6448ae24ebece34695a 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -748,14 +748,6 @@
                         Read more at the
                         <a href="https://github.com/bitcoin/bips/blob/master/bip-0049.mediawiki" target="_blank">official BIP49 spec</a>
                     </p>
-                    <h3>Private Keys</h3>
-                    <p>
-                        <span>
-                            Use private keys at
-                            <a href="https://web.archive.org/web/20150707020924/https://brainwallet.org/" target="_blank">brainwallet.org</a>.
-                        </span>
-                        <span>Be careful - it can be easy to make mistakes if you don't know what you're doing.</span>
-                    </p>
                     <h3 id="entropy-notes">Entropy</h3>
                     <p>
                         <span>Entropy values should not include the BIP39 checksum. This is automatically added by the tool.</span>

diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js
index f935c5d41e787d01e3b55cdd51986041bb67d138..e52869eca2bee2405ec797e7a82e26a15e2912d1 100644 (file)
--- a/src/js/segwit-parameters.js
+++ b/src/js/segwit-parameters.js
@@ -210,30 +210,4 @@ bitcoinjs.bitcoin.networks.blockstamp.p2wpkhInP2sh = {
     scriptHash: 0x05,
     wif:  0x80,
 };
-
-    bitcoinjs.bitcoin.networks.deimos.p2wpkh = {
-    baseNetwork: "deimos",
-    messagePrefix: '\x18Deimos Signed Message:\n',
-    bech32: 'dei',
-    bip32: {
-        public: 0x0488B21E,
-        private: 0x0488ADE4
-    },
-    pubKeyHash: 0x1f,
-    scriptHash: 0x21,
-    wif: 0x8a
-};
-
-bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = {
-    baseNetwork: "deimos",     
-    messagePrefix: '\x18Deimos Signed Message:\n',
-    bech32: 'dei',
-    bip32: {
-        public: 0x0488B21E,
-        private: 0x0488ADE4
-    },
-    pubKeyHash: 0x1f,
-    scriptHash: 0x21,
-    wif: 0x8a
-};
 })();

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index dcc9b0a65c9e28049b68ba30ce039b4a4d4dba9f..9c4b97206874fd84aa6e3b6187618a8f591551c5 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1365,7 +1365,7 @@ it('Allows selection of Phore', function(done) {
 it('Allows selection of Safecoin', function(done) {
      var params = {
          selectText: "SAFE - Safecoin",
-         firstAddress: "RmV56kPW7jeCmDA8sukHwbR7RZSbg9NFNF",
+         firstAddress: "RtxHpnhJz6RY8k9owP3ua5QWraunmewB1G",
      };
      testNetwork(done, params);
  });