Merge conflicts

CHANGELOG.md

@@ -427,4 +427,4 @@ Released with 1.0.0-beta.37 code base.
 
 ### Removed
 
-- Removed bzz and shh api (#3909)
+- Removed bzz and shh api (#3909)

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.5",
+  "version": "1.3.6",
   "lerna": "2.0.0",
   "command": {
     "init": {

package.json

@@ -95,8 +95,8 @@
         "@babel/preset-env": "^7.12.1",
         "@babel/preset-typescript": "^7.12.1",
         "@babel/runtime": "^7.12.1",
-        "@chainsafe/geth-dev-assistant": "^0.1.9",
-        "@ensdomains/ens": "^0.4.5",
+        "@chainsafe/geth-dev-assistant": "^0.1.10",
+        "@ensdomains/ens": "^0.6.0",
         "@ensdomains/resolver": "^0.2.4",
         "@types/bignumber.js": "^4.0.2",
         "@types/bn.js": "^4.11.6",
@@ -116,7 +116,7 @@
         "dependency-check": "^4.1.0",
         "ethereumjs-common": "^1.3.2",
         "ethereumjs-tx": "^2.1.2",
-        "ethers": "^5.0.18",
+        "ethers": "^5.1.4",
         "ganache-cli": "^6.12.0",
         "jshint": "^2.12.0",
         "karma": "^5.2.3",

packages/web3-core-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-helpers",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "description": "Web3 core tools helper for sub packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
     "license": "LGPL-3.0",
@@ -15,8 +15,8 @@
     "main": "lib/index.js",
     "dependencies": {
         "underscore": "1.12.1",
-        "web3-eth-iban": "1.3.5",
-        "web3-utils": "1.3.5"
+        "web3-eth-iban": "1.3.6",
+        "web3-utils": "1.3.6"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",

packages/web3-core-method/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-method",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "description": "Creates the methods on the web3 modules. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method",
     "license": "LGPL-3.0",
@@ -16,10 +16,10 @@
     "dependencies": {
         "@ethersproject/transactions": "^5.0.0-beta.135",
         "underscore": "1.12.1",
-        "web3-core-helpers": "1.3.5",
-        "web3-core-promievent": "1.3.5",
-        "web3-core-subscriptions": "1.3.5",
-        "web3-utils": "1.3.5"
+        "web3-core-helpers": "1.3.6",
+        "web3-core-promievent": "1.3.6",
+        "web3-core-subscriptions": "1.3.6",
+        "web3-utils": "1.3.6"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-promievent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-promievent",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent",
     "license": "LGPL-3.0",