Merge branch 'master' into bitcoin-green

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index d925b32ac452bb1388e9444d582e85dd71a00ea9..fef567a9574490d00e08787581cea945f377d612 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1386,3 +1386,14 @@ bitcoinjs.bitcoin.networks.bitcoingreen = {
   scriptHash: 0x1CBD,
   wif:  0x2E,
 };
+
+bitcoinjs.bitcoin.networks.anon = {
+       messagePrefix: '\x18ANON Signed Message:\n',
+       bip32: {
+               public: 0x0488b21e,
+               private: 0x0488ade4
+       },
+       pubKeyHash: 0x0582,
+       scriptHash: 0x5389,
+       wif: 0x80
+};
\ No newline at end of file

diff --git a/src/js/index.js b/src/js/index.js
index 856f6279225c0fa49a67ece68db8ad06d47208b7..85639a0a5527f5309e09f4dfabb5771368f05008 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1659,6 +1659,13 @@
                 network = bitcoinjs.bitcoin.networks.axe;
                 setHdCoin(4242);
             },
+               },
+               {
+            name: "ANON - ANON",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.anon;
+                setHdCoin(220);
+            },
         },
         {
             name: "BCA - Bitcoin Atom",

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 7252cda22491f88b117e87e5bf758e26b67c9ecd..4a4146c5985accdc07c05eabc6413542cd46d909 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1326,6 +1326,13 @@ it('Allows selection of BitcoinGreen', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of ANON', function(done) {
+    var params = {
+        selectText: "ANON - ANON",
+        firstAddress: "AnU6pijpEeUZFWSTyM2qTqZQn996Zq1Xard",
+    };
+    testNetwork(done, params);
+});
 
 
 // BIP39 seed is set from phrase