Add OP Holocene fork by emlautarom1 · Pull Request #7761 · NethermindEth/nethermind

emlautarom1 · 2024-11-14T19:29:56Z

Resolves #7760

Changes

Support OP Holocene

Types of changes

What types of changes does your code introduce?

Bugfix (a non-breaking change that fixes an issue)
New feature (a non-breaking change that adds functionality)
Breaking change (a change that causes existing functionality not to work as expected)
Optimization
Refactoring
Documentation update
Build-related changes
Other: Description

Testing

Requires testing

Yes
No

If yes, did you write tests?

Yes
No

Notes on testing

Added tests that cover all new LOCs. Manual testing is still required.

Documentation

Requires documentation update

Yes
No

I don't think it's a requirement to update the docs.

Requires explanation in Release Notes

Yes
No

We should communicate that Nethermind is ready to support the new OP fork.

Remarks

Initially, only Sepolia timestamps are included for both Optimism and Base since those are the only ones currently known at this time.

- WriteTo - IsZero

- Source tests from op-geth

- Would always result in validation errors

=(

- Base and Optimism

LukaszRozmej

I still don't like the hidden dependency and side effect with BaseFeeCalculator.
I would change exceptions handling.

src/Nethermind/Chains/base-mainnet.json

src/Nethermind/Nethermind.Core/BaseFeeCalculator.cs

src/Nethermind/Nethermind.Core/Specs/IEip1559Spec.cs

src/Nethermind/Nethermind.Optimism/OptimismBaseFeeCalculator.cs

src/Nethermind/Nethermind.Optimism/OptimismHeaderValidator.cs

LukaszRozmej · 2024-11-20T10:02:57Z

src/Nethermind/Nethermind.Optimism/OptimismPayloadPreparationService.cs

+                var spec = _specProvider.GetSpec(currentBestBlock.Header);
+                if (spec.IsOpHoloceneEnabled)
+                {
+                    EIP1559Parameters eip1559Parameters = optimismPayload.DecodeEIP1559Parameters();


This could fail and throw exception

I think that at that point we've already validated the attributes so there should not be a risk of exceptions (unless I'm missing something):

We validate attributes in

nethermind/src/Nethermind/Nethermind.Merge.Plugin/Handlers/ForkchoiceUpdatedHandler.cs

Lines 89 to 95 in 4013c7a

public async Task<ResultWrapper<ForkchoiceUpdatedV1Result>> Handle(ForkchoiceStateV1 forkchoiceState, PayloadAttributes? payloadAttributes, int version)

{

Block? newHeadBlock = GetBlock(forkchoiceState.HeadBlockHash);

return await ApplyForkchoiceUpdate(newHeadBlock, forkchoiceState, payloadAttributes)

?? ValidateAttributes(payloadAttributes, version)

?? StartBuildingPayload(newHeadBlock!, forkchoiceState, payloadAttributes);

}

Then we use the IPreparationService in StartBuildingPayload

nethermind/src/Nethermind/Nethermind.Merge.Plugin/Handlers/ForkchoiceUpdatedHandler.cs

Line 327 in 4013c7a

payloadId = _payloadPreparationService.StartPreparingPayload(newHeadBlock.Header, payloadAttributes);

Eventually, OptimismPayloadPreparationService.ImproveBlock is called:

nethermind/src/Nethermind/Nethermind.Merge.Plugin/BlockProduction/PayloadPreparationService.cs

Lines 74 to 85 in 4013c7a

public string StartPreparingPayload(BlockHeader parentHeader, PayloadAttributes payloadAttributes)

{

string payloadId = payloadAttributes.GetPayloadId(parentHeader);

if (!_payloadStorage.ContainsKey(payloadId))

{

Block emptyBlock = ProduceEmptyBlock(payloadId, parentHeader, payloadAttributes);

ImproveBlock(payloadId, parentHeader, payloadAttributes, emptyBlock, DateTimeOffset.UtcNow);

}

else if (_logger.IsInfo) _logger.Info($"Payload with the same parameters has already started. PayloadId: {payloadId}");

return payloadId;

}

nethermind/src/Nethermind/Nethermind.Optimism/OptimismPayloadPreparationService.cs

Lines 45 to 46 in 4013c7a

protected override void ImproveBlock(string payloadId, BlockHeader parentHeader,

PayloadAttributes payloadAttributes, Block currentBestBlock, DateTimeOffset startDateTime)

emlautarom1 · 2024-11-20T20:19:44Z

src/Nethermind/Nethermind.Core/BaseFeeCalculator.cs

    }
 }
+
+public static class BaseFeeCalculator


I think we could remove this static class altogether by leveraging extension methods but for now I'll leave it as it is to avoid more diffs.

src/Nethermind/Nethermind.Optimism/Rpc/OptimismPayloadAttributes.cs

This reverts commit cc96168.

@flcl42

Recently we've added support for the upcoming Optimism hard-fork Holocene in Nethermind (NethermindEth/nethermind#7761) and the OP team suggested us to use OP's kurtosis package to test it. We found a couple of issues when trying to set up an enclave due to certain changes to other fork's timestamps which would trigger an error in Nethermind. To fix that, one of our developers (@flcl42) updated the `gen2spec.jq` script which fixes the above mentioned issue. Co-authored-by: Barnabas Busa <barnabas.busa@ethereum.org>

emlautarom1 added 30 commits November 7, 2024 17:02

Perform single dependency capture

6f0395e

Add Holocene to ReleaseSpec

fda85b9

Decode EIP1559 parameters from BlockHeader

32ee4f7

Validate ExtraData fields post-Holocene

5a8e70c

Collapse test cases

c8aa891

Test for pre-Holocene ExtraData validation

e0f5d5e

Extract to interface

d9a5c12

Allow for "zero" EIP1559 parameters

35d6ef0

Add concrete Eip1559Spec : IEip1559Spec

412fdbc

Add helper methods

315cc23

- WriteTo - IsZero

Add OptimismBaseFeeCalculator

0ce5908

- Source tests from op-geth

Remove unused using

22fc7ad

Add EIP1559Params to OptimismPayloadAttributes

3d14ce3

Rename file

a66b367

Use correct version

defe8f7

- Would always result in validation errors

Decode EIP1559 parameters from OptimismPayloadAttributes

ecabab6

Include EIP1559 params from attributes into block header

b7db888

Extract required length to constant

aef8a7c

Remove unused constructor

67c6577

Test payload validation before Holocene

551976c

Reintroduce BaseFeeCalculator singleton

53b6f8e

=(

Fix wrong test name

ae5c231

Mark tests parallelizable

97831af

Override BaseFeeCalculator in OP

44bbeeb

Use init only properties

db743b6

Use nameof

96675ab

Remove nullability

1405f1b

Add Holocene timestamp for Sepolia

6469275

- Base and Optimism

Add Holocene parameters

4603248

Merge branch 'master' into feat/optimism-holocene

fcd733d

emlautarom1 and others added 2 commits November 15, 2024 11:30

Add placeholder timestamp for mainnet

d9fd3e4

Merge branch 'master' into feat/optimism-holocene

4013c7a

LukaszRozmej reviewed Nov 20, 2024

View reviewed changes

emlautarom1 added 9 commits November 20, 2024 11:59

Perform single IsZero check

96e57e3

Rename class

b1ba8a4

Prefer errors over Exceptions

83e2f84

Make IBaseFeeCalculator part of IEip1559Spec

1d10135

Use IEip1559Spec.IBaseFeeCalculator in singleton

2c77b7b

Inject IBaseFeeCalculator through IChainSpecEngineParameters

18444bd

Make HoloceneTimestamp optional

bdf4d23

Fix substitutes

377829c

Avoid whitespace diff

0792ec4

emlautarom1 commented Nov 20, 2024

View reviewed changes

Merge branch 'master' into feat/optimism-holocene

9ea6945

emlautarom1 requested a review from LukaszRozmej November 20, 2024 20:28

LukaszRozmej approved these changes Nov 20, 2024

View reviewed changes

src/Nethermind/Nethermind.Optimism/Rpc/OptimismPayloadAttributes.cs Outdated Show resolved Hide resolved

emlautarom1 and others added 3 commits November 21, 2024 11:30

Extract constant

e3ad51c

Merge branch 'master' into feat/optimism-holocene

5ff8dff

Merge branch 'master' into feat/optimism-holocene

55e1fb6

emlautarom1 merged commit cc96168 into master Nov 21, 2024

emlautarom1 deleted the feat/optimism-holocene branch November 21, 2024 20:20

kamilchodola added a commit that referenced this pull request Nov 22, 2024

Revert "Add OP Holocene fork (#7761)"

b73108d

This reverts commit cc96168.

kamilchodola added a commit that referenced this pull request Nov 22, 2024

Revert "Add OP Holocene fork (#7761)" (#7791)

dcd80eb

emlautarom1 restored the feat/optimism-holocene branch November 22, 2024 16:12

emlautarom1 mentioned this pull request Nov 22, 2024

Add OP Holocene fork (retry) #7794

Merged

16 tasks

asdacap added a commit that referenced this pull request Nov 22, 2024

Revert "Add OP Holocene fork (#7761)"

471d388

This reverts commit cc96168.

emlautarom1 mentioned this pull request Nov 25, 2024

fix: Update Nethermind scripts for Holocene ethpandaops/optimism-package#92

Merged

LukaszRozmej mentioned this pull request Dec 3, 2024

EIP 7742 implementation #7518

Open

16 tasks

emlautarom1 mentioned this pull request Sep 30, 2025

OP Stack hardfork support - Jovian #9390

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add OP Holocene fork#7761

Add OP Holocene fork#7761
emlautarom1 merged 46 commits intomasterfrom
feat/optimism-holocene

emlautarom1 commented Nov 14, 2024 •

edited

Loading

Uh oh!

LukaszRozmej left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LukaszRozmej Nov 20, 2024

Uh oh!

emlautarom1 Nov 20, 2024 •

edited

Loading

Uh oh!

emlautarom1 Nov 20, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	public async Task<ResultWrapper<ForkchoiceUpdatedV1Result>> Handle(ForkchoiceStateV1 forkchoiceState, PayloadAttributes? payloadAttributes, int version)
	{
	Block? newHeadBlock = GetBlock(forkchoiceState.HeadBlockHash);
	return await ApplyForkchoiceUpdate(newHeadBlock, forkchoiceState, payloadAttributes)
	?? ValidateAttributes(payloadAttributes, version)
	?? StartBuildingPayload(newHeadBlock!, forkchoiceState, payloadAttributes);
	}

	public string StartPreparingPayload(BlockHeader parentHeader, PayloadAttributes payloadAttributes)
	{
	string payloadId = payloadAttributes.GetPayloadId(parentHeader);
	if (!_payloadStorage.ContainsKey(payloadId))
	{
	Block emptyBlock = ProduceEmptyBlock(payloadId, parentHeader, payloadAttributes);
	ImproveBlock(payloadId, parentHeader, payloadAttributes, emptyBlock, DateTimeOffset.UtcNow);
	}
	else if (_logger.IsInfo) _logger.Info($"Payload with the same parameters has already started. PayloadId: {payloadId}");

	return payloadId;
	}

	protected override void ImproveBlock(string payloadId, BlockHeader parentHeader,
	PayloadAttributes payloadAttributes, Block currentBestBlock, DateTimeOffset startDateTime)

Conversation

emlautarom1 commented Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Types of changes

What types of changes does your code introduce?

Testing

Requires testing

If yes, did you write tests?

Notes on testing

Documentation

Requires documentation update

Requires explanation in Release Notes

Remarks

Uh oh!

LukaszRozmej left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LukaszRozmej Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

emlautarom1 Nov 20, 2024 • 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!

emlautarom1 Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

emlautarom1 commented Nov 14, 2024 •

edited

Loading

emlautarom1 Nov 20, 2024 •

edited

Loading