Consolidated EIP-4844 #5724

jflo · 2023-07-25T15:53:10Z

Implements EIP-4844.

introduces a Hardfork class to the protocol schedule system
new Engine APIs required for CL to work on 4844
refactors Engine API tests to reuse OR override prior versions
new DataGas type for tracking block cost for 4844 data
new VersionedHash type to reflect that a versioned hash is not quite a pure sha256
incorporates wrapped jc-kzg library for KZG point evaluations
New transaction type, and domain objects for constituent parts to represent the Blobs, KZGCommitments, and Proofs used for 4844
RLP encoders and decoders to support new transaction type
gas pricing calculators for the new type of gas
plugin-api version was changed

github-actions · 2023-07-25T15:53:20Z

I thought about documentation and added the doc-change-required label to this PR if updates are required.
I thought about the changelog and included a changelog update if required.
If my PR includes database changes (e.g. KeyValueSegmentIdentifier) I have thought about compatibility and performed forwards and backwards compatibility tests

.../main/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java

@@ -188,6 +189,7 @@
          Hash.fromHexString(mixHash), // mixHash
          Bytes.fromHexStringLenient(nonce).toLong(),
          withdrawalsRoot != null ? Hash.fromHexString(withdrawalsRoot) : null,
+          dataGasUsed != null ? Long.parseLong(dataGasUsed) : 0,


.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java

@@ -341,6 +389,98 @@
    return INVALID;
  }

+  protected ValidationResult<RpcErrorType> validateForkSupported(
+      final Object id, final EnginePayloadParameter payloadParameter) {


* introduces a Hardfork class to the protocol schedule system * new Engine APIs required for CL to work on 4844 * new DataGas type for tracking block cost for 4844 data * new VersionedHash type to reflect that a versioned hash is not quite a pure sha256 * incorporates wrapped jc-kzg library for KZG point evaluations * New transaction type, and domain objects for constituent parts to represent the Blobs, KZGCommitments, and Proofs used for 4844 * RLP encoders and decoders to support new transaction type * gas pricing calculators for the new type of gas * plugin-api version was changed Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk>

Signed-off-by: Justin Florentine <justin+github@florentine.us>

Cancun gas claculator was inheriting from london, should have been shanghai. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

macfarla

LGTM

macfarla · 2023-07-26T16:11:29Z

.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java

+    if (!forkValidationResult.isValid()) {
+      return new JsonRpcErrorResponse(reqId, forkValidationResult.getInvalidReason());
+    }
+    */


is this left in deliberately?

macfarla · 2023-07-26T16:18:39Z

...um/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java

+        VersionedHash.SHA256_VERSION_ID, Sha256Hash.hash(commitment));
+  }
+
+   */


deliberately left in here?

macfarla · 2023-07-26T16:19:48Z

...e/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ExcessDataGasCalculator.java

+/** Calculates the excess data gas for a parent block header. */
+public class ExcessDataGasCalculator {
+  /**
+   * public class ExcessDataGasCalculator { /** Calculates the excess data gas for a parent block


Suggested change

* public class ExcessDataGasCalculator { /** Calculates the excess data gas for a parent block

* Calculates the excess data gas for a parent block

macfarla · 2023-07-26T16:22:42Z

...ore/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarketTest.java

@@ -147,6 +147,6 @@ public void implementsDataFeedShouldReturnFalse() {

  @Test
  public void dataPriceShouldReturnsZero() {


Suggested change

public void dataPriceShouldReturnsZero() {

public void dataPricePerGasShouldReturnZero() {

macfarla · 2023-07-26T16:23:37Z

...reum/core/src/test/resources/org/hyperledger/besu/ethereum/core/encoding/BlobDataFixture.bin

garyschulte · 2023-07-26T23:00:35Z

congrats @jflo, a monumental merge

* Implements EIP-4844. * introduces a Hardfork class to the protocol schedule system * new Engine APIs required for CL to work on 4844 * new DataGas type for tracking block cost for 4844 data * new VersionedHash type to reflect that a versioned hash is not quite a pure sha256 * incorporates wrapped jc-kzg library for KZG point evaluations * New transaction type, and domain objects for constituent parts to represent the Blobs, KZGCommitments, and Proofs used for 4844 * RLP encoders and decoders to support new transaction type * gas pricing calculators for the new type of gas * plugin-api version was changed Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk> * junit5 updates Signed-off-by: Justin Florentine <justin+github@florentine.us> * update t8n test Cancun gas claculator was inheriting from london, should have been shanghai. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Justin Florentine <justin+github@florentine.us> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

* Implements EIP-4844. * introduces a Hardfork class to the protocol schedule system * new Engine APIs required for CL to work on 4844 * new DataGas type for tracking block cost for 4844 data * new VersionedHash type to reflect that a versioned hash is not quite a pure sha256 * incorporates wrapped jc-kzg library for KZG point evaluations * New transaction type, and domain objects for constituent parts to represent the Blobs, KZGCommitments, and Proofs used for 4844 * RLP encoders and decoders to support new transaction type * gas pricing calculators for the new type of gas * plugin-api version was changed Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk> * junit5 updates Signed-off-by: Justin Florentine <justin+github@florentine.us> * update t8n test Cancun gas claculator was inheriting from london, should have been shanghai. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Justin Florentine <justin+github@florentine.us> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: garyschulte <garyschulte@gmail.com>

* Implements EIP-4844. * introduces a Hardfork class to the protocol schedule system * new Engine APIs required for CL to work on 4844 * new DataGas type for tracking block cost for 4844 data * new VersionedHash type to reflect that a versioned hash is not quite a pure sha256 * incorporates wrapped jc-kzg library for KZG point evaluations * New transaction type, and domain objects for constituent parts to represent the Blobs, KZGCommitments, and Proofs used for 4844 * RLP encoders and decoders to support new transaction type * gas pricing calculators for the new type of gas * plugin-api version was changed Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk> * junit5 updates Signed-off-by: Justin Florentine <justin+github@florentine.us> * update t8n test Cancun gas claculator was inheriting from london, should have been shanghai. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Justin Florentine <justin+github@florentine.us> Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Stefan <stefan.pingel@consensys.net> Co-authored-by: spencer-tb <spencer@spencertaylorbrown.uk> Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

jflo force-pushed the EIP-4844 branch from f187b4e to 239f892 Compare July 25, 2023 20:54

github-advanced-security bot found potential problems Jul 25, 2023

View reviewed changes

jflo and others added 3 commits July 26, 2023 10:35

junit5 updates

0af857d

Signed-off-by: Justin Florentine <justin+github@florentine.us>

update t8n test

d28c210

Cancun gas claculator was inheriting from london, should have been shanghai. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

jflo force-pushed the EIP-4844 branch from 5a7d8b7 to d28c210 Compare July 26, 2023 14:35

jflo marked this pull request as ready for review July 26, 2023 14:53

macfarla approved these changes Jul 26, 2023

View reviewed changes

fab-10 approved these changes Jul 26, 2023

View reviewed changes

jflo merged commit 1c099e8 into hyperledger:main Jul 26, 2023
8 checks passed

jflo mentioned this pull request Jul 26, 2023

EIP - 4844 #5536

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidated EIP-4844 #5724

Consolidated EIP-4844 #5724

jflo commented Jul 25, 2023 •

edited

Loading

github-actions bot commented Jul 25, 2023

macfarla left a comment

macfarla Jul 26, 2023

macfarla Jul 26, 2023

macfarla Jul 26, 2023

macfarla Jul 26, 2023

macfarla Jul 26, 2023

garyschulte commented Jul 26, 2023

	* public class ExcessDataGasCalculator { /** Calculates the excess data gas for a parent block
	* Calculates the excess data gas for a parent block

		@@ -147,6 +147,6 @@ public void implementsDataFeedShouldReturnFalse() {

		@Test
		public void dataPriceShouldReturnsZero() {

	public void dataPriceShouldReturnsZero() {
	public void dataPricePerGasShouldReturnZero() {

Consolidated EIP-4844 #5724

Consolidated EIP-4844 #5724

Conversation

jflo commented Jul 25, 2023 • edited Loading

github-actions bot commented Jul 25, 2023

macfarla left a comment

Choose a reason for hiding this comment

macfarla Jul 26, 2023

Choose a reason for hiding this comment

macfarla Jul 26, 2023

Choose a reason for hiding this comment

macfarla Jul 26, 2023

Choose a reason for hiding this comment

macfarla Jul 26, 2023

Choose a reason for hiding this comment

macfarla Jul 26, 2023

Choose a reason for hiding this comment

garyschulte commented Jul 26, 2023

jflo commented Jul 25, 2023 •

edited

Loading