Hard code max blobs per tx to 6 for Osaka (#8929)

* Hard code max blobs per tx to 6 for Osaka

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

* Apply suggestions from code review

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

---------

Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Gabriel-Trintinalia <[email protected]>

Author: fab-10

config/src/main/java/org/hyperledger/besu/config/BlobSchedule.java

@@ -21,24 +21,18 @@
 /** The Blob schedule for a particular fork. */
 public class BlobSchedule {
   /** The constant CANCUN_DEFAULT. */
-  public static final BlobSchedule CANCUN_DEFAULT = BlobSchedule.create(3, 6, 6, 3338477);
+  public static final BlobSchedule CANCUN_DEFAULT = BlobSchedule.create(3, 6, 3338477);
 
   /** The constant PRAGUE_DEFAULT. */
-  public static final BlobSchedule PRAGUE_DEFAULT = BlobSchedule.create(6, 9, 9, 5007716);
+  public static final BlobSchedule PRAGUE_DEFAULT = BlobSchedule.create(6, 9, 5007716);
 
   private final int target;
   private final int max;
-  private final int maxPerTransaction;
   private final int baseFeeUpdateFraction;
 
-  private BlobSchedule(
-      final int target,
-      final int max,
-      final int maxPerTransaction,
-      final int baseFeeUpdateFraction) {
+  private BlobSchedule(final int target, final int max, final int baseFeeUpdateFraction) {
     this.target = target;
     this.max = max;
-    this.maxPerTransaction = maxPerTransaction;
     this.baseFeeUpdateFraction = baseFeeUpdateFraction;
   }
 
@@ -51,18 +45,14 @@ private BlobSchedule(
   public static BlobSchedule create(final ObjectNode blobScheduleConfigRoot) {
     int target = JsonUtil.getInt(blobScheduleConfigRoot, "target").orElseThrow();
     int max = JsonUtil.getInt(blobScheduleConfigRoot, "max").orElseThrow();
-    int maxPerTransaction = JsonUtil.getInt(blobScheduleConfigRoot, "maxblobspertx").orElse(max);
     int baseFeeUpdateFraction =
         JsonUtil.getInt(blobScheduleConfigRoot, "basefeeupdatefraction").orElseThrow();
-    return create(target, max, maxPerTransaction, baseFeeUpdateFraction);
+    return create(target, max, baseFeeUpdateFraction);
   }
 
   private static BlobSchedule create(
-      final int target,
-      final int max,
-      final int maxPerTransaction,
-      final int baseFeeUpdateFraction) {
-    return new BlobSchedule(target, max, maxPerTransaction, baseFeeUpdateFraction);
+      final int target, final int max, final int baseFeeUpdateFraction) {
+    return new BlobSchedule(target, max, baseFeeUpdateFraction);
   }
 
   /**
@@ -83,15 +73,6 @@ public int getMax() {
     return max;
   }
 
-  /**
-   * Gets max per transaction.
-   *
-   * @return the max per transaction
-   */
-  public int getMaxPerTransaction() {
-    return maxPerTransaction;
-  }
-
   /**
    * Gets base fee update fraction.
    *
@@ -126,7 +107,7 @@ public String toString() {
   public static class NoBlobSchedule extends BlobSchedule {
     /** Constructs a NoBlobSchedule */
     public NoBlobSchedule() {
-      super(0, 0, 0, 0);
+      super(0, 0, 0);
     }
 
     @Override
@@ -144,11 +125,6 @@ public int getBaseFeeUpdateFraction() {
       throw new UnsupportedOperationException("NoBlobSchedule does not support this operation.");
     }
 
-    @Override
-    public int getMaxPerTransaction() {
-      throw new UnsupportedOperationException("NoBlobSchedule does not support this operation.");
-    }
-
     @Override
     public Map<String, Object> asMap() {
       throw new UnsupportedOperationException("NoBlobSchedule does not support this operation.");

config/src/test/java/org/hyperledger/besu/config/BlobScheduleOptionsTest.java

@@ -49,30 +49,11 @@ public void blobScheduleIsParsed() {
   @Test
   public void blobScheduleDefaults() {
     assertThat(BlobSchedule.CANCUN_DEFAULT.getTarget()).isEqualTo(3);
-    assertThat(BlobSchedule.CANCUN_DEFAULT.getMaxPerTransaction()).isEqualTo(6);
     assertThat(BlobSchedule.CANCUN_DEFAULT.getMax()).isEqualTo(6);
     assertThat(BlobSchedule.PRAGUE_DEFAULT.getTarget()).isEqualTo(6);
-    assertThat(BlobSchedule.PRAGUE_DEFAULT.getMaxPerTransaction()).isEqualTo(9);
     assertThat(BlobSchedule.PRAGUE_DEFAULT.getMax()).isEqualTo(9);
   }
 
-  @Test
-  public void blobScheduleMaxPerTransactionDefaultsToMax() {
-    Optional<BlobSchedule> cancun = options.getCancun();
-    assertThat(cancun).isNotEmpty();
-    BlobSchedule schedule = cancun.get();
-    assertThat(schedule.getMaxPerTransaction()).isEqualTo(schedule.getMax());
-  }
-
-  @Test
-  public void blobScheduleMaxPerTransactionIsSpecified() {
-    Optional<BlobSchedule> bpo1 = options.getBpo1();
-    assertThat(bpo1).isNotEmpty();
-    BlobSchedule schedule = bpo1.get();
-    assertThat(schedule.getMax()).isEqualTo(12);
-    assertThat(schedule.getMaxPerTransaction()).isEqualTo(13);
-  }
-
   private void assertParsed(
       final Supplier<Optional<BlobSchedule>> scheduleSupplier,
       final int expectedTarget,

config/src/test/resources/mainnet_with_blob_schedule.json

@@ -30,31 +30,26 @@
       "bpo1": {
         "target": 11,
         "max": 12,
-        "maxBlobsPerTx": 13,
         "baseFeeUpdateFraction": 5007716
       },
       "bpo2": {
         "target": 21,
         "max": 22,
-        "maxBlobsPerTx": 23,
         "baseFeeUpdateFraction": 5007716
       },
       "bpo3": {
         "target": 31,
         "max": 32,
-        "maxBlobsPerTx": 33,
         "baseFeeUpdateFraction": 5007716
       },
       "bpo4": {
         "target": 41,
         "max": 42,
-        "maxBlobsPerTx": 43,
         "baseFeeUpdateFraction": 5007716
       },
       "bpo5": {
         "target": 51,
         "max": 52,
-        "maxBlobsPerTx": 53,
         "baseFeeUpdateFraction": 5007716
       },
       "future_eips": {

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlobBaseFeeTest.java

@@ -41,6 +41,8 @@
 import org.junit.jupiter.api.Test;
 
 public class EthBlobBaseFeeTest {
+  private static final int MAX_BLOBS_PER_BLOCK = 6;
+  private static final int TARGET_BLOBS_PER_BLOCK = 3;
   private final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
   private MutableBlockchain blockchain;
   private EthBlobBaseFee method;
@@ -62,7 +64,11 @@ public void setUp() {
   public void shouldReturnBlobBaseFee() {
     final CancunTargetingGasLimitCalculator gasLimitCalculator =
         new CancunTargetingGasLimitCalculator(
-            0L, FeeMarket.cancunDefault(0L, Optional.empty()), new CancunGasCalculator());
+            0L,
+            FeeMarket.cancunDefault(0L, Optional.empty()),
+            new CancunGasCalculator(),
+            MAX_BLOBS_PER_BLOCK,
+            TARGET_BLOBS_PER_BLOCK);
     configureProtocolSpec(
         FeeMarket.cancunDefault(5, Optional.empty()),
         new CancunGasCalculator(),
@@ -75,7 +81,11 @@ public void shouldReturnBlobBaseFee() {
   public void shouldReturnZeroForNonBlobForks() {
     final CancunTargetingGasLimitCalculator gasLimitCalculator =
         new CancunTargetingGasLimitCalculator(
-            0L, FeeMarket.cancunDefault(0L, Optional.empty()), new ShanghaiGasCalculator());
+            0L,
+            FeeMarket.cancunDefault(0L, Optional.empty()),
+            new ShanghaiGasCalculator(),
+            MAX_BLOBS_PER_BLOCK,
+            TARGET_BLOBS_PER_BLOCK);
     configureProtocolSpec(
         FeeMarket.london(5, Optional.empty()), new ShanghaiGasCalculator(), gasLimitCalculator);
     assertThat(requestBlobBaseFee().getResult()).isEqualTo("0x0");

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java

@@ -64,6 +64,8 @@
 import org.junit.jupiter.api.Test;
 
 public class EthGetTransactionReceiptTest {
+  private static final int MAX_BLOBS_PER_BLOCK = 6;
+  private static final int TARGET_BLOBS_PER_BLOCK = 3;
   private final TransactionReceipt statusReceipt =
       new TransactionReceipt(1, 12, Collections.emptyList(), Optional.empty());
   private final Hash stateRoot =
@@ -329,7 +331,11 @@ private void mockProtocolSpec(final BlockHeader blockHeader) {
     when(spec.getGasLimitCalculator())
         .thenReturn(
             new CancunTargetingGasLimitCalculator(
-                0L, FeeMarket.cancunDefault(0L, Optional.empty()), new CancunGasCalculator()));
+                0L,
+                FeeMarket.cancunDefault(0L, Optional.empty()),
+                new CancunGasCalculator(),
+                MAX_BLOBS_PER_BLOCK,
+                TARGET_BLOBS_PER_BLOCK));
     when(protocolSchedule.getByBlockHeader(blockHeader)).thenReturn(spec);
   }
 

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

@@ -14,43 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
 public class CancunTargetingGasLimitCalculator extends LondonTargetingGasLimitCalculator {
-
-  /** The mainnet default maximum number of blobs per block for Cancun */
-  private static final int DEFAULT_MAX_BLOBS_PER_BLOCK_CANCUN = 6;
-
-  /** The default target number of blobs per transaction for Cancun */
-  private static final int DEFAULT_MAX_BLOBS_PER_TRANSACTION_CANCUN = 6;
-
-  /** The default mainnet target blobs per block for Cancun */
-  private static final int DEFAULT_TARGET_BLOBS_PER_BLOCK_CANCUN = 3;
-
   private final long maxBlobGasPerBlock;
-
   private final long targetBlobGasPerBlock;
-
   private final long blobGasPerBlob;
+
   protected final int maxBlobsPerBlock;
   protected final int targetBlobsPerBlock;
-  private final long transactionBlobGasLimitCap;
-
-  public CancunTargetingGasLimitCalculator(
-      final long londonForkBlock,
-      final BaseFeeMarket feeMarket,
-      final GasCalculator gasCalculator) {
-    this(
-        londonForkBlock,
-        feeMarket,
-        gasCalculator,
-        DEFAULT_MAX_BLOBS_PER_BLOCK_CANCUN,
-        DEFAULT_TARGET_BLOBS_PER_BLOCK_CANCUN,
-        DEFAULT_MAX_BLOBS_PER_TRANSACTION_CANCUN);
-  }
 
   /**
    * Using Cancun mainnet default of 6 blobs for maxBlobsPerBlock: getBlobGasPerBlob() * 6 blobs =
@@ -61,20 +34,13 @@ public CancunTargetingGasLimitCalculator(
       final BaseFeeMarket feeMarket,
       final GasCalculator gasCalculator,
       final int maxBlobsPerBlock,
-      final int targetBlobsPerBlock,
-      final int maxBlobsPerTransaction) {
+      final int targetBlobsPerBlock) {
     super(londonForkBlock, feeMarket);
     this.blobGasPerBlob = gasCalculator.getBlobGasPerBlob();
     this.targetBlobGasPerBlock = blobGasPerBlob * targetBlobsPerBlock;
     this.maxBlobGasPerBlock = blobGasPerBlob * maxBlobsPerBlock;
     this.maxBlobsPerBlock = maxBlobsPerBlock;
     this.targetBlobsPerBlock = targetBlobsPerBlock;
-    this.transactionBlobGasLimitCap = gasCalculator.getBlobGasPerBlob() * maxBlobsPerTransaction;
-    checkArgument(
-        maxBlobsPerBlock >= maxBlobsPerTransaction,
-        "maxBlobsPerTransaction (%s) must not be greater than maxBlobsPerBlock (%s)",
-        maxBlobsPerTransaction,
-        maxBlobsPerBlock);
   }
 
   @Override
@@ -114,6 +80,6 @@ public long getMaxBlobGasPerBlock() {
 
   @Override
   public long transactionBlobGasLimitCap() {
-    return transactionBlobGasLimitCap;
+    return maxBlobGasPerBlock;
   }
 }

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

@@ -692,8 +692,7 @@ static ProtocolSpecBuilder cancunDefinition(
                     (BaseFeeMarket) feeMarket,
                     gasCalculator,
                     blobSchedule.getMax(),
-                    blobSchedule.getTarget(),
-                    blobSchedule.getMaxPerTransaction()))
+                    blobSchedule.getTarget()))
         // EVM changes to support EIP-1153: TSTORE and EIP-5656: MCOPY
         .evmBuilder(
             (gasCalculator, jdCacheConfig) ->
@@ -783,7 +782,6 @@ static ProtocolSpecBuilder pragueDefinition(
                     .flatMap(BlobScheduleOptions::getPrague)
                     .orElse(BlobSchedule.PRAGUE_DEFAULT))
             .gasCalculator(PragueGasCalculator::new)
-            // EIP-3074 AUTH and AUTHCALL
             .evmBuilder(
                 (gasCalculator, jdCacheConfig) ->
                     MainnetEVMs.prague(
@@ -879,8 +877,7 @@ static ProtocolSpecBuilder osakaDefinition(
                     (BaseFeeMarket) feeMarket,
                     gasCalculator,
                     blobSchedule.getMax(),
-                    blobSchedule.getTarget(),
-                    blobSchedule.getMaxPerTransaction()))
+                    blobSchedule.getTarget()))
         .evmBuilder(
             (gasCalculator, __) ->
                 MainnetEVMs.osaka(gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))

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

@@ -14,34 +14,39 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
 public class OsakaTargetingGasLimitCalculator extends CancunTargetingGasLimitCalculator {
+  /** The constant max number of blobs per transaction defined for Osaka */
+  private static final int DEFAULT_MAX_BLOBS_PER_TRANSACTION = 6;
+
   /** The blob base cost constant for Osaka */
   private static final long BLOB_BASE_COST = 1 << 13; // 2^13
 
   /** The mainnet transaction gas limit cap for Osaka */
   private static final long DEFAULT_TRANSACTION_GAS_LIMIT_CAP_OSAKA = 30_000_000L;
 
   private final long transactionGasLimitCap;
+  private final long transactionBlobGasLimitCap;
 
   public OsakaTargetingGasLimitCalculator(
       final long londonForkBlock,
       final BaseFeeMarket feeMarket,
       final GasCalculator gasCalculator,
       final int maxBlobsPerBlock,
-      final int targetBlobsPerBlock,
-      final int maxBlobsPerTransaction) {
+      final int targetBlobsPerBlock) {
     this(
         londonForkBlock,
         feeMarket,
         gasCalculator,
         maxBlobsPerBlock,
         targetBlobsPerBlock,
-        maxBlobsPerTransaction,
+        DEFAULT_MAX_BLOBS_PER_TRANSACTION,
         DEFAULT_TRANSACTION_GAS_LIMIT_CAP_OSAKA);
   }
 
@@ -53,14 +58,14 @@ public OsakaTargetingGasLimitCalculator(
       final int targetBlobsPerBlock,
       final int maxBlobsPerTransaction,
       final long transactionGasLimitCap) {
-    super(
-        londonForkBlock,
-        feeMarket,
-        gasCalculator,
-        maxBlobsPerBlock,
-        targetBlobsPerBlock,
-        maxBlobsPerTransaction);
+    super(londonForkBlock, feeMarket, gasCalculator, maxBlobsPerBlock, targetBlobsPerBlock);
     this.transactionGasLimitCap = transactionGasLimitCap;
+    this.transactionBlobGasLimitCap = gasCalculator.getBlobGasPerBlob() * maxBlobsPerTransaction;
+    checkArgument(
+        maxBlobsPerBlock >= maxBlobsPerTransaction,
+        "maxBlobsPerTransaction (%s) must not be greater than maxBlobsPerBlock (%s)",
+        maxBlobsPerTransaction,
+        maxBlobsPerBlock);
   }
 
   @Override
@@ -91,4 +96,9 @@ public long computeExcessBlobGas(
       return currentExcessBlobGas - getTargetBlobGasPerBlock();
     }
   }
+
+  @Override
+  public long transactionBlobGasLimitCap() {
+    return transactionBlobGasLimitCap;
+  }
 }