From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Sun, 10 Nov 2019 22:35:13 +0000 (+1100)
Subject: Merge pull request #319 from energywebfoundation/master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=4dc041d77e7ffd0cac8cbab942032b4bb39c58b6;hp=-c

Merge pull request #319 from energywebfoundation/master

Add EWT
---

4dc041d77e7ffd0cac8cbab942032b4bb39c58b6
diff --combined src/js/index.js
index 9d5f8ee,ff5ef1e..dc10d59
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -44,8 -44,6 +44,8 @@@
      DOM.entropyWeakEntropyOverrideWarning = DOM.entropyContainer.find(".weak-entropy-override-warning");
      DOM.entropyFilterWarning = DOM.entropyContainer.find(".filter-warning");
      DOM.phrase = $(".phrase");
 +	DOM.splitPhrase = $(".phraseSplit");
 +	DOM.phraseSplitWarn = $(".phraseSplitWarn");
      DOM.passphrase = $(".passphrase");
      DOM.generateContainer = $(".generate-container");
      DOM.generate = $(".generate");
@@@ -234,14 -232,7 +234,14 @@@
          if (phraseChangeTimeoutEvent != null) {
              clearTimeout(phraseChangeTimeoutEvent);
          }
 -        phraseChangeTimeoutEvent = setTimeout(phraseChanged, 400);
 +        phraseChangeTimeoutEvent = setTimeout(function() {
 +            phraseChanged();
 +            var entropy = mnemonic.toRawEntropyHex(DOM.phrase.val());
 +            if (entropy !== null) {
 +                DOM.entropyMnemonicLength.val("raw");
 +                DOM.entropy.val(entropy);
 +            }
 +        }, 400);
      }
  
      function phraseChanged() {
@@@ -306,7 -297,6 +306,7 @@@
              clearDisplay();
              clearEntropyFeedback();
              DOM.phrase.val("");
 +			DOM.phraseSplit.val("");
              showValidationError("Blank entropy");
              return;
          }
@@@ -341,7 -331,6 +341,7 @@@
          showPending();
          // Clear existing mnemonic and passphrase
          DOM.phrase.val("");
 +		DOM.phraseSplit.val("");
          DOM.passphrase.val("");
          seed = null;
          if (rootKeyChangedTimeoutEvent != null) {
@@@ -428,7 -417,6 +428,7 @@@
              if (DOM.phrase.val().length > 0) {
                  var newPhrase = convertPhraseToNewLanguage();
                  DOM.phrase.val(newPhrase);
 +				writeSplitPhrase(newPhrase);
                  phraseChanged();
              }
              else {
@@@ -489,7 -477,6 +489,7 @@@
          // show the words
          var words = mnemonic.toMnemonic(data);
          DOM.phrase.val(words);
 +		writeSplitPhrase(words);
          // show the entropy
          var entropyHex = uint8ArrayToHex(data);
          DOM.entropy.val(entropyHex);
@@@ -501,16 -488,9 +501,16 @@@
      function calcBip32RootKeyFromSeed(phrase, passphrase) {
          seed = mnemonic.toSeed(phrase, passphrase);
          bip32RootKey = bitcoinjs.bitcoin.HDNode.fromSeedHex(seed, network);
 +        if(isGRS())
 +            bip32RootKey = groestlcoinjs.HDNode.fromSeedHex(seed, network);
 +
      }
  
      function calcBip32RootKeyFromBase58(rootKeyBase58) {
 +        if(isGRS()) {
 +            calcBip32RootKeyFromBase58GRS(rootKeyBase58);
 +            return;
 +        }
          // try parsing with various segwit network params since this extended
          // key may be from any one of them.
          if (networkHasSegwit()) {
@@@ -545,41 -525,6 +545,41 @@@
          bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network);
      }
  
 +    function calcBip32RootKeyFromBase58GRS(rootKeyBase58) {
 +        // try parsing with various segwit network params since this extended
 +        // key may be from any one of them.
 +        if (networkHasSegwit()) {
 +            var n = network;
 +            if ("baseNetwork" in n) {
 +                n = bitcoinjs.bitcoin.networks[n.baseNetwork];
 +            }
 +            // try parsing using base network params
 +            try {
 +                bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n);
 +                return;
 +            }
 +            catch (e) {}
 +            // try parsing using p2wpkh params
 +            if ("p2wpkh" in n) {
 +                try {
 +                    bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkh);
 +                    return;
 +                }
 +                catch (e) {}
 +            }
 +            // try parsing using p2wpkh-in-p2sh network params
 +            if ("p2wpkhInP2sh" in n) {
 +                try {
 +                    bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh);
 +                    return;
 +                }
 +                catch (e) {}
 +            }
 +        }
 +        // try the network params as currently specified
 +        bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, network);
 +    }
 +
      function calcBip32ExtendedKey(path) {
          // Check there's a root key to derive from
          if (!bip32RootKey) {
@@@ -650,9 -595,6 +650,9 @@@
      }
  
      function validateRootKey(rootKeyBase58) {
 +        if(isGRS()) 
 +            return validateRootKeyGRS(rootKeyBase58);
 +            
          // try various segwit network params since this extended key may be from
          // any one of them.
          if (networkHasSegwit()) {
@@@ -693,47 -635,6 +693,47 @@@
          return "";
      }
  
 +    function validateRootKeyGRS(rootKeyBase58) {
 +        // try various segwit network params since this extended key may be from
 +        // any one of them.
 +        if (networkHasSegwit()) {
 +            var n = network;
 +            if ("baseNetwork" in n) {
 +                n = bitcoinjs.bitcoin.networks[n.baseNetwork];
 +            }
 +            // try parsing using base network params
 +            try {
 +                groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n);
 +                return "";
 +            }
 +            catch (e) {}
 +            // try parsing using p2wpkh params
 +            if ("p2wpkh" in n) {
 +                try {
 +                    groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkh);
 +                    return "";
 +                }
 +                catch (e) {}
 +            }
 +            // try parsing using p2wpkh-in-p2sh network params
 +            if ("p2wpkhInP2sh" in n) {
 +                try {
 +                    groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh);
 +                    return "";
 +                }
 +                catch (e) {}
 +            }
 +        }
 +        // try the network params as currently specified
 +        try {
 +            groestlcoinjs.HDNode.fromBase58(rootKeyBase58, network);
 +        }
 +        catch (e) {
 +            return "Invalid root key";
 +        }
 +        return "";
 +    }
 +
      function getDerivationPath() {
          if (bip44TabSelected()) {
              var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
@@@ -844,10 -745,6 +844,10 @@@
          return false;
      }
  
 +    function isGRS() {
 +        return networks[DOM.network.val()].name == "GRS - Groestlcoin" || networks[DOM.network.val()].name == "GRS - Groestlcoin Testnet";
 +    }
 +
      function displayBip44Info() {
          // Get the derivation path for the account
          var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
@@@ -991,9 -888,6 +991,9 @@@
                  var useUncompressed = useBip38;
                  if (useUncompressed) {
                      keyPair = new bitcoinjs.bitcoin.ECPair(keyPair.d, null, { network: network, compressed: false });
 +                    if(isGRS())
 +                        keyPair = new groestlcoinjs.ECPair(keyPair.d, null, { network: network, compressed: false });
 +
                  }
                  // get address
                  var address = keyPair.getAddress().toString();
@@@ -1004,14 -898,9 +1004,14 @@@
                      privkey = keyPair.toWIF();
                      // BIP38 encode private key if required
                      if (useBip38) {
 -                        privkey = bitcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) {
 -                            console.log("Progressed " + p.percent.toFixed(1) + "% for index " + index);
 -                        });
 +                        if(isGRS())  
 +                            privkey = groestlcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) {
 +                                console.log("Progressed " + p.percent.toFixed(1) + "% for index " + index);
 +                            }, null, networks[DOM.network.val()].name.includes("Testnet"));
 +                        else
 +                            privkey = bitcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) {
 +                                console.log("Progressed " + p.percent.toFixed(1) + "% for index " + index);
 +                            });
                      }
                  }
                  // get pubkey
@@@ -1023,17 -912,14 +1023,18 @@@
                  // Ethereum values are different
                  if ((networks[DOM.network.val()].name == "ETH - Ethereum")
                      || (networks[DOM.network.val()].name == "ETC - Ethereum Classic")
+                     || (networks[DOM.network.val()].name == "EWT - EnergyWeb")
                      || (networks[DOM.network.val()].name == "PIRL - Pirl")
                      || (networks[DOM.network.val()].name == "MIX - MIX")
                      || (networks[DOM.network.val()].name == "MUSIC - Musicoin")
                      || (networks[DOM.network.val()].name == "POA - Poa")
                      || (networks[DOM.network.val()].name == "EXP - Expanse")
                      || (networks[DOM.network.val()].name == "CLO - Callisto")
 -                    || (networks[DOM.network.val()].name == "DXN - DEXON")) {
 +                    || (networks[DOM.network.val()].name == "DXN - DEXON")
 +                    || (networks[DOM.network.val()].name == "ELLA - Ellaism")
 +                    || (networks[DOM.network.val()].name == "ESN - Ethersocial Network")
 +                    || (networks[DOM.network.val()].name == "VET - VeChain")
 +                ) {
                      var privKeyBuffer = keyPair.d.toBuffer(32);
                      privkey = privKeyBuffer.toString('hex');
                      var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
@@@ -1043,19 -929,6 +1044,19 @@@
                      privkey = ethUtil.addHexPrefix(privkey);
                      pubkey = ethUtil.addHexPrefix(pubkey);
                  }
 +
 +                // Stellar is different
 +                if (networks[DOM.network.val()].name == "XLM - Stellar") {
 +                    var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
 +                    var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
 +                    var path = "m/";
 +                        path += purpose + "'/";
 +                        path += coin + "'/" + index + "'";
 +                    var keypair = stellarUtil.getKeypair(path, seed);
 +                    indexText = path;
 +                    privkey = keypair.secret();
 +                    pubkey = address = keypair.publicKey();
 +                }
                  if ((networks[DOM.network.val()].name == "NAS - Nebulas")) {
                      var NasAccount = require("nebulas-account");
                      var privKeyBuffer = keyPair.d.toBuffer(32);
@@@ -1070,11 -943,6 +1071,11 @@@
                      privkey = convertRipplePriv(privkey);
                      address = convertRippleAdrr(address);
                  }
 +                // CasinoCoin values are different
 +                if (networks[DOM.network.val()].name == "CSC - CasinoCoin") {
 +                    privkey = convertCasinoCoinPriv(privkey);
 +                    address = convertCasinoCoinAdrr(address);
 +                }
                  // Bitcoin Cash address format may vary
                  if (networks[DOM.network.val()].name == "BCH - Bitcoin Cash") {
                      var bchAddrType = DOM.bitcoinCashAddressType.filter(":checked").val();
@@@ -1110,34 -978,11 +1111,34 @@@
                          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") {
 +                    address = ""
 +                    pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
 +                    privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
 +                }
 +
 +                //Groestlcoin Addresses are different
 +                if(isGRS()) {
 +
 +                    if (isSegwit) {
 +                        if (!segwitAvailable) {
 +                            return;
 +                        }
 +                        if (isP2wpkh) {
 +                            address = groestlcoinjs.address.fromOutputScript(scriptpubkey, network)
 +                        }
 +                        else if (isP2wpkhInP2sh) {
 +                            address = groestlcoinjs.address.fromOutputScript(scriptpubkey, network)
 +                        }
 +                    } 
 +                    //non-segwit addresses are handled by using groestlcoinjs for bip32RootKey
 +                }
 +
                  addAddressToList(indexText, address, pubkey, privkey);
                  if (isLast) {
                      hidePending();
@@@ -1428,40 -1273,6 +1429,40 @@@
          }
          return phrase;
      }
 +	
 +	function writeSplitPhrase(phrase) {
 +		var wordCount = phrase.split(/\s/g).length;								//get number of words in phrase       
 +		var left=[];															//initialize array of indexs
 +		for (var i=0;i<wordCount;i++) left.push(i);								//add all indexs to array
 +		var group=[[],[],[]],													//make array for 3 groups
 +			groupI=-1;															//initialize group index
 +		var seed = Math.abs(sjcl.hash.sha256.hash(phrase)[0])% 2147483647;		//start seed at sudo random value based on hash of words
 +		while (left.length>0) {													//while indexs left
 +			groupI=(groupI+1)%3;												//get next group to insert index into
 +			seed = seed * 16807 % 2147483647;									//change random value.(simple predicatable random number generator works well for this use)
 +			var selected=Math.floor(left.length*(seed - 1) / 2147483646);		//get index in left we will use for this group
 +			group[groupI].push(left[selected]);									//add index to group
 +			left.splice(selected,1);											//remove selected index
 +		}
 +		var cards=[phrase.split(/\s/g),phrase.split(/\s/g),phrase.split(/\s/g)];//make array of cards
 +		for (var i=0;i<3;i++) {													//go through each card
 +			for (var ii=0;ii<wordCount/3;ii++) cards[i][group[i][ii]]='XXXX';	//erase words listed in the group
 +			cards[i]='Card '+(i+1)+': '+wordArrayToPhrase(cards[i]);								//combine words on card back to string
 +		}
 +		DOM.splitPhrase.val(cards.join("\r\n"));								//make words visible
 +		var triesPerSecond=10000000000;											//assumed number of tries per second
 +		var hackTime=Math.pow(2,wordCount*10/3)/triesPerSecond;					//get number of bits of unknown data per card
 +		if (hackTime<1) {
 +			hackTime="<1 second";
 +		} else if (hackTime<86400) {
 +			hackTime=Math.floor(hackTime)+" seconds";
 +		} else if(hackTime<31557600) {
 +			hackTime=Math.floor(hackTime/86400)+" days";
 +		} else {
 +			hackTime=Math.floor(hackTime/31557600)+" years";
 +		}
 +		DOM.phraseSplitWarn.html("Time to hack with only one card: "+hackTime);
 +	}
  
      function isUsingOwnEntropy() {
          return DOM.useEntropy.prop("checked");
@@@ -1520,7 -1331,6 +1521,7 @@@
          var phrase = mnemonic.toMnemonic(entropyArr);
          // Set the mnemonic in the UI
          DOM.phrase.val(phrase);
 +		writeSplitPhrase(phrase);
          // Show the word indexes
          showWordIndexes();
          // Show the checksum
@@@ -1859,13 -1669,6 +1860,13 @@@
                  setHdCoin(161);
              },
          },
 +        {
 +            name: "ARYA - Aryacoin",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.aryacoin;
 +                setHdCoin(357);
 +            },
 +        },
          {
              name: "AUR - Auroracoin",
              onSelect: function() {
@@@ -1887,13 -1690,6 +1888,13 @@@
                  setHdCoin(220);
              },
          },
 +        {
 +            name: "BOLI - Bolivarcoin",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bolivarcoin;
 +                setHdCoin(278);
 +            },
 +        },
          {
              name: "BCA - Bitcoin Atom",
              onSelect: function() {
@@@ -1999,13 -1795,6 +2000,13 @@@
                  setHdCoin(183);
              },
          },
 +        {
 +            name: "BSV - BitcoinSV",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoinsv;
 +                setHdCoin(236);
 +            },
 +        },
          {
              name: "BTCZ - Bitcoinz",
              onSelect: function() {
@@@ -2084,13 -1873,6 +2085,13 @@@
                  setHdCoin(71);
              },
          },
 +        {
 +            name: "CPU - CPUchain",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.cpuchain;
 +                setHdCoin(363);
 +            },
 +        },
          {
              name: "CRAVE - Crave",
              onSelect: function() {
@@@ -2112,13 -1894,6 +2113,13 @@@
                  setHdCoin(72);
              },
          },
 +        {
 +            name: "CSC - CasinoCoin",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(359);
 +            },
 +        },
          {
              name: "DASH - Dash",
              onSelect: function() {
@@@ -2175,13 -1950,6 +2176,13 @@@
                  setHdCoin(3);
              },
          },
 +        {
 +            name: "DOGEt - Dogecoin Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.dogecointestnet;
 +                setHdCoin(1);
 +            },
 +        },
          {
              name: "DXN - DEXON",
              onSelect: function() {
@@@ -2210,14 -1978,6 +2211,14 @@@
                  setHdCoin(78);
              },
          },
 +        {
 +            name: "ELLA - Ellaism",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(163);
 +            },
 +        },
          {
              name: "EMC2 - Einsteinium",
              onSelect: function() {
@@@ -2232,21 -1992,6 +2233,21 @@@
                  setHdCoin(151);
              },
          },
 +        {
 +            name: "EOS - EOSIO",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(194);
 +            },
 +        },
 +        {
 +            name: "ESN - Ethersocial Network",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(31102);
 +            },
 +        },
          {
              name: "ETC - Ethereum Classic",
              segwitAvailable: false,
@@@ -2261,7 -2006,14 +2262,14 @@@
                  network = bitcoinjs.bitcoin.networks.bitcoin;
                  setHdCoin(60);
              },
-         },
+           },
+         {
+             name: "EWT - EnergyWeb",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(246);
+             },
+           },
          {
              name: "EXCL - Exclusivecoin",
              onSelect: function() {
@@@ -2284,20 -2036,6 +2292,20 @@@
                  setHdCoin(40);
              },
          },
 +        {
 +            name: "FIX - FIX",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.fix;
 +                setHdCoin(336);
 +            },
 +        },
 +        {
 +            name: "FIX - FIX Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.fixtestnet;
 +                setHdCoin(1);
 +            },
 +        },
          {
              name: "FJC - Fujicoin",
              onSelect: function() {
@@@ -2354,20 -2092,6 +2362,20 @@@
                  setHdCoin(84);
              },
          },
 +        {
 +            name: "GRS - Groestlcoin",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.groestlcoin;
 +                setHdCoin(17);
 +            },
 +        },
 +        {
 +            name: "GRS - Groestlcoin Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.groestlcointestnet;
 +                setHdCoin(1);
 +            },
 +        },
          {
              name: "HNC - Helleniccoin",
              onSelect: function() {
@@@ -2376,18 -2100,11 +2384,18 @@@
              },
          },
  		{
 -            name: "HUSH - Hush",
 +            name: "HUSH - Hush (Legacy)",
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.hush;
                  setHdCoin(197);
              },
 +        },
 +		{
 +            name: "HUSH - Hush3",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.hush3;
 +                setHdCoin(197);
 +            },
          },
          {
              name: "INSN - Insane",
@@@ -2477,14 -2194,6 +2485,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() {
@@@ -2535,13 -2244,6 +2543,13 @@@
                  setHdCoin(22);
              },
          },
 +        {
 +            name: "MONK - Monkey Project",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.monkeyproject,
 +                setHdCoin(214);
 +            },
 +        },
          {
              name: "MUSIC - Musicoin",
              segwitAvailable: false,
@@@ -2648,13 -2350,6 +2656,13 @@@
                  setHdCoin(200);
              },
          },
 +        {
 +            name: "ONION - DeepOnion",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.deeponion;
 +                setHdCoin(305);
 +            },
 +        },
          {
              name: "ONX - Onixcoin",
              onSelect: function() {
@@@ -2748,13 -2443,6 +2756,13 @@@
                  setHdCoin(122);
              },
          },
 +        {
 +            name: "RPD - Rapids",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.rapids;
 +                setHdCoin(320);
 +            },
 +        },
          {
              name: "RVN - Ravencoin",
              onSelect: function() {
@@@ -2895,20 -2583,6 +2903,20 @@@
                  setHdCoin(159);
              },
          },
 +        {
 +            name: "TWINS - TWINS",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.twins;
 +                setHdCoin(970);
 +            },
 +        },
 +        {
 +            name: "TWINS - TWINS Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.twinstestnet;
 +                setHdCoin(1);
 +            },
 +        },
          {
              name: "USC - Ultimatesecurecash",
              onSelect: function() {
@@@ -2937,13 -2611,6 +2945,13 @@@
                  setHdCoin(33);
              },
          },
 +        {
 +            name: "VET - VeChain",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(818);
 +            },
 +        },
          {
              name: "VIA - Viacoin",
              onSelect: function() {
@@@ -2972,13 -2639,6 +2980,13 @@@
                  setHdCoin(28);
              },
          },
 +        {
 +            name: "WGR - Wagerr",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.wagerr;
 +                setHdCoin(7825266);
 +            },
 +        },
          {
              name: "WC - Wincoin",
              onSelect: function() {
@@@ -3000,13 -2660,6 +3008,13 @@@
                  setHdCoin(65);
              },
          },
 +        {
 +            name: "XLM - Stellar",
 +            onSelect: function() {
 +                network = stellarUtil.dummyNetwork;
 +                setHdCoin(148);
 +            },
 +        },
          {
              name: "XMY - Myriadcoin",
              onSelect: function() {
@@@ -3072,7 -2725,7 +3080,7 @@@
              },
          },
          {
 -            name: "ZEN - Zencash",
 +            name: "ZEN - Horizen",
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.zencash;
                  setHdCoin(121);