Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit b82880a

Browse files
spacesailor24AlexAlexGregTheGreekexx8
authored
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]>
1 parent e099b9d commit b82880a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+23300
-4845
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
strategy:
5151
matrix:
52-
node: [8, 10, 11, 12, 13]
52+
node: [11, 12, 13, 14]
5353
env:
5454
TEST: "unit"
5555
steps:
@@ -128,7 +128,7 @@ jobs:
128128
runs-on: ubuntu-latest
129129
strategy:
130130
matrix:
131-
node: [10, 11, 12, 13]
131+
node: [ 11, 12, 13, 14]
132132
env:
133133
TEST: "eth2"
134134
steps:

‎CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,6 @@ Released with 1.0.0-beta.37 code base.
400400

401401
- Removing the underscore package
402402

403-
## [Unreleased]
404-
405403
## [1.5.0]
406404

407405
### Added
@@ -418,6 +416,8 @@ Released with 1.0.0-beta.37 code base.
418416
- Changing web3 connection example from lets to const (#3967)
419417
- Updated the documentation for the transaction object to include EIP-2718 and EIP-1559 options (#4188)
420418

419+
## [Unreleased]
420+
421421
## [3.0.0]
422422

423423
### Changed
@@ -427,4 +427,4 @@ Released with 1.0.0-beta.37 code base.
427427

428428
### Removed
429429

430-
- Removed bzz and shh api (#3909)
430+
- Removed bzz and shh api (#3909)

‎dist/web3.min.js

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/web3.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.4.0",
2+
"version": "1.5.2",
33
"lerna": "2.0.0",
44
"command": {
55
"init": {

‎package-lock.json

+5,789-4,663
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Ethereum JavaScript API wrapper repository",
55
"license": "LGPL-3.0",
66
"engines": {
7-
"node": ">=8.0.0"
7+
"node": ">=11.0.0"
88
},
99
"main": "./packages/web3/src/index.js",
1010
"bundlesize": [
@@ -113,16 +113,16 @@
113113
"crypto-js": "^3.3.0",
114114
"decache": "^4.6.0",
115115
"dependency-check": "^4.1.0",
116-
"ethers": "^5.1.4",
116+
"ethers": "^5.4.4",
117117
"ganache-cli": "^6.12.0",
118118
"jshint": "^2.12.0",
119-
"karma": "^5.2.3",
119+
"karma": "^6.3.4",
120120
"karma-browserify": "^7.0.0",
121121
"karma-chrome-launcher": "^3.1.0",
122122
"karma-firefox-launcher": "^1.3.0",
123123
"karma-mocha": "^2.0.1",
124124
"karma-spec-reporter": "0.0.32",
125-
"lerna": "^3.22.1",
125+
"lerna": "^4.0.0",
126126
"mocha": "^6.2.3",
127127
"nyc": "^14.1.1",
128128
"pify": "^4.0.1",

‎packages/web3-core-helpers/package-lock.json

+34-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/web3-core-helpers/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-helpers",
3-
"version": "1.4.0",
3+
"version": "1.5.2",
44
"description": "Web3 core tools helper for sub packages. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
66
"license": "LGPL-3.0",
@@ -14,8 +14,8 @@
1414
},
1515
"main": "lib/index.js",
1616
"dependencies": {
17-
"web3-eth-iban": "1.4.0",
18-
"web3-utils": "1.4.0"
17+
"web3-eth-iban": "1.5.2",
18+
"web3-utils": "1.5.2"
1919
},
2020
"devDependencies": {
2121
"@types/node": "^12.12.6",

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,12 @@ var _txInputFormatter = function (options) {
157157
if (options.gas || options.gasLimit) {
158158
options.gas = options.gas || options.gasLimit;
159159
}
160+
161+
if (options.maxPriorityFeePerGas || options.maxFeePerGas) {
162+
delete options.gasPrice;
163+
}
160164

161-
['gasPrice', 'gas', 'value', 'nonce'].filter(function (key) {
165+
['gasPrice', 'gas', 'value', 'maxPriorityFeePerGas', 'maxFeePerGas', 'nonce'].filter(function (key) {
162166
return options[key] !== undefined;
163167
}).forEach(function (key) {
164168
options[key] = utils.numberToHex(options[key]);

0 commit comments

Comments
 (0)