Take into account used gas during block production and include more transactions if we can #1220
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
…ransactions if we can
Voxelot
reviewed
Jun 21, 2023
| ) -> Self { | ||
| Self { | ||
| txpool, | ||
| _block_height: block_height, |
There was a problem hiding this comment.
Looks like block_height isnt used, is the idea for adding it here to enable selecting txs based on maturity requirements in the future?
There was a problem hiding this comment.
Yes:) The code before did the same
Co-authored-by: Elvis <elvisdedic@outlook.com>
| /// Executes the block and returns the result of execution with uncommitted database | ||
| /// transaction. | ||
| fn execute_without_commit( | ||
| &self, | ||
| block: ExecutionBlock, | ||
| ) -> ExecutorResult<UncommittedResult<StorageTransaction<Database>>>; | ||
| block: Components<Self::TxSource>, |
There was a problem hiding this comment.
nit: block: Components<T> sounds a bit off, either updating the argument or maybe renaming Components to something like BlockComponents because the current name is not descriptive enough imo
Comment on lines
+187
to
+200
| let component = match block { | ||
| ExecutionBlock::DryRun(block) => ExecutionTypes::DryRun(Components { | ||
| header_to_produce: block.header, | ||
| transactions_source: OnceTransactionsSource::new(block.transactions), | ||
| gas_limit: u64::MAX, | ||
| }), | ||
| ExecutionBlock::Production(block) => ExecutionTypes::Production(Components { | ||
| header_to_produce: block.header, | ||
| transactions_source: OnceTransactionsSource::new(block.transactions), | ||
| gas_limit: u64::MAX, | ||
| }), | ||
| ExecutionBlock::Validation(block) => ExecutionTypes::Validation(block), | ||
| }; | ||
|
|
There was a problem hiding this comment.
nit: maybe this From<ExecutionBlock> could be extracted
There was a problem hiding this comment.
It is only used once here for unit tests, and it is better to do that explicitly because it does not apply to other places=)
Co-authored-by: Elvis <elvisdedic@outlook.com>
…ase/gas-limit-fix
leviathanbeak
approved these changes
Jun 21, 2023
Voxelot
approved these changes
Jun 21, 2023
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.
The PR implements #1217 for the beta 3 testnet