Merge branch 'master' into Add_support_for_fuse_network

bobu4 · May 28, 2020 · 23fd96b · 23fd96b
2 parents 3b698e8 + d2b6e75
commit 23fd96b
Show file tree

Hide file tree

Showing 124 changed files with 4,798 additions and 1,737 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,7 +3,8 @@ module.exports = {
     VERSION: 'readonly',
     ROUTER_MODE: 'readonly',
     BUILD_TYPE: 'readonly',
-    NODE_ENV: 'readonly'
+    NODE_ENV: 'readonly',
+    FULL_SOURCEMAPS: 'readonly'
   },
   root: true,
   env: {

diff --git a/.github/workflows/build-cx-generate-zip.yml b/.github/workflows/build-cx-generate-zip.yml
@@ -33,7 +33,7 @@ jobs:
         run: docker run --rm -v `pwd`:/home:rw --user "$(id -u):$(id -g)" mew-build-container /bin/bash -c "npm install"
 
       - name: build
-        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "NODE_OPTIONS=--max-old-space-size=8192 npm run build:mewcx"
+        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:mewcx"
 
       - name: generate zip for cx
         if: contains(github.ref, 'cx')

diff --git a/.github/workflows/deploy-live.yml b/.github/workflows/deploy-live.yml
@@ -39,7 +39,24 @@ jobs:
         run: docker run --rm -v `pwd`:/home:rw --user "$(id -u):$(id -g)" mew-build-container /bin/bash -c "npm install"
 
       - name: build
-        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history"
+        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history:sourcemaps"
+
+      - name: Get release tag
+        id: get_release_tag
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+
+      - name: deploy to sentry
+        env:
+          SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_TOKEN}}
+          SENTRY_ORG: myetherwallet-inc
+        run: |
+          curl -sL https://sentry.io/get-cli/ | bash
+          TAG=${{ steps.get_release_tag.outputs.VERSION }}
+          RELEASE=${TAG//v/}
+          sentry-cli releases new -p myetherwallet $RELEASE
+          sentry-cli releases -p myetherwallet files $RELEASE upload-sourcemaps ./dist/sourcemaps
+          sentry-cli releases set-commits $RELEASE --auto
+          sentry-cli releases finalize $RELEASE
 
       - name: deploy to production
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,36 @@
+### Release v5.6.3
+
+### Bug
+
+- Sentry fixes y [#2400](https://github.com/MyEtherWallet/MyEtherWallet/pull/2400)
+- Sentry fixes j [#2396](https://github.com/MyEtherWallet/MyEtherWallet/pull/2396)
+- Fix address not getting returned for unable to validate addresses and disable swap when recalculating rates[#2397](https://github.com/MyEtherWallet/MyEtherWallet/pull/2397)
+- Fix errors from sentry [#2393](https://github.com/MyEtherWallet/MyEtherWallet/pull/2393)
+- Fix perkle network connection [#2389](https://github.com/MyEtherWallet/MyEtherWallet/pull/2389)
+- Fix errors from sentry [#2388](https://github.com/MyEtherWallet/MyEtherWallet/pull/2388)
+
+### Devop
+
+- Fix MEW CX build [#2403](https://github.com/MyEtherWallet/MyEtherWallet/pull/2403)
+- Update terms of service [#2394](https://github.com/MyEtherWallet/MyEtherWallet/pull/2394)
+- Fix sentry releases [#2395](https://github.com/MyEtherWallet/MyEtherWallet/pull/2395)
+
+### Release v5.6.2
+
+### Feature
+
+- Multimanage ens [#2376](https://github.com/MyEtherWallet/MyEtherWallet/pull/2376)
+
+### Devop
+
+- Cleanup token with the new package update [#2338](https://github.com/MyEtherWallet/MyEtherWallet/pull/2338)
+- Mingrate sentry/fix contracts [#2366](https://github.com/MyEtherWallet/MyEtherWallet/pull/2366)
+- Remove CW promo [#2377](https://github.com/MyEtherWallet/MyEtherWallet/pull/2377)
+
+### Bug
+
+- Fix error when user has no ens name [#2384](https://github.com/MyEtherWallet/MyEtherWallet/pull/2384)
+
 ### Release v5.6.1
 
 ### Devop

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:10.17.0-stretch
 
 ENV HOME /home
-ENV NODE_OPTIONS --max-old-space-size=8192
+ENV NODE_OPTIONS --max-old-space-size=6144
 RUN npm install npm@6.14 -g
 RUN node -v && npm -v
 COPY package*.json ./

diff --git a/ENV_VARS.js b/ENV_VARS.js
@@ -4,5 +4,6 @@ module.exports = {
   VERSION: JSON.stringify(version),
   ROUTER_MODE: JSON.stringify(process.env.ROUTER_MODE || 'hash'),
   BUILD_TYPE: JSON.stringify(process.env.BUILD_TYPE || 'web'),
+  FULL_SOURCEMAPS: JSON.stringify(process.env.FULL_SOURCEMAPS || 'false'),
   NODE_ENV: JSON.stringify(process.env.NODE_ENV)
 };
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/MyEtherWallet/MyEtherWallet/total.svg?style=flat-square)](https://www.github.com/MyEtherWallet/MyEtherWallet/releases)
 [![GitHub issues](https://img.shields.io/github/issues-raw/MyEtherWallet/MyEtherWallet.svg?style=flat-square)](https://github.com/MyEtherWallet/MyEtherWallet/issues)
 [![Travis](https://img.shields.io/travis/MyEtherWallet/MyEtherWallet.svg?style=flat-square)](https://travis-ci.org/MyEtherWallet/MyEtherWallet)
-[![GitHub package version](https://img.shields.io/github/package-json/v/MyEtherWallet/MyEtherWallet.svg?style=flat-square)](https://github.com/MyEtherWallet/MyEtherWallet/blob/master/package.json) [![Greenkeeper badge](https://badges.greenkeeper.io/MyEtherWallet/MyEtherWallet.svg)](https://greenkeeper.io/)
+[![GitHub package version](https://img.shields.io/github/package-json/v/MyEtherWallet/MyEtherWallet.svg?style=flat-square)](https://github.com/MyEtherWallet/MyEtherWallet/blob/master/package.json) 
 ![GitHub contributors](https://img.shields.io/github/contributors/MyEtherWallet/MyEtherWallet.svg?style=flat-square) [![Codecov badge](https://img.shields.io/codecov/c/github/MyEtherWallet/MyEtherWallet/develop.svg?style=flat-square)](https://codecov.io/github/MyEtherWallet/MyEtherWallet?branch=develop)
 
 MyEtherWallet is a doorway to the Ethereum blockchain, allowing users to manage their own funds without a centralized platform. -_Stephen, #MEWForce_

diff --git a/checklockconflicts.sh b/checklockconflicts.sh
@@ -1,7 +1,7 @@
 if grep -Fxq "<<<<<<< HEAD" package-lock.json
 then
     echo "Conflict found! Fixing...."
-    npm install --package-lock-only
+    npm install --package-lock-only --ignore-scripts
     echo "Fixed!"
 else
     echo "No conflicts found in package-lock.json!"

diff --git a/fetchLists/lists/contracts.json b/fetchLists/lists/contracts.json
diff --git a/fetchLists/lists/tokens.json b/fetchLists/lists/tokens.json
diff --git a/jest.config.js b/jest.config.js
@@ -5,7 +5,8 @@ module.exports = {
     VERSION: 'test',
     NODE_ENV: 'test',
     ROUTER_MODE: 'hash',
-    BUILD_TYPE: 'web'
+    BUILD_TYPE: 'web',
+    FULL_SOURCEMAPS: 'false'
   },
   collectCoverageFrom: ['src/**/*.{js,vue}'],
   coveragePathIgnorePatterns: [

diff --git a/package-audit.js b/package-audit.js
@@ -1,6 +1,6 @@
 const exec = require('child_process').exec;
 
-const AUDIT_EXCEPTIONS = ['decompress'];
+const AUDIT_EXCEPTIONS = ['decompress', 'http-proxy'];
 
 const execute = (command, callback) => {
   exec(