Update 3.x with latest 1.x (#4275)

* Merge conflitcs * Add unsubscribeByID (#4061) * adding function unsubscribe by id * adding an unsubscribe testcase * adding testcase * seperated unsubscribebyid to its own method * adding testcases * adding await * fixing testcases Co-authored-by: Alex <[email protected]> Co-authored-by: Alex <[email protected]> * ignore .md and docs (#4077) * Merge conflicts * Merge conflicts * Release v1.4.0 (#4118) * npm run build for 1.4.0-rc.0 * v1.4.0-rc.0 * 1.4.0 Geth version downgrade (#4149) * Update pull Geth docker version from stable to pre-london (1.10.3) * Update CHANGELOG * v1.4.0 * remove underscore (#4069) * removed some of the underscore methods in web3-core-method * removed underscore from bzz * adding subscriptions * fixing up test cases * changing variable names * removed underscore from formatters.js * removed underscore from request manager and abi * removing underscore in the rest of the web3 packages * fixing exports * fixing failing testcases * removing underscore from tests * addressing feedback * removing unwanted code from transaction * removing underscore from remaining packages * updating change log * addressing feedback * adding strict equality * efficient short circuiting * fixing test case * Merge conflicts * Update docs 2 (#4188) * add nonce to send options. * add nonce to send options. * Update CHANGELOG.md * linting * updating docs * update web3-shh.rst : whisper-overview broken link (#4170) whisper overview has been moved from https://github.com/ethereum/go-ethereum/wiki/Whisper to https://eth.wiki/concepts/whisper/whisper-overview * [Docs] Fixed a broken link (#4151) Original link gives out a 404, replaced by the closest thing I could find. * Possible typo in docs (#4088) I think the author missed a "this" in the phrase * Typically you will have only one Web3 connection, use const (#3967) Co-authored-by: Gregory Markou <[email protected]> * Removing deprecation notice for HttpProvider (#4008) * Removing deprecation notice for HttpProvider From my view, it is just a provider with less capabilities than websockets, but still widely useful — and widely used as well. @frozeman @nivida @GregTheGreek any thoughts? * Update include_package-core.rst * Update CHANGELOG.md Co-authored-by: Gregory Markou <[email protected]> Co-authored-by: Alex <[email protected]> * [Docs] Updated solidity example to modern syntax (#4147) * [Docs] Updated solidity example to modern syntax Replaced the old constructor function syntax with the modern one, added 'emit' to event calls, added pragma, added a valid bytes32 value and updated the JSON ABI. * [Docs] Fixed a broken link (#1) Original link gives out a 404, replaced by the proper guide. Co-authored-by: Juan Alonso <[email protected]> * Revert "[Docs] Fixed a broken link (#1)" This reverts commit 0de1272. Co-authored-by: Juan Alonso <[email protected]> * added EIP-2718 and EIP-1559 documentation * fixing typo * addressing feedback * changing possible types for maxPriorityFeePerGas * updating maxFeePerGas type * update changelog Co-authored-by: exx8 <[email protected]> Co-authored-by: starwalker00 <[email protected]> Co-authored-by: mongolsteppe <[email protected]> Co-authored-by: João Monteiro <[email protected]> Co-authored-by: William Entriken <[email protected]> Co-authored-by: Gregory Markou <[email protected]> Co-authored-by: Ev <[email protected]> Co-authored-by: Juan Alonso <[email protected]> * eth_feeHistory (EIP 1559) (#4191) * WIP * Add missing fields for test runner * Correct function arguments for getFeeHistory * getFeeHistory tests with correct arguments * Init utils.toNumber function * Rename toNumber test to hexToNumber * Add inputFormatters to getFeeHistory * Rename newestBlock to lastBlock. Update types for blockCount and lastBlock * Add additional tests with different input types * Add missing function export * eth-feehistory docs (#4190) * updating docs * updating example * updating types and adding example of list * Update docs/web3-eth.rst * Update docs/web3-eth.rst * Update docs/web3-eth.rst Co-authored-by: alex <[email protected]> Co-authored-by: Wyatt Barnes <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: alex <[email protected]> * Update CHANGELOG (#4193) Test don't run when only changes to `CHANGELOG.md` have been made * Merge conflicts * Merge conflicts * Merge conflicts * Merge conflicts * Merge conflicts * Merge conflicts * Merge conflicts * Merge conflicts Co-authored-by: Alex <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: Gregory Markou <[email protected]> Co-authored-by: exx8 <[email protected]> Co-authored-by: starwalker00 <[email protected]> Co-authored-by: mongolsteppe <[email protected]> Co-authored-by: João Monteiro <[email protected]> Co-authored-by: William Entriken <[email protected]> Co-authored-by: Ev <[email protected]> Co-authored-by: Juan Alonso <[email protected]> Co-authored-by: alex <[email protected]> Co-authored-by: jdevcs <[email protected]>
web3 · Aug 26, 2021 · b82880a · b82880a
1 parent e099b9d
commit b82880a
Show file tree

Hide file tree

Showing 60 changed files with 23,300 additions and 4,845 deletions.
diff --git a/.github/workflows/build.yml b/.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:

diff --git a/CHANGELOG.md b/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)
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/dist/web3.min.js.map b/dist/web3.min.js.map
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.4.0",
+  "version": "1.5.2",
   "lerna": "2.0.0",
   "command": {
     "init": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/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",

diff --git a/packages/web3-core-helpers/package-lock.json b/packages/web3-core-helpers/package-lock.json
diff --git a/packages/web3-core-helpers/package.json b/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",

diff --git a/packages/web3-core-helpers/src/formatters.js b/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]);