Merge Geth [v1.15.0...v1.15.11] #499

qianhh · 2025-08-22T06:19:22Z

This PR merges v1.15.0...v1.15.11 of Geth into bane-main and aimed to close #496 and #517.

Progress

v1.15.0
v1.15.1...v1.15.11
The node functions normally and consensus runs fine (1/4/7 privnet).
Mainnet/T4 sync is OK.

The list of important PRs that were merged. @AnnaShaleva, @txhsl, please have a look at these PRs before the review.

Merged but Reverted

cmd/bootnode: remove bootnode utility ethereum/go-ethereum#30813
eth/downloader: move SyncMode to package eth/ethconfig ethereum/go-ethereum#30847 If this PR is merged, there will be a circular reference in the dbft.
README: remove private network section from readme ethereum/go-ethereum#31005
all: nuke total difficulty ethereum/go-ethereum#30744 I reverted a portion.
eth: remove EventMux accessors ethereum/go-ethereum#30017

txhsl · 2025-09-03T09:17:31Z

You can try to accept core/blockchain design for post-merge chain, it still works for pre-merge chain. Or I can open a PR for this,

txhsl · 2025-09-03T09:49:09Z

The merge of ./Makefile need to be refined, e.g. the line of .PHONY and missing command fmt. Put help after devtools, obey the order of declaration.

qianhh · 2025-09-04T07:37:57Z

You can try to accept core/blockchain design for post-merge chain, it still works for pre-merge chain. Or I can open a PR for this,

This issue has already been created. #507

txhsl · 2025-09-04T08:33:31Z

This issue has already been created. #507

I've uploaded 19f4dd5 to describe the difference from my v1.15.11. It works on privnets, so let's have a check.

The Ethereum change about Beacon.VerifyHeader needs to be evaluated, but the left things should work, maybe in a more v.1.15 way.

qianhh · 2025-09-04T09:49:20Z

I've uploaded 19f4dd5 to describe the difference from my v1.15.11. It works on privnets, so let's have a check.

The Ethereum change about Beacon.VerifyHeader needs to be evaluated, but the left things should work, maybe in a more v.1.15 way.

Starting the 7CNs privnet will get stuck at block 30.

txhsl · 2025-09-04T10:01:42Z

Starting the 7CNs privnet will get stuck at block 30.

There seems something wrong in synchronization and reorg, just for reference. I can spend some time looking into it.

Fixed, but this time a test TestPrunedImportSideWithMerging is failing, so still digging.

txhsl · 2025-09-05T09:24:38Z

Starting the 7CNs privnet will get stuck at block 30.

@qianhh I reworked the low level chain implementation based on bsc, there is no impossible reorg any more.

Have a try on 4bc167f. I wish we can merge this part from upstream in this PR, because IMO it is an essential part of v1.15, maybe even the beacon consensus changes.

qianhh · 2025-09-05T10:18:09Z

Have a try on 4bc167f. I wish we can merge this part from upstream in this PR, because IMO it is an essential part of v1.15, maybe even the beacon consensus changes.

OK, I'll test it again. The BSC issue was resolved because the consensus was separated from the beacon and no longer used the beacon for packaging. That is, a post-merge process was carried out. I also implemented a version(624241e) based on BSC, the test results seem to be fine.

This is an attempt to work around a gcc issue in the Docker build.

This reverts commit 7b96ec4dae8d4ddeffc761c7757c12e2d2b8bf74.

This changes the `-upload` flag to just toggle the upload. The remote image name is now configured using the `-hub` flag.

This PR builds on #29040 and updates it to the new version of the spec. I filled the EEST tests and they pass. Link to spec: https://eips.ethereum.org/EIPS/eip-7623 --------- Co-authored-by: Marius van der Wijden <[email protected]> Co-authored-by: lightclient <[email protected]> Co-authored-by: lightclient <[email protected]>

Implements ethereum/EIPs#9248

Finalize Prague system contract addresses. Reference: * ethereum/EIPs#9287 * ethereum/EIPs#9288 * ethereum/EIPs#9289

I caught this error on Hive. It was introduced by ethereum/go-ethereum#31071 because after adding the equality check the request type 0 will be rejected.

Removes duplicate code in the interpreter loop.

Fixes a typo in the error message within the `fuzzCrossG2Add` function. The panic message incorrectly references "G1 point addition mismatch" when it should be "G2 point addition mismatch," as the function deals with G2 points. This doesn't affect functionality but could cause confusion during debugging. I've updated the message to reflect the correct curve.

This is a follow-up PR to #29792 to get rid of the data file sync. **This is a non-backward compatible change, which increments the database version from 8 to 9**. We introduce a flushOffset for each freezer table, which tracks the position of the most recently fsync’d item in the index file. When this offset moves forward, it indicates that all index entries below it, along with their corresponding data items, have been properly persisted to disk. The offset can also be moved backward when truncating from either the head or tail of the file. Previously, the data file required an explicit fsync after every mutation, which was highly inefficient. With the introduction of the flush offset, the synchronization strategy becomes more flexible, allowing the freezer to sync every 30 seconds instead. The data items above the flush offset are regarded volatile and callers must ensure they are recoverable after the unclean shutdown, or explicitly sync the freezer before any proceeding operations. --------- Co-authored-by: Felix Lange <[email protected]>

This PR fixes a data race in SetupGenesisWithOverride.

txhsl · 2025-10-11T06:57:38Z

@qianhh I think I've fully merged ethereum/go-ethereum#31414, please check and update the PR introduction if possible. This feature needs testing as well.

*: revert customized behaviors about finalized block

txhsl

LGTM now, further improvement is still welcome.

txhsl · 2025-10-16T11:53:06Z

Seems like I misunderstood the blob data handling, the current EL implementation is only a collector of blob transaction.

There are two store-and-prune places for blob data in the Ethereum network:

In EL blob pool, there is a short-term storage, https://github.com/ethereum/go-ethereum/blob/0a2c21acd59767cb07c950ad86c67ee8b6db49ab/core/txpool/blobpool/limbo.go#L127;
In CL file system, there is a long-term storage, https://github.com/OffchainLabs/prysm/blob/develop/beacon-chain/db/filesystem/layout.go#L240.

The whole life cycle of a blob is like the following:

Blob transactions are sent to EL blob pool;
Blob metadata and sidecars are committed to CL;
CL confirms the blob transaction and store the data;
EL deletes the temporary storage for blob transactions after CL finalized (about 12.8 mins, 2 epochs of 32 blocks);
CL prunes the file storage for blob data after expiration (about 18.2 days, 4096 epochs of 32 blocks).

Since the EL temporary storage implemented with https://github.com/holiman/billy, it is not designed to persist a blob for its full life cycle, and we don't have methods to access them correctly.

go-ethereum/core/txpool/blobpool/slotter.go

Lines 19 to 38 in d32fea9

    
           // newSlotter creates a helper method for the Billy datastore that returns the 
        
           // individual shelf sizes used to store transactions in. 
        
           // 
        
           // The slotter will create shelves for each possible blob count + some tx metadata 
        
           // wiggle room, up to the max permitted limits. 
        
           // 
        
           // The slotter also creates a shelf for 0-blob transactions. Whilst those are not 
        
           // allowed in the current protocol, having an empty shelf is not a relevant use 
        
           // of resources, but it makes stress testing with junk transactions simpler. 
        
           func newSlotter(maxBlobsPerTransaction int) func() (uint32, bool) { 
        
           	slotsize := uint32(txAvgSize) 
        
           	slotsize -= uint32(blobSize) // underflows, it's ok, will overflow back in the first return 
        
           	return func() (size uint32, done bool) { 
        
           		slotsize += blobSize 
        
           		finished := slotsize > uint32(maxBlobsPerTransaction)*blobSize+txMaxSize 
        
           		return slotsize, finished 
        
           	} 
        
           }

About the db design, we can refer to its introduction. If we refer to the configuration of billy shelves, it defines a fixed number of shelves for a specific maxBlobsPerTransaction setting. The most important thing is, this storage builds a full index in Geth memory.

I can't leave this storage keeping increasing, it's not publicly accessible or efficient, because it is only designed to handle PoS reorgs. Let's solve this in #520, here we give it a fallback value for pruning.

txhsl · 2025-10-20T07:09:24Z

@songb2 detected a transaction root mismatch error with blob transactions in dBFT, checking.

txhsl · 2025-10-20T08:32:44Z

@songb2 detected a transaction root mismatch error with blob transactions in dBFT, checking.

Fixed, the root is dBFT fetched full blob data from local pool, but sidecar should not be included in the block.

txhsl · 2025-10-21T07:56:14Z

@songb2 Open issues if you find any error, I'm going to merge.

qianhh force-pushed the upd-v1.15.11 branch from 01d0713 to 1117fbc Compare September 1, 2025 09:17

txhsl added a commit that referenced this pull request Sep 4, 2025

*: diff #499

cd822e2

txhsl added a commit that referenced this pull request Sep 4, 2025

*: diff #499

515d85f

txhsl added a commit that referenced this pull request Sep 4, 2025

*: diff #499

35fe63e

txhsl added a commit that referenced this pull request Sep 4, 2025

*: diff #499

19f4dd5

txhsl added a commit that referenced this pull request Sep 5, 2025

*: diff #499

5f6a0a0

txhsl added a commit that referenced this pull request Sep 5, 2025

*: diff #499

4bc167f

txhsl added a commit that referenced this pull request Sep 11, 2025

*: diff #499

bf8f241

txhsl added a commit that referenced this pull request Sep 11, 2025

*: diff #499

766025c

txhsl added a commit that referenced this pull request Sep 15, 2025

*: diff #499

3802800

fjl and others added 12 commits September 16, 2025 15:37

.travis.yml: change arch for Docker build to arm64 (#31096)

63e8d34

This is an attempt to work around a gcc issue in the Docker build.

Revert ".travis.yml: change arch for Docker build to arm64 (#31096)"

27b49ee

This reverts commit 7b96ec4dae8d4ddeffc761c7757c12e2d2b8bf74.

build: provide a flag to disable publishing in dockerx build (#31098)

bac66a9

This changes the `-upload` flag to just toggle the upload. The remote image name is now configured using the `-hub` flag.

all: add build tags for wasip1 (#31090)

de815f1

core/vm: EXTCODE* return delegation designator for 7702 (#31089)

d829123

Implements ethereum/EIPs#9248

params: update system contract addresses for devnet-6 (#31102)

c985b81

Finalize Prague system contract addresses. Reference: * ethereum/EIPs#9287 * ethereum/EIPs#9288 * ethereum/EIPs#9289

eth/catalyst: fix validation of type 0 request (#31103)

1162365

I caught this error on Hive. It was introduced by ethereum/go-ethereum#31071 because after adding the equality check the request type 0 will be rejected.

core/vm: simplify tracer hook invocation in interpreter loop (#31074)

806c4fc

Removes duplicate code in the interpreter loop.

core: copy genesis before modifying (#31097)

a8e41bf

This PR fixes a data race in SetupGenesisWithOverride.

qianhh force-pushed the upd-v1.15.11 branch from 631d850 to ffba5f8 Compare October 9, 2025 09:20

eth: update apis with pruning cutoff

1a369ec

txhsl force-pushed the upd-v1.15.11 branch from 6f8a7db to 76b4d03 Compare October 11, 2025 06:43

eth/downloader: update with pruning cutoff

4ed40ed

txhsl force-pushed the upd-v1.15.11 branch from 76b4d03 to 4ed40ed Compare October 11, 2025 07:26

txhsl linked an issue Oct 11, 2025 that may be closed by this pull request

Failed chain freezer on Privnet #517

Closed

txhsl and others added 2 commits October 11, 2025 17:29

*: revert 1940bd3

1c902b3

Merge pull request #518 from bane-labs/revert-finalized-behavior

4cc9b43

*: revert customized behaviors about finalized block

txhsl approved these changes Oct 13, 2025

View reviewed changes

txhsl mentioned this pull request Oct 16, 2025

contracts: remove proxy checks and upgrade hardhat #519

Merged

txhsl mentioned this pull request Oct 17, 2025

Persist and prune blob data correctly #520

Open

core/txpool: set 128 blocks as the fallback value for old blob eviction

0d2d149

txhsl force-pushed the upd-v1.15.11 branch 2 times, most recently from 783a0a8 to a073b73 Compare October 17, 2025 11:11

txhsl mentioned this pull request Oct 18, 2025

Handle and verify blob transactions in dBFT correctly #521

Closed

txhsl force-pushed the upd-v1.15.11 branch from a073b73 to a64d2b6 Compare October 19, 2025 10:33

txhsl added 2 commits October 20, 2025 15:18

consensus/dbft: forbid new transaction types in envelope verification

4b9dee7

privnet: fix network ids in genesis

3034529

txhsl force-pushed the upd-v1.15.11 branch from a64d2b6 to 3034529 Compare October 20, 2025 07:19

consensus/dbft: forbid blobsidecar fetching from local pool

5d83197

txhsl linked an issue Oct 20, 2025 that may be closed by this pull request

Handle and verify blob transactions in dBFT correctly #521

Closed

eth/filter: handle cutoff chain correctly

d43373c

txhsl merged commit 18f8547 into bane-main Oct 21, 2025
2 checks passed

txhsl deleted the upd-v1.15.11 branch October 21, 2025 07:57

AnnaShaleva mentioned this pull request Oct 23, 2025

Release v0.5.0 #522

Merged

Merge Geth [v1.15.0...v1.15.11] #499

Merge Geth [v1.15.0...v1.15.11] #499

Uh oh!

Conversation

qianhh commented Aug 22, 2025 • edited by txhsl Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Sep 3, 2025

Uh oh!

txhsl commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qianhh commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qianhh commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Sep 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qianhh commented Sep 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Oct 11, 2025

Uh oh!

txhsl left a comment

Choose a reason for hiding this comment

Uh oh!

txhsl commented Oct 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Oct 20, 2025

Uh oh!

txhsl commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

txhsl commented Oct 21, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

70 participants

qianhh commented Aug 22, 2025 •

edited by txhsl

Loading

txhsl commented Sep 3, 2025 •

edited

Loading

qianhh commented Sep 4, 2025 •

edited

Loading

txhsl commented Sep 4, 2025 •

edited

Loading

qianhh commented Sep 4, 2025 •

edited

Loading

txhsl commented Sep 4, 2025 •

edited

Loading

txhsl commented Sep 5, 2025 •

edited

Loading

qianhh commented Sep 5, 2025 •

edited

Loading

txhsl commented Oct 16, 2025 •

edited

Loading

txhsl commented Oct 20, 2025 •

edited

Loading