Merge branch 'mercury' into patch-2

CHANGELOG.md

@@ -1,3 +1,5 @@
+### Release v3.26.0
+
 ### New
 
 - Update changelog, update darklist, update coinvest token, update u2f package [#2149](https://github.com/kvhnuke/etherwallet/pull/2149)

app/includes/header.tpl

@@ -100,18 +100,18 @@
     @@if (site === 'mew' ) {
       <a class="brand" href="/" aria-label="Go to homepage">
         <img src="images/logo-myetherwallet.svg"   height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.25.0</p>
+        <p class="small visible-xs">3.26.0</p>
       </a>
     }
     @@if (site === 'cx'  ) {
       <a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
         <img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.25.0</p>
+        <p class="small visible-xs">3.26.0</p>
       </a>
     }
     <div class="tagline">
 
-    <span class="hidden-xs">3.25.0</span>
+    <span class="hidden-xs">3.26.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

app/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet",
-  "version": "3.25.0",
+  "version": "3.26.0",
   "manifest_version": 2,
   "description": "MyEtherWallet Chrome Extension",
   "homepage_url": "https://www.myetherwallet.com/",

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet",
-  "version": "3.25.0",
+  "version": "3.26.0",
   "description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
   "author": "MyEtherWallet",
   "license": "ISC",

app/scripts/abiDefinitions/ethAbi.json

@@ -700,7 +700,11 @@
 	{
 		"name": "ABBC Cash(ABCH) Token",
 		"address": "0xcc7d26d8ea6281bb363c8448515f2c61f7bc19f0",
-		"abi":
-				'[ { 	"constant": true, 	"inputs": [], 	"name": "name", 	"outputs": [ 		{ 			"name": "", 			"type": "string" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "spender", 			"type": "address" 		}, 		{ 			"name": "tokens", 			"type": "uint256" 		} 	], 	"name": "approve", 	"outputs": [ 		{ 			"name": "success", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": true, 	"inputs": [ 		{ 			"name": "_addr", 			"type": "address" 		} 	], 	"name": "isContract", 	"outputs": [ 		{ 			"name": "", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": true, 	"inputs": [], 	"name": "totalSupply", 	"outputs": [ 		{ 			"name": "", 			"type": "uint256" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "from", 			"type": "address" 		}, 		{ 			"name": "to", 			"type": "address" 		}, 		{ 			"name": "tokens", 			"type": "uint256" 		} 	], 	"name": "transferFrom", 	"outputs": [ 		{ 			"name": "success", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": true, 	"inputs": [], 	"name": "decimals", 	"outputs": [ 		{ 			"name": "", 			"type": "uint8" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "_spender", 			"type": "address" 		}, 		{ 			"name": "_subtractedValue", 			"type": "uint256" 		} 	], 	"name": "decreaseApproval", 	"outputs": [ 		{ 			"name": "", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": true, 	"inputs": [ 		{ 			"name": "tokenOwner", 			"type": "address" 		} 	], 	"name": "balanceOf", 	"outputs": [ 		{ 			"name": "balance", 			"type": "uint256" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [], 	"name": "acceptOwnership", 	"outputs": [], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": true, 	"inputs": [], 	"name": "owner", 	"outputs": [ 		{ 			"name": "", 			"type": "address" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": true, 	"inputs": [], 	"name": "symbol", 	"outputs": [ 		{ 			"name": "", 			"type": "string" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "to", 			"type": "address" 		}, 		{ 			"name": "tokens", 			"type": "uint256" 		} 	], 	"name": "transfer", 	"outputs": [ 		{ 			"name": "success", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "spender", 			"type": "address" 		}, 		{ 			"name": "tokens", 			"type": "uint256" 		}, 		{ 			"name": "data", 			"type": "bytes" 		} 	], 	"name": "approveAndCall", 	"outputs": [ 		{ 			"name": "success", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": true, 	"inputs": [], 	"name": "newOwner", 	"outputs": [ 		{ 			"name": "", 			"type": "address" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "_spender", 			"type": "address" 		}, 		{ 			"name": "_addedValue", 			"type": "uint256" 		} 	], 	"name": "increaseApproval", 	"outputs": [ 		{ 			"name": "", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "tokenAddress", 			"type": "address" 		}, 		{ 			"name": "tokens", 			"type": "uint256" 		} 	], 	"name": "transferAnyERC20Token", 	"outputs": [ 		{ 			"name": "success", 			"type": "bool" 		} 	], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"constant": true, 	"inputs": [ 		{ 			"name": "tokenOwner", 			"type": "address" 		}, 		{ 			"name": "spender", 			"type": "address" 		} 	], 	"name": "allowance", 	"outputs": [ 		{ 			"name": "remaining", 			"type": "uint256" 		} 	], 	"payable": false, 	"stateMutability": "view", 	"type": "function" }, { 	"constant": false, 	"inputs": [ 		{ 			"name": "_newOwner", 			"type": "address" 		} 	], 	"name": "transferOwnership", 	"outputs": [], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "function" }, { 	"inputs": [], 	"payable": false, 	"stateMutability": "nonpayable", 	"type": "constructor" }, { 	"payable": true, 	"stateMutability": "payable", 	"type": "fallback" }, { 	"anonymous": false, 	"inputs": [ 		{ 			"indexed": true, 			"name": "_from", 			"type": "address" 		}, 		{ 			"indexed": true, 			"name": "_to", 			"type": "address" 		} 	], 	"name": "OwnershipTransferred", 	"type": "event" }, { 	"anonymous": false, 	"inputs": [ 		{ 			"indexed": true, 			"name": "from", 			"type": "address" 		}, 		{ 			"indexed": true, 			"name": "to", 			"type": "address" 		}, 		{ 			"indexed": false, 			"name": "tokens", 			"type": "uint256" 		} 	], 	"name": "Transfer", 	"type": "event" }, { 	"anonymous": false, 	"inputs": [ 		{ 			"indexed": true, 			"name": "tokenOwner", 			"type": "address" 		}, 		{ 			"indexed": true, 			"name": "spender", 			"type": "address" 		}, 		{ 			"indexed": false, 			"name": "tokens", 			"type": "uint256" 		} 	], 	"name": "Approval", 	"type": "event" }]'
+		"abi":'[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"tokens","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"isContract","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"tokens","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"tokenOwner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"acceptOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"tokens","type":"uint256"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"tokens","type":"uint256"},{"name":"data","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"newOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"tokenAddress","type":"address"},{"name":"tokens","type":"uint256"}],"name":"transferAnyERC20Token","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"tokenOwner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_from","type":"address"},{"indexed":true,"name":"_to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"tokens","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"tokenOwner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"tokens","type":"uint256"}],"name":"Approval","type":"event"}]'
+  },
+  { 
+		"name": "PTON",
+		"address": "0x4946583c5b86e01ccd30c71a05617d06e3e73060",
+		"abi":'[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"INITIAL_SUPPLY","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"transferEnabled","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tokenOfferingAddr","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"adminAddr","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"TOKEN_OFFERING_ALLOWANCE","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"ADMIN_ALLOWANCE","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"admin","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"burner","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Burn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"constant":false,"inputs":[{"name":"offeringAddr","type":"address"},{"name":"amountForSale","type":"uint256"}],"name":"setTokenOffering","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"enableTransfer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"value","type":"uint256"}],"name":"burn","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]'
 	}
 ]

app/scripts/tokens/ethTokens.json

@@ -4589,6 +4589,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x4946583c5b86e01ccd30c71a05617d06e3e73060",
+    "symbol": "PTON",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x8Ae4BF2C33a8e667de34B54938B0ccD03Eb8CC06",
     "symbol": "PTOY",

chrome-extension/contest.html

@@ -100,13 +100,13 @@
 
       <a class="brand" href="/" aria-label="Go to homepage">
         <img src="images/logo-myetherwallet.svg"   height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.25.0</p>
+        <p class="small visible-xs">3.26.0</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.25.0</span>
+    <span class="hidden-xs">3.26.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

chrome-extension/cx-wallet.html

@@ -83,12 +83,12 @@
 
       <a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
         <img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.25.0</p>
+        <p class="small visible-xs">3.26.0</p>
       </a>
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.25.0</span>
+    <span class="hidden-xs">3.26.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

chrome-extension/helpers.html

@@ -101,13 +101,13 @@
 
       <a class="brand" href="/" aria-label="Go to homepage">
         <img src="images/logo-myetherwallet.svg"   height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.25.0</p>
+        <p class="small visible-xs">3.26.0</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.25.0</span>
+    <span class="hidden-xs">3.26.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>