-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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
[exec-pool] OnChainConsensusConfig V4 #15862
base: main
Are you sure you want to change the base?
Conversation
⏱️ 1h 1m total CI duration on this PR
🚨 1 job on the last run was significantly faster/slower than expected
|
265024d
to
e381cf9
Compare
e381cf9
to
caaf57b
Compare
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.
Looks reasonable to me 😄
@@ -8,6 +8,9 @@ use move_core_types::account_address::AccountAddress; | |||
use serde::{Deserialize, Serialize}; | |||
use std::collections::HashMap; | |||
|
|||
/// Default Window Size for Execution Pool | |||
pub const DEFAULT_WINDOW_SIZE: Option<u64> = Some(1u64); |
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.
Hmm.. we need to decide if it's Some(1)
or None
(to disable by default). If we use Some(1)
, I'll need to update this PR: #15869
@@ -46,7 +46,7 @@ pub use self::{ | |||
consensus_config::{ | |||
AnchorElectionMode, ConsensusAlgorithmConfig, ConsensusConfigV1, DagConsensusConfigV1, | |||
LeaderReputationType, OnChainConsensusConfig, ProposerAndVoterConfig, ProposerElectionType, | |||
ValidatorTxnConfig, | |||
ValidatorTxnConfig, DEFAULT_WINDOW_SIZE, |
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.
Unused import?
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.
Nah this is a pub use, see above
pub use self::{
approved_execution_hashes::ApprovedExecutionHashes,
aptos_features::*,
aptos_version::{
AptosVersion, APTOS_MAX_KNOWN_VERSION, APTOS_VERSION_2, APTOS_VERSION_3, APTOS_VERSION_4,
},
commit_history::CommitHistoryResource,
consensus_config::{
AnchorElectionMode, ConsensusAlgorithmConfig, ConsensusConfigV1, DagConsensusConfigV1,
LeaderReputationType, OnChainConsensusConfig, ProposerAndVoterConfig, ProposerElectionType,
ValidatorTxnConfig,
ValidatorTxnConfig, DEFAULT_WINDOW_SIZE,
caaf57b
to
9183183
Compare
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.
We should have a fn window_size
right?
@@ -319,10 +347,23 @@ impl OnChainConsensusConfig { | |||
alg, | |||
vtxn: ValidatorTxnConfig::default_enabled(), | |||
}, | |||
OnChainConsensusConfig::V4 { | |||
vtxn: ValidatorTxnConfig::V0, |
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: can we use the order in the struct?
f4de6d8
to
375a095
Compare
375a095
to
f66fff4
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
✅ Forge suite
|
Description
A new
OnChainConsensusConfig
variant that includes awindow_size
for execution pool.Note:
window_size
is beOption<u64>
in the OnChainConfig, but will be converted toOption<usize>
once it's deserialized and handled in memory