-
Notifications
You must be signed in to change notification settings - Fork 622
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add a metric which counts how many chunks couldn't fit all transactions from the pool #10422
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c061d1b
feat: report what limited the output of prepare_transactions()
jancionear c1ee8d5
feat: add a metric which counts the number of produced chunks that di…
jancionear 137c740
fix compilation with test_features feature enabled
jancionear dfcf9cb
remove wallet_contract.wasm, was added by mistake
jancionear be494fa
Add comments to the new structs
jancionear 524019b
Rename prepared to prepared_transactions to keep things consistent
jancionear 280efae
Rename tlimit to time_limit
jancionear a05ecc3
Add the same wallet_contract.wasm as on master
jancionear 9da69fd
Use three slashes for comments on structs
jancionear File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
|
@@ -311,6 +311,27 @@ pub struct ApplyChunkShardContext<'a> { | |
pub is_first_block_with_chunk_of_version: bool, | ||
} | ||
|
||
// Contains transactions that were fetched from the transaction pool | ||
// and prepared for adding them to a new chunk that is being produced. | ||
#[derive(Debug, Clone, PartialEq, Eq)] | ||
pub struct PreparedTransactions { | ||
/// Prepared transactions | ||
pub transactions: Vec<SignedTransaction>, | ||
/// Describes which limit was hit when preparing the transactions. | ||
pub limited_by: Option<PrepareTransactionsLimit>, | ||
} | ||
|
||
// Chunk producer prepares transactions from the transaction pool | ||
// until it hits some limit (too many transactions, too much gas used, etc). | ||
// This enum describes which limit was hit when preparing transactions. | ||
#[derive(Debug, Clone, Copy, PartialEq, Eq, strum::AsRefStr)] | ||
pub enum PrepareTransactionsLimit { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
Gas, | ||
Size, | ||
Time, | ||
ReceiptCount, | ||
} | ||
|
||
/// Bridge between the chain and the runtime. | ||
/// Main function is to update state given transactions. | ||
/// Additionally handles validators. | ||
|
@@ -378,7 +399,7 @@ pub trait RuntimeAdapter: Send + Sync { | |
chain_validate: &mut dyn FnMut(&SignedTransaction) -> bool, | ||
current_protocol_version: ProtocolVersion, | ||
time_limit: Option<Duration>, | ||
) -> Result<Vec<SignedTransaction>, Error>; | ||
) -> Result<PreparedTransactions, Error>; | ||
|
||
/// Returns true if the shard layout will change in the next epoch | ||
/// Current epoch is the epoch of the block after `parent_hash` | ||
|
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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a small comment please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: typically we use tripple / for struct and method comments
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, fixed 👍