add block limit #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Stefan <stefan.pingel@consensys.net>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
fab-10
reviewed
Apr 4, 2023
| 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") |
There was a problem hiding this comment.
Adapt the description to block max calldata size
| @@ -534,4 +557,13 @@ private boolean blockOccupancyAboveThreshold() { | |||
| occupancyRatio); | |||
| return occupancyRatio >= minBlockOccupancyRatio; | |||
| } | |||
|
|
|||
| private Optional<TransactionSelectionResult> maxCalldataEnforcer(final Transaction transaction) { | |||
There was a problem hiding this comment.
it seems this could simplified to just return a boolean
| @@ -12,6 +12,7 @@ | |||
| import java.util.Set; | |||
|
|
|||
| public class LineaProtocolSpecs { | |||
| public static final int DEFAULT_BLOCK_MAX_CALLDATA_SIZE = 1000000; | |||
| @@ -304,6 +321,12 @@ private TransactionSelectionResult evaluateTransaction( | |||
| throw new CancellationException("Cancelled during transaction selection."); | |||
| } | |||
|
|
|||
| final Optional<TransactionSelectionResult> maybeResult = | |||
There was a problem hiding this comment.
it seems this could simplified to be a Predicate
| @@ -52,6 +53,7 @@ static ProtocolSpecBuilder lineaDefinition( | |||
| TransactionType.EIP1559), | |||
| quorumCompatibilityMode, | |||
| txCalldataMaxSize)) | |||
| .lineaParameters(lineaParameters) | |||
There was a problem hiding this comment.
we should not pass lineaParameters here, but we can abstract and pass only calldata limits, also because lineaParameters only contain the configuration overrides, and not the value specified in the hard fork definition
Comment on lines
397
to
399
| public LineaParameters getLineaParameters() { | ||
| return lineaParameters; | ||
| } |
There was a problem hiding this comment.
as described before, we can replace this with blockMaxCalldataSize
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description
Adding first try to enforce block call data limit