Gas accounting for EIP-4844 #4992

fab-10 · 2023-01-24T09:34:21Z

Signed-off-by: Fabio Di Fabio [email protected]

PR description

This PR introduces the gas accounting for EIP-4844, specifically it introduce a data gas price and a data gas cost.

There is a new fee market named after Cancun that can calculate the data price, a new gas calculator to compute the gas
used by a blob transaction and a new gas limit calculator to track the max data gas per block.
There are changes also to the transactions selection during the block creation to take in account the data gas used and check it against the limits.

Fixed Issue(s)

fixes #4825

Documentation

I thought about documentation and added the doc-change-required label to this PR if
updates are required.

Changelog

I thought about the changelog and included a changelog update if required.

Signed-off-by: Fabio Di Fabio <[email protected]>

matkt · 2023-01-24T10:20:24Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java

@@ -83,6 +84,9 @@ public abstract class MainnetProtocolSpecs {
  public static final int SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT = 24576;
  public static final int SHANGHAI_INIT_CODE_SIZE_LIMIT = 2 * SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT;

+  private static final int CANCUN_MIN_DATA_GAS_PRICE = 1;


Maybe we can move that to CancunGasCalculator

matkt · 2023-01-24T10:22:29Z

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

+        dataGas = 0L;
+      }
+
+      final long gasAvailable = transaction.getGasLimit() - intrinsicGas - accessListGas - dataGas;
      LOG.trace(
          "Gas available for execution {} = {} - {} (limit - intrinsic)",


can we add dataGas to the log ?

sure, will add also accessListGas that is missing too

matkt · 2023-01-24T10:24:16Z

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

+              transaction.getPayload().size(), maxInitcodeSize));
+    }
+
+    if (transaction.getType().supportsBlob()) {


if we want to push all the cost verification in the same method maybe we can also move this one ?

matkt · 2023-01-24T10:25:42Z

evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java

+/** The Cancun gas calculator. */
+public class CancunGasCalculator extends LondonGasCalculator {
+
+  public static final int CANCUN_DATA_GAS_PER_BLOB = 131072; // 2^17


maybe we can link the EIP in a comment for future dev

done in the class doc

matkt · 2023-01-24T10:30:30Z

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

-      final long gasAvailable = transaction.getGasLimit() - intrinsicGas - accessListGas;
+      final long dataGas;
+      if (feeMarket.implementsDataFee()) {
+        dataGas = gasCalculator.dataGasCost(transaction.getVersionedHashes().orElseThrow().size());


we can use blobcount for this one or remove this one because we are already calculating this value in 306 line

good catch, fixed

Signed-off-by: Fabio Di Fabio <[email protected]>

shemnon · 2023-01-24T16:09:51Z

evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java

+  public static final long CANCUN_DATA_GAS_PER_BLOB = 131072; // 2^17
+  public static final long CANCUN_TARGET_DATA_GAS_PER_BLOCK = 262144; // 2^18


Suggested change

public static final long CANCUN_DATA_GAS_PER_BLOB = 131072; // 2^17

public static final long CANCUN_TARGET_DATA_GAS_PER_BLOCK = 262144; // 2^18

public static final long CANCUN_DATA_GAS_PER_BLOB = 1 << 17;

public static final long CANCUN_TARGET_DATA_GAS_PER_BLOCK = 1 << 18;

Signed-off-by: Fabio Di Fabio <[email protected]>

...e/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculator.java

merge of #4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]>

* adding test for nonblob blob transaction * Do not add consumed data gas to gas used in the transaction receipt Signed-off-by: Jiri Peinlich <[email protected]> Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Jiri Peinlich <[email protected]>

Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Justin Florentine <[email protected]>

This reverts commit 0719ded. Signed-off-by: Fabio Di Fabio <[email protected]>

* adding test for nonblob blob transaction * Do not add consumed data gas to gas used in the transaction receipt Signed-off-by: Jiri Peinlich <[email protected]> Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Jiri Peinlich <[email protected]>

Signed-off-by: Fabio Di Fabio <[email protected]>

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

Signed-off-by: Fabio Di Fabio <[email protected]>

merge of #4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 949e3fe) (cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)

merge of #4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 949e3fe) (cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820) Signed-off-by: Gabriel-Trintinalia <[email protected]>

merge of #4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 949e3fe) (cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)

merge of #4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 949e3fe) (cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820) Signed-off-by: Gabriel-Trintinalia <[email protected]>

merge of hyperledger#4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 949e3fe) (cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)

merge of hyperledger#4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]> (cherry picked from commit 949e3fe) (cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820) Signed-off-by: Gabriel-Trintinalia <[email protected]>

Signed-off-by: Fabio Di Fabio <[email protected]>

fab-10 added 2 commits January 24, 2023 10:33

Gas accounting for EIP-4844

8e43731

Signed-off-by: Fabio Di Fabio <[email protected]>

Update CHANGELOG

05f4387

Signed-off-by: Fabio Di Fabio <[email protected]>

matkt reviewed Jan 24, 2023

View reviewed changes

fab-10 added 11 commits January 24, 2023 11:53

Fix tests

7a94b4a

Signed-off-by: Fabio Di Fabio <[email protected]>

Merge branch 'main' into 4844-gas-accounting

642c26f

Remove duplicated code

18ef1be

Signed-off-by: Fabio Di Fabio <[email protected]>

Fix blob tx identification

080ead0

Signed-off-by: Fabio Di Fabio <[email protected]>

Merge branch 'main' into 4844-gas-accounting

52c00f9

Update log

55b1f7a

Signed-off-by: Fabio Di Fabio <[email protected]>

Add reference to the EIP-4844

657f975

Signed-off-by: Fabio Di Fabio <[email protected]>

Fix and improvements from code review

0a0c702

Signed-off-by: Fabio Di Fabio <[email protected]>

Move Cancun fee market constants into Cancun class

ffb6c93

Signed-off-by: Fabio Di Fabio <[email protected]>

Code reorg

72c6988

Signed-off-by: Fabio Di Fabio <[email protected]>

Track max data gas per block using GasLimitCalculator

6c575ec

Signed-off-by: Fabio Di Fabio <[email protected]>

fab-10 force-pushed the 4844-gas-accounting branch from a962023 to 6c575ec Compare January 24, 2023 15:00

Use long internally to represent data gas

1699663

Signed-off-by: Fabio Di Fabio <[email protected]>

shemnon approved these changes Jan 24, 2023

View reviewed changes

fab-10 added 2 commits January 24, 2023 17:18

Fix javadoc

af7c70a

Signed-off-by: Fabio Di Fabio <[email protected]>

Write power of 2 in a self documenting way

79e9338

Signed-off-by: Fabio Di Fabio <[email protected]>

github-advanced-security bot found potential problems Jan 24, 2023

View reviewed changes

...e/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculator.java Fixed Show fixed Hide fixed

garyschulte pushed a commit that referenced this pull request Jan 25, 2023

[Interop-4844] Data gas accounting (#4998)

949e3fe

merge of #4992 into interop feature branch Signed-off-by: Fabio Di Fabio <[email protected]>

fab-10 and others added 6 commits January 30, 2023 19:30

Allow blob tx in Cancun (hyperledger#5007)

c967962

Signed-off-by: Fabio Di Fabio <[email protected]> Co-authored-by: Justin Florentine <[email protected]>

Revert "Consumed data gas receipt fix (hyperledger#5018)"

437c770

This reverts commit 0719ded. Signed-off-by: Fabio Di Fabio <[email protected]>

Fix data gas calculation during block import (hyperledger#5023)

112e774

Signed-off-by: Fabio Di Fabio <[email protected]>

Merge branch 'main' into 4844-gas-accounting

a9ecadd

github-advanced-security bot found potential problems Feb 1, 2023

View reviewed changes

...um/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java Fixed Show fixed Hide fixed

fab-10 added 2 commits February 3, 2023 17:19

Merge branch 'main' into 4844-gas-accounting

dd5f1c4

Correctly set the fee market Cancun (hyperledger#5045)

fc9abee

Signed-off-by: Fabio Di Fabio <[email protected]>

siladu mentioned this pull request Jul 4, 2023

EIP - 4844 #5536

Closed

elenduuche pushed a commit to elenduuche/besu that referenced this pull request Aug 16, 2023

Gas accounting for EIP-4844 (hyperledger#4992)

1a4cca6

Signed-off-by: Fabio Di Fabio <[email protected]>

eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023

Gas accounting for EIP-4844 (hyperledger#4992)

03ddb09

Signed-off-by: Fabio Di Fabio <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gas accounting for EIP-4844 #4992

Gas accounting for EIP-4844 #4992

fab-10 commented Jan 24, 2023 •

edited

Loading

matkt Jan 24, 2023

fab-10 Jan 24, 2023

matkt Jan 24, 2023

fab-10 Jan 24, 2023

matkt Jan 24, 2023

matkt Jan 24, 2023

fab-10 Jan 24, 2023

matkt Jan 24, 2023

fab-10 Jan 24, 2023

shemnon Jan 24, 2023

fab-10 Jan 24, 2023

		public static final long CANCUN_DATA_GAS_PER_BLOB = 131072; // 2^17
		public static final long CANCUN_TARGET_DATA_GAS_PER_BLOCK = 262144; // 2^18

Gas accounting for EIP-4844 #4992

Gas accounting for EIP-4844 #4992

Conversation

fab-10 commented Jan 24, 2023 • edited Loading

PR description

Fixed Issue(s)

Documentation

Changelog

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fab-10 commented Jan 24, 2023 •

edited

Loading