Merge pull request #759 from MyEtherWallet/develop

Tag Release 0.0.8
MyCryptoHQ · Jan 9, 2018 · af4d415 · af4d415
2 parents eeb315c + 401a57d
commit af4d415
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git a/common/api/shapeshift.ts b/common/api/shapeshift.ts
@@ -21,10 +21,9 @@ export const SHAPESHIFT_TOKEN_WHITELIST = [
   'FUN',
   'RLC',
   'TRST',
-  'GUP',
-  'ETH'
+  'GUP'
 ];
-export const SHAPESHIFT_WHITELIST = [...SHAPESHIFT_TOKEN_WHITELIST, 'ETC', 'BTC'];
+export const SHAPESHIFT_WHITELIST = [...SHAPESHIFT_TOKEN_WHITELIST, 'ETH', 'ETC', 'BTC'];
 
 class ShapeshiftService {
   public whitelist = SHAPESHIFT_WHITELIST;

diff --git a/common/config/data.ts b/common/config/data.ts
@@ -2,7 +2,7 @@ import { EtherscanNode, InfuraNode, RPCNode, Web3Node } from 'libs/nodes';
 import { networkIdToName } from 'libs/values';
 export const languages = require('./languages.json');
 // Displays in the header
-export const VERSION = '4.0.0 (Alpha 0.0.7)';
+export const VERSION = '4.0.0 (Alpha 0.0.8)';
 export const N_FACTOR = 1024;
 
 // Displays at the top of the site, make message empty string to remove.

diff --git a/common/config/tokens/eth.json b/common/config/tokens/eth.json
@@ -433,5 +433,20 @@
     "address": "0xb110ec7b1dcb8fab8dedbf28f53bc63ea5bedd84",
     "symbol": "XID",
     "decimal": 8
+  },
+  {
+    "address": "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
+    "symbol": "ZRX",
+    "decimal": 18
+  },
+  {
+    "address": "0x41e5560054824eA6B0732E656E3Ad64E20e94E45",
+    "symbol": "CVC",
+    "decimal": 8
+  },
+  {
+    "address": "0x0AbdAce70D3790235af448C88547603b945604ea",
+    "symbol": "DNT",
+    "decimal": 18
   }
 ]
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet",
-  "version": "4.0.0-alpha.7",
+  "version": "4.0.0-alpha.8",
   "main": "common/index.jsx",
   "description": "MyEtherWallet v4",
   "engines": {
@@ -19,7 +19,7 @@
     "ethereumjs-util": "5.1.3",
     "ethereumjs-wallet": "0.6.0",
     "font-awesome": "4.7.0",
-    "hard-source-webpack-plugin": "0.5.13",
+    "hard-source-webpack-plugin": "0.5.15",
     "hdkey": "0.7.1",
     "idna-uts46": "1.1.0",
     "jsonschema": "1.2.2",
@@ -92,7 +92,7 @@
     "lint-staged": "6.0.0",
     "minimist": "1.2.0",
     "node-sass": "4.7.2",
-    "nodemon": "1.14.8",
+    "nodemon": "1.14.9",
     "null-loader": "0.1.1",
     "offline-plugin": "4.9.0",
     "prettier": "1.9.2",
@@ -114,7 +114,7 @@
     "types-rlp": "0.0.1",
     "typescript": "2.6.2",
     "url-loader": "0.6.2",
-    "url-search-params-polyfill": "2.0.1",
+    "url-search-params-polyfill": "2.0.2",
     "webpack": "3.10.0",
     "webpack-dev-middleware": "2.0.4",
     "webpack-hot-middleware": "2.21.0",
@@ -124,9 +124,9 @@
     "freezer": "webpack --config=./webpack_config/webpack.freezer.js && node ./dist/freezer.js",
     "freezer:validate": "npm run freezer -- --validate",
     "db": "nodemon ./db",
-    "build": "webpack --config webpack_config/webpack.prod.js",
+    "build": "rimraf dist && webpack --config webpack_config/webpack.prod.js",
     "prebuild": "check-node-version --package",
-    "build:downloadable": "BUILD_DOWNLOADABLE=true webpack --config webpack_config/webpack.prod.js",
+    "build:downloadable": "BUILD_DOWNLOADABLE=true rimraf dist && webpack --config webpack_config/webpack.prod.js",
     "prebuild:demo": "check-node-version --package",
     "test:coverage": "jest --config=jest_config/jest.config.json --coverage",
     "test": "jest --config=jest_config/jest.config.json",

diff --git a/spec/reducers/swap.spec.ts b/spec/reducers/swap.spec.ts
@@ -8,6 +8,17 @@ import {
 import { normalize } from 'normalizr';
 import * as schema from 'reducers/swap/schema';
 import { TypeKeys } from 'actions/swap/constants';
+import tokens from 'config/tokens/eth.json';
+import { SHAPESHIFT_TOKEN_WHITELIST } from 'api/shapeshift';
+
+describe('ensure whitelist', () => {
+  const findToken = (tkn: string) => tokens.find(t => t.symbol === tkn);
+  SHAPESHIFT_TOKEN_WHITELIST.forEach(t => {
+    it(`Should find Token ${t}`, () => {
+      expect(findToken(t)).toBeTruthy();
+    });
+  });
+});
 
 describe('swap reducer', () => {
   const shapeshiftApiResponse = {

diff --git a/webpack_config/webpack.prod.js b/webpack_config/webpack.prod.js
@@ -62,8 +62,12 @@ base.plugins.push(
     'process.env.NODE_ENV': JSON.stringify('production')
   }),
   new BabelMinifyPlugin({
+    // Mangle seems to be reusing variable identifiers, causing errors
     mangle: false,
-    propertyLiterals: false
+    // These two on top of a lodash file are causing illegal characters for
+    // safari and ios browsers
+    evaluate: false,
+    propertyLiterals: false,
   }, {
     comments: false
   }),