Skip to content
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.

Sign up for GitHub

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

Disable accum v2 testnet cp #18279

Merged
merged 1 commit into from
Jun 16, 2024
Merged

Disable accum v2 testnet cp #18279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/sui-core/src/authority/epoch_start_configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl EpochFlag {

/// For situations in which there is no config available (e.g. setting up a downloaded snapshot).
pub fn default_for_no_config() -> Vec<Self> {
Self::default_flags_impl(&Default::default(), true)
Self::default_flags_impl(&Default::default(), false)
}

fn default_flags_impl(
Expand Down
15 changes: 9 additions & 6 deletions crates/sui-core/src/state_accumulator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use itertools::Itertools;
use mysten_metrics::monitored_scope;
use serde::Serialize;
use sui_protocol_config::{Chain, ProtocolConfig};
use sui_protocol_config::ProtocolConfig;
use sui_types::base_types::{ObjectID, ObjectRef, SequenceNumber, VersionNumber};
use sui_types::committee::EpochId;
use sui_types::digests::{ObjectDigest, TransactionDigest};
Expand Down Expand Up @@ -367,12 +367,15 @@ impl StateAccumulator {
store: Arc<dyn AccumulatorStore>,
epoch_store: &Arc<AuthorityPerEpochStore>,
) -> Self {
let chain = epoch_store.get_chain_identifier().chain();
if epoch_store.state_accumulator_v2_enabled() && chain != Chain::Mainnet {
StateAccumulator::V2(StateAccumulatorV2::new(store))
} else {
StateAccumulator::V1(StateAccumulatorV1::new(store))
if cfg!(msim) {
if epoch_store.state_accumulator_v2_enabled() {
return StateAccumulator::V2(StateAccumulatorV2::new(store));
} else {
return StateAccumulator::V1(StateAccumulatorV1::new(store));
}
}

StateAccumulator::V1(StateAccumulatorV1::new(store))
}

/// Accumulates the effects of a single checkpoint and persists the accumulator.
Expand Down
Loading