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

[NIT-2671] Merge v1.13.14 #341

Merged
merged 17 commits into from
Jul 17, 2024
Merged

[NIT-2671] Merge v1.13.14 #341

merged 17 commits into from
Jul 17, 2024

Conversation

amsanghi
Copy link
Contributor

@amsanghi amsanghi commented Jul 16, 2024

Merge upstream geth's v1.13.13 release into our geth fork:https://github.com/ethereum/go-ethereum/releases/tag/v1.13.13

nitro PR- OffchainLabs/nitro#2495

Testing done

geth and nitro tests pass

fjl and others added 17 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 <[email protected]>

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

Signed-off-by: tmelhao <[email protected]>

* eth/catalyst: parentBeaconBlockRoot -> parentBlockBeaconRoot

Signed-off-by: tmelhao <[email protected]>

* apply commit review

Signed-off-by: tmelhao <[email protected]>

---------

Signed-off-by: tmelhao <[email protected]>
Co-authored-by: tmelhao <[email protected]>
…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 <[email protected]>
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 <[email protected]>

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

This reverts commit 17fab173883168c586d57ca9c05dfcbd9e7831b4.

Signed-off-by: jsvisa <[email protected]>

* use Debug if todo is empty

Signed-off-by: jsvisa <[email protected]>

---------

Signed-off-by: jsvisa <[email protected]>
…9095)

declare the 'already reserved' error in errors.go
Copy link

cla-bot bot commented Jul 16, 2024

We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2

@amsanghi amsanghi changed the title Merge v1.13.14 [NIT-2671] Merge v1.13.14 Jul 16, 2024
@amsanghi amsanghi changed the base branch from master to merge-v1.13.13 July 16, 2024 13:33
@amsanghi amsanghi marked this pull request as ready for review July 16, 2024 13:35
Base automatically changed from merge-v1.13.13 to master July 17, 2024 22:30
@tsahee tsahee merged commit 18256c2 into master Jul 17, 2024
6 of 7 checks passed
@tsahee tsahee deleted the merge-v1.13.14 branch July 17, 2024 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.