[4844] EngineNewPayload - Add Blob Count validation (hyperledger#5973)

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
NickSneo · Nov 12, 2023 · ab7633f · ab7633f
1 parent 03110b7
commit ab7633f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -445,6 +445,13 @@ protected ValidationResult<RpcErrorType> validateBlobs(
             "Payload BlobGasUsed does not match calculated BlobGasUsed");
       }
     }
+
+    if (protocolSpec.getGasCalculator().blobGasCost(transactionVersionedHashes.size())
+        > protocolSpec.getGasLimitCalculator().currentBlobGasLimit()) {
+      return ValidationResult.invalid(
+          RpcErrorType.INVALID_PARAMS,
+          String.format("Invalid Blob Count: %d", transactionVersionedHashes.size()));
+    }
     return ValidationResult.valid();
   }
 

diff --git a/...hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV3Test.java b/...hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV3Test.java
@@ -51,6 +51,7 @@
 import org.hyperledger.besu.ethereum.core.encoding.EncodingContext;
 import org.hyperledger.besu.ethereum.core.encoding.TransactionEncoder;
 import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.CancunTargetingGasLimitCalculator;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
 
@@ -96,6 +97,9 @@ public void before() {
             ethPeers,
             engineCallListener);
     lenient().when(protocolSpec.getGasCalculator()).thenReturn(new CancunGasCalculator());
+    lenient()
+        .when(protocolSpec.getGasLimitCalculator())
+        .thenReturn(mock(CancunTargetingGasLimitCalculator.class));
   }
 
   @Test