Increase blob throughput (#5591)

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
hyperledger · Jun 13, 2023 · 19d949e · 19d949e
1 parent 67cf22e
commit 19d949e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/...rc/main/java/org/hyperledger/besu/ethereum/mainnet/CancunTargetingGasLimitCalculator.java b/...rc/main/java/org/hyperledger/besu/ethereum/mainnet/CancunTargetingGasLimitCalculator.java
@@ -17,7 +17,7 @@
 import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 
 public class CancunTargetingGasLimitCalculator extends LondonTargetingGasLimitCalculator {
-  private static final long MAX_DATA_GAS_PER_BLOCK = 1 << 19;
+  private static final long MAX_DATA_GAS_PER_BLOCK = 786432L;
 
   public CancunTargetingGasLimitCalculator(
       final long londonForkBlock, final BaseFeeMarket feeMarket) {

diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java b/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java
@@ -52,8 +52,6 @@
  */
 public class MainnetTransactionValidator {
 
-  // private final long MAX_DATA_GAS_PER_BLOCK = 524_288; // 2**19
-  // private final long DATA_GAS_PER_BLOB = 131_072; // 2**17
   private final byte BLOB_COMMITMENT_VERSION_KZG = 0x01;
 
   private final GasCalculator gasCalculator;

diff --git a/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java b/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java
@@ -26,7 +26,7 @@
 public class CancunFeeMarket extends LondonFeeMarket {
   private static final Logger LOG = LoggerFactory.getLogger(CancunFeeMarket.class);
   private static final BigInteger MIN_DATA_GAS_PRICE = BigInteger.ONE;
-  private static final BigInteger DATA_GAS_PRICE_UPDATE_FRACTION = BigInteger.valueOf(2225652);
+  private static final BigInteger DATA_GAS_PRICE_UPDATE_FRACTION = BigInteger.valueOf(3338477);
 
   public CancunFeeMarket(
       final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java
@@ -28,7 +28,7 @@ public class CancunGasCalculator extends ShanghaiGasCalculator {
   private static final long TSTORE_GAS = WARM_STORAGE_READ_COST;
 
   private static final long DATA_GAS_PER_BLOB = 1 << 17;
-  private static final long TARGET_DATA_GAS_PER_BLOCK = 1 << 18;
+  private static final long TARGET_DATA_GAS_PER_BLOCK = 393216L;
 
   // EIP-1153
   @Override