Update 3.x with latest 1.x

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node: [8, 10, 11, 12, 13]
+                node: [11, 12, 13, 14]
         env:
             TEST: "unit"
         steps:
@@ -128,7 +128,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node: [10, 11, 12, 13]
+                node: [ 11, 12, 13, 14]
         env:
             TEST: "eth2"
         steps:

CHANGELOG.md

@@ -400,8 +400,6 @@ Released with 1.0.0-beta.37 code base.
 
 - Removing the underscore package 
 
-## [Unreleased]
-
 ## [1.5.0]
 
 ### Added
@@ -418,6 +416,8 @@ Released with 1.0.0-beta.37 code base.
  - Changing web3 connection example from lets to const (#3967)
  - Updated the documentation for the transaction object to include EIP-2718 and EIP-1559 options (#4188)
 
+## [Unreleased]
+
 ## [3.0.0]
 
 ### Changed
@@ -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.4.0",
+  "version": "1.5.2",
   "lerna": "2.0.0",
   "command": {
     "init": {

package.json

@@ -4,7 +4,7 @@
     "description": "Ethereum JavaScript API wrapper repository",
     "license": "LGPL-3.0",
     "engines": {
-        "node": ">=8.0.0"
+        "node": ">=11.0.0"
     },
     "main": "./packages/web3/src/index.js",
     "bundlesize": [
@@ -113,16 +113,16 @@
         "crypto-js": "^3.3.0",
         "decache": "^4.6.0",
         "dependency-check": "^4.1.0",
-        "ethers": "^5.1.4",
+        "ethers": "^5.4.4",
         "ganache-cli": "^6.12.0",
         "jshint": "^2.12.0",
-        "karma": "^5.2.3",
+        "karma": "^6.3.4",
         "karma-browserify": "^7.0.0",
         "karma-chrome-launcher": "^3.1.0",
         "karma-firefox-launcher": "^1.3.0",
         "karma-mocha": "^2.0.1",
         "karma-spec-reporter": "0.0.32",
-        "lerna": "^3.22.1",
+        "lerna": "^4.0.0",
         "mocha": "^6.2.3",
         "nyc": "^14.1.1",
         "pify": "^4.0.1",

packages/web3-core-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-helpers",
-    "version": "1.4.0",
+    "version": "1.5.2",
     "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",
@@ -14,8 +14,8 @@
     },
     "main": "lib/index.js",
     "dependencies": {
-        "web3-eth-iban": "1.4.0",
-        "web3-utils": "1.4.0"
+        "web3-eth-iban": "1.5.2",
+        "web3-utils": "1.5.2"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",

packages/web3-core-helpers/src/formatters.js

@@ -157,8 +157,12 @@ var _txInputFormatter = function (options) {
     if (options.gas || options.gasLimit) {
         options.gas = options.gas || options.gasLimit;
     }
+
+    if (options.maxPriorityFeePerGas || options.maxFeePerGas) {
+        delete options.gasPrice;
+    }
 
-    ['gasPrice', 'gas', 'value', 'nonce'].filter(function (key) {
+    ['gasPrice', 'gas', 'value', 'maxPriorityFeePerGas', 'maxFeePerGas', 'nonce'].filter(function (key) {
         return options[key] !== undefined;
     }).forEach(function (key) {
         options[key] = utils.numberToHex(options[key]);