add block limit

besu/src/main/java/org/hyperledger/besu/cli/options/unstable/LineaOptions.java

@@ -11,6 +11,8 @@
 
 public class LineaOptions implements CLIOptions<LineaParameters> {
   private static final String TRANSACTION_MAX_CALLDATA_SIZE = "--Xtransaction-max-calldata-size";
+  private static final String BLOCK_MAX_CALLDATA_SIZE = "--Xblock-max-calldata-size";
+  ;
 
   public static LineaOptions create() {
     return new LineaOptions();
@@ -24,20 +26,34 @@ public static LineaOptions create() {
           "If specified, overrides the max size in bytes allowed in the transaction calldata field, specified by the current hard fork")
   private Integer transactionMaxCalldataSize;
 
+  @CommandLine.Option(
+      hidden = true,
+      names = {BLOCK_MAX_CALLDATA_SIZE},
+      paramLabel = "<INTEGER>",
+      description =
+          "If specified, overrides the max size in bytes allowed in the transaction calldata field, specified by the current hard fork")
+  private Integer blockMaxCalldataSize;
+
   public Optional<Integer> getTransactionMaxCalldataSize() {
     return Optional.ofNullable(transactionMaxCalldataSize);
   }
 
+  public Optional<Integer> getBlockMaxCalldataSize() {
+    return Optional.ofNullable(blockMaxCalldataSize);
+  }
+
   @Override
   public LineaParameters toDomainObject() {
-    return new LineaParameters(transactionMaxCalldataSize);
+    return new LineaParameters(transactionMaxCalldataSize, blockMaxCalldataSize);
   }
 
   @Override
   public List<String> getCLIOptions() {
-    final List<String> cliOptions = new ArrayList<>(1);
+    final List<String> cliOptions = new ArrayList<>(2);
     getTransactionMaxCalldataSize()
         .ifPresent(size -> cliOptions.add(TRANSACTION_MAX_CALLDATA_SIZE + "=" + size));
+    getBlockMaxCalldataSize()
+        .ifPresent(size -> cliOptions.add(BLOCK_MAX_CALLDATA_SIZE + "=" + size));
     return cliOptions;
   }
 }

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

@@ -36,6 +36,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.linea.LineaParameters;
 import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -115,7 +116,8 @@ public class EthGetTransactionReceiptTest {
           null,
           Optional.empty(),
           null,
-          true);
+          true,
+          LineaParameters.DEFAULT);
   private final ProtocolSpec statusTransactionTypeSpec =
       new ProtocolSpec(
           "status",
@@ -144,7 +146,8 @@ public class EthGetTransactionReceiptTest {
           null,
           Optional.empty(),
           null,
-          true);
+          true,
+          LineaParameters.DEFAULT);
 
   @SuppressWarnings("unchecked")
   private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);

ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java

@@ -304,7 +304,8 @@ private BlockTransactionSelector.TransactionSelectionResults selectTransactions(
             dataGasPrice,
             protocolSpec.getFeeMarket(),
             protocolSpec.getGasCalculator(),
-            protocolSpec.getGasLimitCalculator());
+            protocolSpec.getGasLimitCalculator(),
+            protocolSpec.getLineaParameters());
 
     if (transactions.isPresent()) {
       return selector.evaluateTransactions(transactions.get());

ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java

@@ -24,6 +24,7 @@
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionSelectionResult;
+import org.hyperledger.besu.ethereum.linea.LineaParameters;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
@@ -45,7 +46,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -75,6 +78,12 @@
  * not cleared between executions of buildTransactionListForBlock().
  */
 public class BlockTransactionSelector {
+
+  private final int blockMaxCalldataSize;
+  private final Function<Transaction, Optional<TransactionSelectionResult>>
+      lineaMaxCalldataSizeEnforcer;
+  private int blockCalldataSum;
+
   public static class TransactionValidationResult {
     private final Transaction transaction;
     private final ValidationResult<TransactionInvalidReason> validationResult;
@@ -240,7 +249,8 @@ public BlockTransactionSelector(
       final Wei dataGasPrice,
       final FeeMarket feeMarket,
       final GasCalculator gasCalculator,
-      final GasLimitCalculator gasLimitCalculator) {
+      final GasLimitCalculator gasLimitCalculator,
+      final LineaParameters lineaParameters) {
     this.transactionProcessor = transactionProcessor;
     this.blockchain = blockchain;
     this.worldState = worldState;
@@ -255,6 +265,13 @@ public BlockTransactionSelector(
     this.feeMarket = feeMarket;
     this.gasCalculator = gasCalculator;
     this.gasLimitCalculator = gasLimitCalculator;
+    if (lineaParameters.maybeBlockCalldataMaxSize().isPresent()) {
+      blockMaxCalldataSize = lineaParameters.maybeBlockCalldataMaxSize().getAsInt();
+      lineaMaxCalldataSizeEnforcer = (t) -> maxCalldataEnforcer(t);
+    } else {
+      blockMaxCalldataSize = 0;
+      lineaMaxCalldataSizeEnforcer = (t) -> Optional.empty();
+    }
   }
 
   /*
@@ -304,6 +321,12 @@ private TransactionSelectionResult evaluateTransaction(
       throw new CancellationException("Cancelled during transaction selection.");
     }
 
+    final Optional<TransactionSelectionResult> maybeResult =
+        lineaMaxCalldataSizeEnforcer.apply(transaction);
+    if (maybeResult.isPresent()) {
+      return maybeResult.get();
+    }
+
     if (transactionTooLargeForBlock(transaction)) {
       LOG.atTrace()
           .setMessage("Transaction {} too large to select for block creation")
@@ -534,4 +557,13 @@ private boolean blockOccupancyAboveThreshold() {
         occupancyRatio);
     return occupancyRatio >= minBlockOccupancyRatio;
   }
+
+  private Optional<TransactionSelectionResult> maxCalldataEnforcer(final Transaction transaction) {
+    this.blockCalldataSum += transaction.getPayload().size();
+    if (blockCalldataSum > blockMaxCalldataSize) {
+      return Optional.of(TransactionSelectionResult.COMPLETE_OPERATION);
+    } else {
+      return Optional.empty();
+    }
+  }
 }

ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java

@@ -44,6 +44,7 @@
 import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.linea.LineaParameters;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
@@ -264,7 +265,8 @@ public void useSingleGasSpaceForAllTransactions() {
             Wei.ZERO,
             FeeMarket.london(0L),
             new LondonGasCalculator(),
-            GasLimitCalculator.constant());
+            GasLimitCalculator.constant(),
+            LineaParameters.DEFAULT);
 
     // this should fill up all the block space
     final Transaction fillingLegacyTx =
@@ -469,7 +471,8 @@ protected BlockTransactionSelector createBlockSelector(
             dataGasPrice,
             getFeeMarket(),
             new LondonGasCalculator(),
-            GasLimitCalculator.constant());
+            GasLimitCalculator.constant(),
+            LineaParameters.DEFAULT);
     return selector;
   }
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/linea/LineaParameters.java

@@ -5,18 +5,26 @@
 import java.util.OptionalInt;
 
 public class LineaParameters {
-  public static final LineaParameters DEFAULT = new LineaParameters(null);
+  public static final LineaParameters DEFAULT = new LineaParameters(null, null);
 
   private final OptionalInt transactionCalldataMaxSize;
+  private final OptionalInt blockCalldataMaxSize;
 
-  public LineaParameters(final Integer transactionCalldataMaxSize) {
+  public LineaParameters(
+      final Integer transactionCalldataMaxSize, final Integer blockCalldataMaxSize) {
     this.transactionCalldataMaxSize =
         isNull(transactionCalldataMaxSize)
             ? OptionalInt.empty()
             : OptionalInt.of(transactionCalldataMaxSize);
+    this.blockCalldataMaxSize =
+        isNull(blockCalldataMaxSize) ? OptionalInt.empty() : OptionalInt.of(blockCalldataMaxSize);
   }
 
   public OptionalInt maybeTransactionCalldataMaxSize() {
     return transactionCalldataMaxSize;
   }
+
+  public OptionalInt maybeBlockCalldataMaxSize() {
+    return blockCalldataMaxSize;
+  }
 }

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

@@ -12,6 +12,7 @@
 import java.util.Set;
 
 public class LineaProtocolSpecs {
+  public static final int DEFAULT_BLOCK_MAX_CALLDATA_SIZE = 1000000;
   private static final int LINEA_MAX_TX_CALLDATA_SIZE =
       10000; // fake value replace with the actual one when known
 
@@ -52,6 +53,7 @@ static ProtocolSpecBuilder lineaDefinition(
                         TransactionType.EIP1559),
                     quorumCompatibilityMode,
                     txCalldataMaxSize))
+        .lineaParameters(lineaParameters)
         .name("Linea");
   }
 }

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

@@ -20,6 +20,7 @@
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.linea.LineaParameters;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
 import org.hyperledger.besu.evm.EVM;
@@ -81,6 +82,8 @@ public class ProtocolSpec {
   private final DepositsValidator depositsValidator;
 
   private final boolean isPoS;
+  private final LineaParameters lineaParameters;
+
   /**
    * Creates a new protocol specification instance.
    *
@@ -111,6 +114,7 @@ public class ProtocolSpec {
    * @param withdrawalsProcessor the Withdrawals processor to use
    * @param depositsValidator the withdrawals validator to use
    * @param isPoS indicates whether the current spec is PoS
+   * @param lineaParameters linea parameters
    */
   public ProtocolSpec(
       final String name,
@@ -139,7 +143,8 @@ public ProtocolSpec(
       final WithdrawalsValidator withdrawalsValidator,
       final Optional<WithdrawalsProcessor> withdrawalsProcessor,
       final DepositsValidator depositsValidator,
-      final boolean isPoS) {
+      final boolean isPoS,
+      final LineaParameters lineaParameters) {
     this.name = name;
     this.evm = evm;
     this.transactionValidator = transactionValidator;
@@ -167,6 +172,7 @@ public ProtocolSpec(
     this.withdrawalsProcessor = withdrawalsProcessor;
     this.depositsValidator = depositsValidator;
     this.isPoS = isPoS;
+    this.lineaParameters = lineaParameters;
   }
 
   /**
@@ -387,4 +393,8 @@ public DepositsValidator getDepositsValidator() {
   public boolean isPoS() {
     return isPoS;
   }
+
+  public LineaParameters getLineaParameters() {
+    return lineaParameters;
+  }
 }

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

@@ -27,6 +27,7 @@
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.GoQuorumPrivacyParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.linea.LineaParameters;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.FlexiblePrivacyPrecompiledContract;
 import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPluginPrecompiledContract;
@@ -82,6 +83,7 @@ public class ProtocolSpecBuilder {
   private BadBlockManager badBlockManager;
   private PoWHasher powHasher = PoWHasher.ETHASH_LIGHT;
   private boolean isPoS = false;
+  private LineaParameters lineaParameters = LineaParameters.DEFAULT;
 
   public ProtocolSpecBuilder gasCalculator(final Supplier<GasCalculator> gasCalculatorBuilder) {
     this.gasCalculatorBuilder = gasCalculatorBuilder;
@@ -271,6 +273,11 @@ public ProtocolSpecBuilder isPoS(final boolean isPoS) {
     return this;
   }
 
+  public ProtocolSpecBuilder lineaParameters(final LineaParameters lineaParameters) {
+    this.lineaParameters = lineaParameters;
+    return this;
+  }
+
   public ProtocolSpec build(final HeaderBasedProtocolSchedule protocolSchedule) {
     checkNotNull(gasCalculatorBuilder, "Missing gasCalculator");
     checkNotNull(gasLimitCalculator, "Missing gasLimitCalculator");
@@ -379,7 +386,8 @@ public ProtocolSpec build(final HeaderBasedProtocolSchedule protocolSchedule) {
         withdrawalsValidator,
         Optional.ofNullable(withdrawalsProcessor),
         depositsValidator,
-        isPoS);
+        isPoS,
+        lineaParameters);
   }
 
   private PrivateTransactionProcessor createPrivateTransactionProcessor(

ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java

@@ -20,6 +20,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.TransactionFilter;
+import org.hyperledger.besu.ethereum.linea.LineaParameters;
 import org.hyperledger.besu.ethereum.mainnet.BlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor;
@@ -86,7 +87,8 @@ public ProtocolSpec getByBlockNumber(final long number) {
         original.getWithdrawalsValidator(),
         original.getWithdrawalsProcessor(),
         original.getDepositsValidator(),
-        original.isPoS());
+        original.isPoS(),
+        LineaParameters.DEFAULT);
   }
 
   @Override