Fix conflicts

MyEtherWallet · Mar 10, 2020 · 00ccc14 · 00ccc14 · mew-bot · Mar 10, 2020
2 parents c80acd2 + 619cde6
commit 00ccc14
Show file tree

Hide file tree

Showing 16 changed files with 23,810 additions and 20,147 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ before_cache:
 install:
   - docker --version
   - docker build -t mew-build-container .
-  - docker run --rm -it -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm install"
+  - docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm install"
 env:
   global:
     - ci_env=`bash <(curl -s https://codecov.io/env)`
@@ -44,13 +44,13 @@ jobs:
   include:
     - stage: run on pull requests
       script:
-        - docker run --rm -it $ci_env -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run lint && npm run codecov && npm run build:history"
+        - docker run --rm $ci_env -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run lint && npm run codecov && npm run build:history"
     - stage: add to codecov
       script:
-        - docker run --rm -it $ci_env -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run codecov"
+        - docker run --rm $ci_env -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run codecov"
     - stage: add to mewbuilds develop
       before_script:
-        - docker run --rm -it -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history"
+        - docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history"
         - pip install --user awscli
       script:
         - aws s3 sync dist/ s3://mewbuilds/develop/ --delete --cache-control max-age=172800,public
@@ -63,7 +63,7 @@ jobs:
           --content-type text/html --acl public-read
     - stage: add to mewbuilds
       before_script:
-        - docker run --rm -it -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:hash"
+        - docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:hash"
         - pip install --user awscli
         - ssh-keyscan -H $IPFS_NODE >> $HOME/.ssh/known_hosts
       script:
@@ -94,7 +94,7 @@ jobs:
     - stage: create release
       script: skip
       before_deploy:
-        - docker run --rm -it -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:offline && npm run build:mewcx"
+        - docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:offline && npm run build:mewcx"
         - openssl aes-256-cbc -K $encrypted_2bd32a0810e2_key -iv $encrypted_2bd32a0810e2_iv
           -in ssh-keys.tar.enc -out ssh-keys.tar -d
         - tar xvf ssh-keys.tar
@@ -109,7 +109,7 @@ jobs:
     - stage: deploy to production
       script: skip
       before_deploy:
-        - docker run --rm -it -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:hash"
+        - docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:hash"
       deploy:
         provider: pages
         skip-cleanup: true
@@ -123,7 +123,7 @@ jobs:
     - stage: deploy to production history
       script: skip
       before_deploy:
-        - docker run --rm -it -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history"
+        - docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history"
         - pip install --user awscli
         - aws s3 sync dist/ s3://mewbuilds/staging/ --delete --cache-control max-age=172800,public
           --acl public-read

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,33 @@
+### Releaase v5.4.2
+
+### Bugs
+- Fix offline helper fee conversion [#2063] (https://github.com/MyEtherWallet/MyEtherWallet/pull/2063)
+
+### Devop
+
+- Update greenkeeper packages [#2078](https://github.com/MyEtherWallet/MyEtherWallet/pull/2078)
+
+
+### Release v5.4.1-hotfix.1
+
+### Bugs
+
+- Fix MEWconnect disconnecting soon after connecting [#2064](https://github.com/MyEtherWallet/MyEtherWallet/pull/2064)
+
 ### Release v5.4.1
 
 ### Bugs
 
+- Fix network changer [#2054](https://github.com/MyEtherWallet/MyEtherWallet/pull/2054)
+- Send Offline helper transaction fee [#2058](https://github.com/MyEtherWallet/MyEtherWallet/pull/2058)
 - Add burner address warning, redo store so all addresses currently stored are uniform [#2049](https://github.com/MyEtherWallet/MyEtherWallet/pull/2049)
 - Revert one time check [#2053](https://github.com/MyEtherWallet/MyEtherWallet/pull/2053)
 - Fix Buy ETH Widget bug [#2046](https://github.com/MyEtherWallet/MyEtherWallet/pull/2046)
 - Fix KB link [#2047](https://github.com/MyEtherWallet/MyEtherWallet/pull/2047)
 
 ### Devop
 
+- WS reconnect on disconnect [#2057](https://github.com/MyEtherWallet/MyEtherWallet/pull/2057)
 - Hardcode russian translation for first time welcome modal [#2041](https://github.com/MyEtherWallet/MyEtherWallet/pull/2041)
 - update client library for mew mobile and fix 500 DAI + kyber swap gas limit [#2029](https://github.com/MyEtherWallet/MyEtherWallet/pull/2029)
 - Add aave referral code [#2040](https://github.com/MyEtherWallet/MyEtherWallet/pull/2040/files)

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

diff --git a/package-audit.js b/package-audit.js
@@ -2,13 +2,20 @@ const exec = require('child_process').exec;
 
 // tar package is not applicable to web and waiting for other packages to update
 // remove handlebars once keepkey updates their dev dependencies
-const AUDIT_EXCEPTIONS = ['tar', 'js-yaml', 'handlebars', 'https-proxy-agent', 'cryptiles', 'decompress'];
+const AUDIT_EXCEPTIONS = [
+  'tar',
+  'js-yaml',
+  'handlebars',
+  'https-proxy-agent',
+  'cryptiles',
+  'decompress'
+];
 
 const execute = (command, callback) => {
   exec(
     command,
     {
-      maxBuffer: 2000 * 1024
+      maxBuffer: 6000 * 1024
     },
     (error, stdout, stderr) => {
       callback(stdout);