Merge branch '1.x' of github.com:ethereum/web3.js into wyatt/eth2-ref…

…actor
web3 · Oct 22, 2020 · b61f87f · b61f87f
2 parents 72b050b + 16320d2
commit b61f87f
Show file tree

Hide file tree

Showing 24 changed files with 21,090 additions and 67,700 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -308,3 +308,4 @@ Released with 1.0.0-beta.37 code base.
 - Fix possible unhandled promise rejection when sending a transaction (#3708)
 - Fixed decoding bytes and string parameters for logs emitted with solc 0.4.x (#3724, #3738)
 - Grammar changes to inputAddressFormatter error message
+- Fixed vulnerable dependencies
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -114,9 +114,9 @@
         "crypto-js": "^3.3.0",
         "decache": "^4.6.0",
         "dependency-check": "^4.1.0",
-        "ethereumjs-common": "^1.5.2",
+        "ethereumjs-common": "^1.3.2",
         "ethereumjs-tx": "^2.1.2",
-        "ethers": "4.0.33",
+        "ethers": "^5.0.18",
         "ethjs-signer": "^0.1.1",
         "ganache-cli": "^6.12.0",
         "jshint": "^2.12.0",