Skip to content

EIP-7742: Add target_blob_count to block header#7808

Merged
siladu merged 4 commits intobesu-eth:mainfrom
siladu:eip-7742
Oct 29, 2024
Merged

EIP-7742: Add target_blob_count to block header#7808
siladu merged 4 commits intobesu-eth:mainfrom
siladu:eip-7742

Conversation

@siladu
Copy link
Copy Markdown
Contributor

@siladu siladu commented Oct 24, 2024 •
edited
Loading

PR description

First major piece of EIP-7742: Add target_blob_count to the block header.

Still todo in future PRs:

  • Engine API
  • Wiring engine API to block header
  • block validation
  • gas accounting

Fixed Issue(s)

Part of #7605

Thanks for sending a pull request! Have you done the following?

  • Checked out our contribution guidelines?
  • Considered documentation and added the doc-change-required label to this PR if updates are required.
  • Considered the changelog and included an update if required.
  • For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

Locally, you can run these tests to catch failures early:

  • unit tests: ./gradlew build
  • acceptance tests: ./gradlew acceptanceTest
  • integration tests: ./gradlew integrationTest
  • reference tests: ./gradlew ethereum:referenceTests:referenceTests

@siladu siladu changed the title Add target_blob_count to block header EIP-7742 based on main Oct 24, 2024
siladu added 2 commits October 28, 2024 11:01
@siladu
Add target_blob_count to block header
6927e0f 
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu
debugging tests
abef70d 
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu siladu marked this pull request as ready for review October 28, 2024 02:18
siladu
siladu commented Oct 28, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor Author

@siladu siladu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some of my own comments for the reviewer

Comment thread .../java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEnginePragueAcceptanceTest.java
import org.junit.jupiter.params.provider.Arguments;

// TODO SLD
@Disabled("TODO SLD - Enable when Prague spec is finalized")
Copy link
Copy Markdown
Contributor Author

@siladu siladu Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I propose we leave this disabled until the nearer the end of the Prague dev work. Anything that changes the block hash (genesis, block header, some engine API changes) causes a cascading change to all the JSON files and it's time consuming to update this with every PR. In the meantime, we will still have regression signal in the devnets and execution-spec/references tests.

Copy link
Copy Markdown
Contributor

@jframe jframe Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's fine, still it's a lot of effort to update. Once the testnets are done though we should re-enable this test

Comment thread ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java
Comment on lines +50 to +51
// TODO SLD Quantity or UInt64Value<UInt64> instead?
protected final UInt64 targetBlobCount;
Copy link
Copy Markdown
Contributor Author

@siladu siladu Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some other code for similar types use a subclass of BaseUInt256Value (which implements Quantity and UInt256Value).
Withdrawals already uses UInt64 directly.

I think UInt64 is more direct than the tuweni generic base class construct and avoids yet another wrapper class.

Would like to get more opinions about the benefits of defining our own type, i.e. TargetBlobCount extends BaseUInt256Value<TargetBlobCount> implements Quantity

Copy link
Copy Markdown
Contributor Author

@siladu siladu Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note: Teku using UInt64 directly, as in this PR https://github.com/Consensys/teku/blob/110ce917f1fec942e2c2664c50a1bc3bb778ee07/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/PayloadAttributesV4.java#L48

Copy link
Copy Markdown
Contributor

@jframe jframe Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine with using UInt64 directly. Adding the new type doesn't add much value

@siladu
Update TODOs and some test infra
33a954d 
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu siladu changed the title EIP-7742 based on main EIP-7742: Add target_blob_count to block header Oct 28, 2024
jframe
jframe reviewed Oct 28, 2024
View reviewed changes
Comment thread config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
Comment thread .../java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEnginePragueAcceptanceTest.java
import org.junit.jupiter.params.provider.Arguments;

// TODO SLD
@Disabled("TODO SLD - Enable when Prague spec is finalized")
Copy link
Copy Markdown
Contributor

@jframe jframe Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's fine, still it's a lot of effort to update. Once the testnets are done though we should re-enable this test

@siladu siladu enabled auto-merge (squash) October 29, 2024 00:09
@siladu siladu merged commit f855d5b into besu-eth:main Oct 29, 2024
@siladu siladu deleted the eip-7742 branch October 29, 2024 01:05
JanetMo pushed a commit to JanetMo/besu that referenced this pull request Nov 17, 2024
@siladu @JanetMo
EIP-7742: Add target_blob_count to block header (besu-eth#7808)
e39cf97 
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Marlene Marz <m.marz@kabelmail.de>
@siladu siladu mentioned this pull request Dec 4, 2024
Merged
8 tasks
siladu added a commit to siladu/besu that referenced this pull request Jan 7, 2025
@siladu
Remove EIP-7742
d9060f0 
Revert "Rename targetBlobCount to targetBlobsPerBlock (besu-eth#7981)"

This reverts commit 1671306.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Revert "EIP-7742: Add target_blob_count to block header (besu-eth#7808)"

This reverts commit f855d5b.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
siladu added a commit that referenced this pull request Jan 7, 2025
@siladu
Remove EIP-7742 (#8083)
ffd593d 
This EIP was removed and equivalent functionality replaced by EIP-7840.

---

Revert "Rename targetBlobCount to targetBlobsPerBlock (#7981)"

This reverts commit 1671306.

Revert "EIP-7742: Add target_blob_count to block header (#7808)"

This reverts commit f855d5b.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
siladu added a commit to siladu/besu that referenced this pull request Jan 7, 2025
@siladu
Remove EIP-7742
a937e14 
Revert "Rename targetBlobCount to targetBlobsPerBlock (besu-eth#7981)"

This reverts commit 1671306.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Revert "EIP-7742: Add target_blob_count to block header (besu-eth#7808)"

This reverts commit f855d5b.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
pullurib pushed a commit to pullurib/besu that referenced this pull request Feb 6, 2025
@siladu
Remove EIP-7742 (besu-eth#8083)
8e0b351 
This EIP was removed and equivalent functionality replaced by EIP-7840.

---

Revert "Rename targetBlobCount to targetBlobsPerBlock (besu-eth#7981)"

This reverts commit 1671306.

Revert "EIP-7742: Add target_blob_count to block header (besu-eth#7808)"

This reverts commit f855d5b.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Bhanu Pulluri <bhanu.pulluri@kaleido.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jframe jframe jframe approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@siladu @jframe