-
Notifications
You must be signed in to change notification settings - Fork 840
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve blob size transaction selector
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
- Loading branch information
Showing
17 changed files
with
357 additions
and
75 deletions.
There are no files selected for viewing
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
94 changes: 94 additions & 0 deletions
94
...ledger/besu/ethereum/blockcreation/txselection/selectors/BlobSizeTransactionSelector.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Copyright contributors to Hyperledger Besu. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.blockcreation.txselection.selectors; | ||
|
|
||
| import org.hyperledger.besu.ethereum.blockcreation.txselection.BlockSelectionContext; | ||
| import org.hyperledger.besu.ethereum.blockcreation.txselection.TransactionEvaluationContext; | ||
| import org.hyperledger.besu.ethereum.blockcreation.txselection.TransactionSelectionResults; | ||
| import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult; | ||
| import org.hyperledger.besu.plugin.data.TransactionSelectionResult; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * This class extends AbstractTransactionSelector and provides a specific implementation for | ||
| * evaluating transactions based on blobs size. It checks if a transaction supports blobs, and if | ||
| * so, checks that there is enough remaining data gas in the block to fit the blobs of the tx. | ||
| */ | ||
| public class BlobSizeTransactionSelector extends AbstractTransactionSelector { | ||
| private static final Logger LOG = LoggerFactory.getLogger(BlobSizeTransactionSelector.class); | ||
|
|
||
| public BlobSizeTransactionSelector(final BlockSelectionContext context) { | ||
| super(context); | ||
| } | ||
|
|
||
| /** | ||
| * Evaluates a transaction considering other transactions in the same block. If the tx does not | ||
| * support blobs, no check is performed, and SELECTED is returned, otherwise SELECTED is returned | ||
| * only if there is enough remaining data gas to fit the blobs of the tx, otherwise a specific not | ||
| * selected result is returned, depending on the fact that the block already contains the max | ||
| * number of blobs or not. | ||
| * | ||
| * @param evaluationContext The current selection session data. | ||
| * @param transactionSelectionResults The results of other transaction evaluations in the same | ||
| * block. | ||
| * @return The result of the transaction selection. | ||
| */ | ||
| @Override | ||
| public TransactionSelectionResult evaluateTransactionPreProcessing( | ||
| final TransactionEvaluationContext evaluationContext, | ||
| final TransactionSelectionResults transactionSelectionResults) { | ||
|
|
||
| final var remainingDataGas = | ||
| context.gasLimitCalculator().currentBlobGasLimit() | ||
| - transactionSelectionResults.getCumulativeBlobGasUsed(); | ||
|
|
||
| final var tx = evaluationContext.getTransaction(); | ||
| if (tx.getType().supportsBlob()) { | ||
| if (remainingDataGas == 0) { | ||
| LOG.atTrace() | ||
| .setMessage("The block already contains the max number of allowed blobs") | ||
| .addArgument(evaluationContext.getPendingTransaction()::toTraceLog) | ||
| .log(); | ||
| return TransactionSelectionResult.BLOBS_FULL; | ||
| } | ||
|
|
||
| final long requestedDataGas = context.gasCalculator().blobGasCost(tx.getBlobCount()); | ||
|
|
||
| if (requestedDataGas > remainingDataGas) { | ||
| LOG.atTrace() | ||
| .setMessage( | ||
| "There is not enough data gas available to fit the blobs of the transaction {} in the block." | ||
| + " Available {} / Requested {}") | ||
| .addArgument(evaluationContext.getPendingTransaction()::toTraceLog) | ||
| .addArgument(remainingDataGas) | ||
| .addArgument(requestedDataGas) | ||
| .log(); | ||
| return TransactionSelectionResult.TX_TOO_LARGE_FOR_REMAINING_DATA_GAS; | ||
| } | ||
| } | ||
| return TransactionSelectionResult.SELECTED; | ||
| } | ||
|
|
||
| @Override | ||
| public TransactionSelectionResult evaluateTransactionPostProcessing( | ||
| final TransactionEvaluationContext evaluationContext, | ||
| final TransactionSelectionResults blockTransactionResults, | ||
| final TransactionProcessingResult processingResult) { | ||
| // All necessary checks were done in the pre-processing method, so nothing to do here. | ||
| return TransactionSelectionResult.SELECTED; | ||
| } | ||
| } |
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
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
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
Oops, something went wrong.