From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Mon, 10 Jun 2019 23:37:53 +0000 (+1000)
Subject: Merge branch 'master' into eosio-support
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=7d68d5474e9354699b05637a8645a0b749e52c81;hp=-c

Merge branch 'master' into eosio-support
---

7d68d5474e9354699b05637a8645a0b749e52c81
diff --combined src/js/index.js
index 3b3ebed,7e65434..f54ff71
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -980,16 -980,11 +980,17 @@@
                          address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
                      }
                  }
-                 
+ 
                  if ((networks[DOM.network.val()].name == "CRW - Crown")) {
                      address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address);
                  }
-                 if (networks[DOM.network.val()].name == "EOS - EOSIO") {
+ 
++              if (networks[DOM.network.val()].name == "EOS - EOSIO") {
 +                    address = ""
 +                    pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
 +                    privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
 +                }
 +                
                  addAddressToList(indexText, address, pubkey, privkey);
                  if (isLast) {
                      hidePending();
@@@ -1964,6 -1959,13 +1965,13 @@@
                  setHdCoin(3);
              },
          },
+         {
+             name: "DOGEt - Dogecoin Testnet",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.dogecointestnet;
+                 setHdCoin(1);
+             },
+         },
          {
              name: "DXN - DEXON",
              onSelect: function() {
@@@ -2014,13 -2016,6 +2022,13 @@@
                  setHdCoin(151);
              },
          },
 +        {
 +            name: "EOS - EOSIO",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(194);
 +            },
 +        },
          {
              name: "ESN - Ethersocial Network",
              segwitAvailable: false,
@@@ -2224,6 -2219,14 +2232,14 @@@
                  DOM.litecoinLtubContainer.removeClass("hidden");
              },
          },
+         {
+             name: "LTCt - Litecoin Testnet",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.litecointestnet;
+                 setHdCoin(1);
+                 DOM.litecoinLtubContainer.removeClass("hidden");
+             },
+         },
          {
              name: "LTZ - LitecoinZ",
              onSelect: function() {
@@@ -2768,6 -2771,13 +2784,13 @@@
                  setHdCoin(121);
              },
          },
+         {
+             name: "MONK - Monkey Project",
+ `           onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.monkey;
+                 setHdCoin(214);
+             },
+         }
      ]
  
      var clients = [
diff --combined tests/spec/tests.js
index 3d72abd,b307f15..2685fa6
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -73,23 -73,16 +73,23 @@@ else if (browser == "chrome") 
  
  // Helper functions
  
 -function testNetwork(done, params) {
 +function testNetwork(done, params, comparePub = false) {
      var phrase = params.phrase || 'abandon abandon ability';
      driver.findElement(By.css('.phrase'))
          .sendKeys(phrase);
      selectNetwork(params.selectText);
      driver.sleep(generateDelay).then(function() {
 -        getFirstAddress(function(address) {
 -            expect(address).toBe(params.firstAddress);
 -            done();
 -        });
 +        if (!comparePub) {
 +            getFirstAddress(function(address) {
 +                expect(address).toBe(params.firstAddress);
 +                done();
 +            });
 +        } else {
 +            getFirstPublicKey(function(pubkey) {
 +                expect(pubkey).toBe(params.firstPubKey);
 +                done();
 +            });
 +        }
      });
  }
  
@@@ -105,10 -98,6 +105,10 @@@ function getFirstAddress(handler) 
      getFirstRowValue(handler, ".address");
  }
  
 +function getFirstPublicKey(handler) {
 +    getFirstRowValue(handler, ".pubkey");
 +}
 +
  function getFirstPath(handler) {
      getFirstRowValue(handler, ".index");
  }
@@@ -419,6 -408,13 +419,13 @@@ it('Allows selection of litecoin', func
      };
      testNetwork(done, params);
  });
+ it('Allows selection of litecoin testnet', function(done) {
+     var params = {
+         selectText: "LTCt - Litecoin Testnet",
+         firstAddress: "mucaU5iiDaJDb69BHLeDv8JFfGiyg2nJKi",
+     };
+     testNetwork(done, params);
+ });
  it('Allows selection of ripple', function(done) {
      var params = {
          selectText: "XRP - Ripple",
@@@ -434,6 -430,13 +441,13 @@@ it('Allows selection of dogecoin', func
      };
      testNetwork(done, params);
  });
+ it('Allows selection of dogecoin testnet', function(done) {
+     var params = {
+         selectText: "DOGEt - Dogecoin testnet",
+         firstAddress: "niHnSJKHdwDyDxRMLBJrtNqpvHEsAFWe6B",
+     };
+     testNetwork(done, params);
+ });
  it('Allows selection of denarius', function(done) {
      var params = {
          selectText: "DNR - Denarius",
@@@ -486,7 -489,7 +500,7 @@@ it('Allows selection of clam', function
  it('Allows selection of crown', function(done) {
      var params = {
          selectText: "CRW - Crown (Legacy)",
-         firstAddress: "18pWSwSUAQdiwMHUfFZB1fM2xue9X1FqE5", 
+         firstAddress: "18pWSwSUAQdiwMHUfFZB1fM2xue9X1FqE5",
      };
      testNetwork(done, params);
  });
@@@ -864,13 -867,6 +878,13 @@@ it('Allows selection of Einsteinium', f
      };
      testNetwork(done, params);
  });
 +it('Allows selection of EOSIO', function(done) {
 +    var params = {
 +        selectText: "EOS - EOSIO",
 +        firstPubKey: "EOS692VJTBK3Rmw93onNnpnZ8ZtmE9PdxjDStArvbyzoe11QUTNoy",
 +    };
 +    testNetowrk(done, params, true);
 +});
  it('Allows selection of Europecoin', function(done) {
      var params = {
          selectText: "ERC - Europecoin",
@@@ -1480,6 -1476,13 +1494,13 @@@ it('Allows selection of Ethersocial Net
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Monkey Project', function(done) {
+     var params = {
+         selectText: "MONK - Monkey Project",
+         firstAddress: "MnLrcnnUzKnf7TzufjRe5DLZqQJz18oYyu",
+     };
+     testNetwork(done, params);
+ });
  
  // BIP39 seed is set from phrase
  it('Sets the bip39 seed from the prhase', function(done) {