Polygon Bhilai Fork Updates by mh0lt · Pull Request #15261 · erigontech/erigon

mh0lt · 2025-05-26T09:57:46Z

This PR implements the Bhilai fork changes as specified in:

and also the feature to allow early block announcements specified in:

The individual changes included here are:

PIP-60: Increase gas limit to 45M
PIP-58: Increase BaseFeeChangeDenominator to 64
EIP-2537: Precompile for BLS12-381 curve operations
EIP-2935: Save historical block hashes in state
EIP-7623: Increase calldata cost
EIP-7702: Set EOA account code (PIP-51)
PIP-66: Allow early block announcements

yperbasis

Need to update (evm *EVM) precompile(addr common.Address) for Bhilai

yperbasis

isEoaCodeAllowed in filterBadTransactions should be extended to Bhilai

yperbasis · 2025-05-26T14:34:04Z

If maticnetwork/bor includes Bhilai into fork ID, then we need to do that in GatherForks (similar to Napoli).

mh0lt · 2025-05-26T15:06:22Z

isEoaCodeAllowed in filterBadTransactions should be extended to Bhilai

Fixed by: 9581c31

mh0lt · 2025-05-26T15:06:39Z

If maticnetwork/bor includes Bhilai into fork ID, then we need to do that in GatherForks (similar to Napoli).

Fixed by: 9581c31

mh0lt · 2025-05-26T15:07:57Z

Need to update (evm *EVM) precompile(addr common.Address) for Bhilai

Fixed by: 9581c31

manav2401 · 2025-05-26T16:37:06Z

 	}
+	if bhilaiBlock != nil {
+		if !bhilaiBlock.IsUint64() {
+			return nil, errors.New("agraBlock overflow")


small nit: it should be bhilaiBlock overflow

Fixed by: 1f5f126

manav2401 · 2025-05-27T07:36:12Z

+		// from non-primary producer. Such blocks will be rejected later when we know the succession
+		// number of the signer in the current sprint.
+		if header.Time-config.CalculatePeriod(header.Number.Uint64()) > uint64(time.Now().Unix()) {
+			return fmt.Errorf("%w: expected: %s(%s), got: %s", consensus.ErrFutureBlock, time.Unix(now.Unix(), 0), now, time.Unix(int64(header.Time), 0))


Just a suggestion from previous experience -- we have found errors with unix based timestamps much easy to debug and understand instead of printing full time stamps.
Reference: 0xPolygon/bor@f735312

You will notice that it actually prints both. This is because we have discovered an issue - particularly on amoy where we are receiving 'early packets', however these are actually withing a few milliseconds of the clock time.

time.Unix just truncates the nanosecond part of the timestamp meaning that you need to receive at a second's granularity if your clock is slow. The information is included in the error so it is clear what is going on.

I have not changed what is being checked as we're about to allow early headers which will make this go away.

Its part of a bigger occasional problem we see in erigon where we occasionally see gaps in processing headers. We have traced it down to these missing headers getting dropped and then on certain occasions not being recovered - we're still trying work out what is happening.

I see that for Ethereum we have a very generous tolerance of 15 sec - see allowedFutureBlockTimeSeconds

yperbasis · 2025-05-28T10:02:23Z

-	cfg.GasLimit, err = flags.GetUint64(MinerGasLimitFlag.Name)
-	if err != nil {
+	gasLimit, err := flags.GetUint64(MinerGasLimitFlag.Name)
+	if _, ok := err.(*strconv.NumError); ok || err == nil {


When can strconv.NumError happen?

If the flag is not set then it will return a parse error, Because the value is "".

Ideally we should make this an optional flag and check for optionality - but I couldn't see an obvious way of doing that.

Actually re-reviewing the doe I can just use is set. I'll change it.

Updated in: a8d32b9

yperbasis · 2025-05-28T12:39:27Z


+	var delay time.Duration
 	// Sweet, the protocol permits us to sign the block, wait for our time
-	delay := time.Until(time.Unix(int64(header.Time), 0))


[nitpicking] To avoid duplication we could keep this line, but override it if IsBhilai && successionNumber == 0

Fixed by: e8a60ea

yperbasis · 2025-05-28T12:40:23Z

+		// early block announcements. Note that this is a loose check and would allow early blocks
+		// from non-primary producer. Such blocks will be rejected later when we know the succession
+		// number of the signer in the current sprint.
+		if header.Time-config.CalculatePeriod(header.Number.Uint64()) > uint64(time.Now().Unix()) {


ValidateHeaderTime should use its now argument instead of time.Now()

Fixed by: e8a60ea

This is a fix to PR #15261. Before this PR [EIP-7623](https://eips.ethereum.org/EIPS/eip-7623) and [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) were not counted as activated in `(p *TxPool) validateTx` when [Bhilai](https://github.com/maticnetwork/Polygon-Improvement-Proposals/blob/main/PIPs/PIP-63.md) was activated.

Perhaps it doesn't matter much in practice, but this PR hardens the [implementation](#15261) of [PIP-66](https://github.com/maticnetwork/Polygon-Improvement-Proposals/blob/main/PIPs/PIP-66.md) to avoid potential `uint64` overflows.

Perhaps it doesn't matter much in practice, but this PR hardens the [implementation](#15261) of [PIP-66](https://github.com/maticnetwork/Polygon-Improvement-Proposals/blob/main/PIPs/PIP-66.md) to avoid potential `uint64` overflows. (cherry picked from commit bc4cb61)

This is a fix to PR #15261. Before this PR [EIP-7623](https://eips.ethereum.org/EIPS/eip-7623) and [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) were not counted as activated in `(p *TxPool) validateTx` when [Bhilai](https://github.com/maticnetwork/Polygon-Improvement-Proposals/blob/main/PIPs/PIP-63.md) was activated. (cherry picked from commit fc4f264)

mh0lt added 11 commits May 20, 2025 21:53

Updated chain config

855da5f

eip-7702 config

082ce43

Merge branch 'main' into bhilai_fork_updates

fcb6cf3

eip-2537 config

1ab5f9b

eip-2935 config

f3f3400

eip-7632 config

b4618e9

pip-58 config

ae8af51

pip-60 config

99192da

pip-66 (rfc-255) changes

a216d1f

fix lint issues

4aba167

fix txpool tests

0aef2e2

yperbasis mentioned this pull request May 26, 2025

Chain-specific default gas limits #15267

Closed

yperbasis requested changes May 26, 2025

View reviewed changes

yperbasis reviewed May 26, 2025

View reviewed changes

Comment thread polygon/bor/bor.go Outdated

yperbasis reviewed May 26, 2025

View reviewed changes

Comment thread core/vm/contracts.go

yperbasis reviewed May 26, 2025

View reviewed changes

Comment thread core/vm/interpreter.go Outdated

yperbasis requested changes May 26, 2025

View reviewed changes

fix bor tests

8600b75

yperbasis added the Pectra label May 26, 2025

mh0lt added this to the 3.0.5 milestone May 26, 2025

Adjust bhilai config settings

9581c31

lint fixes

14c5609

manav2401 reviewed May 26, 2025

View reviewed changes

Fix error message

1f5f126

manav2401 reviewed May 27, 2025

View reviewed changes

yperbasis reviewed May 28, 2025

View reviewed changes

Comment thread core/vm/contracts.go Outdated

yperbasis reviewed May 28, 2025

View reviewed changes

yperbasis mentioned this pull request May 28, 2025

EIP-7892: Blob Parameter Only Hardforks - 2nd attempt #15067

Merged

mh0lt added 2 commits May 28, 2025 12:40

add explicit check for MinerGasLimitFlag

a8d32b9

moved p256Verify to end of precompiles

fbd4aac

mh0lt requested review from manav2401 and yperbasis May 28, 2025 11:53

yperbasis reviewed May 28, 2025

View reviewed changes

yperbasis requested changes May 28, 2025

View reviewed changes

mh0lt added 2 commits May 28, 2025 17:18

fix time.Now to make checking consistent

e8a60ea

Merge branch 'main' into bhilai_fork_updates

3186399

yperbasis approved these changes May 29, 2025

View reviewed changes

yperbasis enabled auto-merge (squash) May 29, 2025 08:34

yperbasis merged commit 589d81f into main May 29, 2025
11 checks passed

yperbasis deleted the bhilai_fork_updates branch May 29, 2025 08:40

This was referenced May 29, 2025

polygon Bhilai: harden PIP-66 when header.Time < period #15325

Merged

txpool: fix Bhilai wiring in validateTx #15326

Merged

mh0lt mentioned this pull request May 29, 2025

R3 Polygon Bhilai Fork Updates #15331

Merged

yperbasis removed this from the 3.0.5 milestone May 30, 2025

Conversation

mh0lt commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yperbasis left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yperbasis left a comment

Choose a reason for hiding this comment

Uh oh!

yperbasis commented May 26, 2025

Uh oh!

mh0lt commented May 26, 2025

Uh oh!

mh0lt commented May 26, 2025

Uh oh!

mh0lt commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

manav2401 May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yperbasis May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mh0lt commented May 26, 2025 •

edited

Loading

mh0lt commented May 26, 2025 •

edited

Loading

manav2401 May 27, 2025 •

edited

Loading

yperbasis May 28, 2025 •

edited

Loading