Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge upstream geth v1.13.14 #310

Merged
merged 19 commits into from
May 2, 2024
Merged

merge upstream geth v1.13.14 #310

merged 19 commits into from
May 2, 2024

Conversation

axelKingsley
Copy link
Contributor

@axelKingsley axelKingsley commented Apr 30, 2024

Merges upstream geth v1.13.14 into optimism. This PR points at the outstanding branch for v.1.13.13 because that version has changes which we must build on

Additional Changes Required:
None. See v1.13.13 for changes it requires

Testing

Tested via unit tests, and also via CI Workflow on the monorepo: ethereum-optimism/optimism#10349

No Monorepo changes were required for this version beyond what was already needed for prior versions.

fjl and others added 19 commits February 21, 2024 15:49
eth_call and debug_traceCall allow users to override various block fields, among them base fee. However the overriden base fee was not considered for computing the effective gas price of that message, and instead base fee of the base block was used. This has been fixed in this commit.
This PR enhances eth_createAccessList RPC call to support scenarios where the node is launched with an unlimited gas cap (--rpc.gascap 0). The eth_createAccessList RPC call returns failure if user doesn't explicitly set a gas limit.
* eth/catalyst: the same error format

Signed-off-by: tmelhao <tmelhao@gmail.com>

* eth/catalyst: wrong error message for payloadV2 post-cancun

Signed-off-by: tmelhao <tmelhao@gmail.com>

* eth/catalyst: parentBeaconBlockRoot -> parentBlockBeaconRoot

Signed-off-by: tmelhao <tmelhao@gmail.com>

* apply commit review

Signed-off-by: tmelhao <tmelhao@gmail.com>

---------

Signed-off-by: tmelhao <tmelhao@gmail.com>
Co-authored-by: tmelhao <tmelhao@gmail.com>
…081)

* make blobpool reject blob transactions with fee below the minimum

* core/txpool: some minot nitpick polishes and unified error formats

* core/txpool: do less big.Int constructions with the min blob cap

---------

Co-authored-by: Péter Szilágyi <peterke@gmail.com>
Add space after links in so they are clickable in vscode.
xcore/txpool/blobpool: reduce default database cap for rollout
* core/txpool: no need to run rotate if no local txs

Signed-off-by: jsvisa <delweng@gmail.com>

* Revert "core/txpool: no need to run rotate if no local txs"

This reverts commit 17fab173883168c586d57ca9c05dfcbd9e7831b4.

Signed-off-by: jsvisa <delweng@gmail.com>

* use Debug if todo is empty

Signed-off-by: jsvisa <delweng@gmail.com>

---------

Signed-off-by: jsvisa <delweng@gmail.com>
…9095)

declare the 'already reserved' error in errors.go
@axelKingsley axelKingsley changed the title Axel/1 13 14 merge merge upstream geth v1.13.14 May 1, 2024
@axelKingsley axelKingsley marked this pull request as ready for review May 1, 2024 14:36
@axelKingsley axelKingsley requested a review from a team as a code owner May 1, 2024 14:36
@axelKingsley axelKingsley requested review from ajsutton and trianglesphere and removed request for a team May 1, 2024 14:36
Base automatically changed from axel/1_13_13_merge to optimism May 2, 2024 17:44
@axelKingsley axelKingsley merged commit 0b4285d into optimism May 2, 2024
6 checks passed
@axelKingsley axelKingsley deleted the axel/1_13_14_merge branch May 2, 2024 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.