Update object version assignment tables to include object start versi…

…on in the key (#20527)
MystenLabs · Jan 6, 2025 · fb49e8c · fb49e8c
1 parent b14ee43
commit fb49e8c
Show file tree

Hide file tree

Showing 25 changed files with 673 additions and 178 deletions.
diff --git a/crates/simulacrum/src/lib.rs b/crates/simulacrum/src/lib.rs
@@ -27,6 +27,7 @@ use sui_swarm_config::network_config_builder::ConfigBuilder;
 use sui_types::base_types::{AuthorityName, ObjectID, VersionNumber};
 use sui_types::crypto::AuthoritySignature;
 use sui_types::digests::ConsensusCommitDigest;
+use sui_types::messages_consensus::ConsensusDeterminedVersionAssignments;
 use sui_types::object::Object;
 use sui_types::storage::{ObjectStore, ReadStore, RpcStateReader};
 use sui_types::sui_system_state::epoch_start_sui_system_state::EpochStartSystemState;
@@ -234,7 +235,7 @@ impl<R, S: store::SimulatorStore> Simulacrum<R, S> {
                 round,
                 timestamp_ms,
                 ConsensusCommitDigest::default(),
-                Vec::new(),
+                ConsensusDeterminedVersionAssignments::empty_for_testing(),
             );
 
         self.execute_transaction(consensus_commit_prologue_transaction.into())

diff --git a/crates/sui-benchmark/tests/simtest.rs b/crates/sui-benchmark/tests/simtest.rs
@@ -706,7 +706,10 @@ mod test {
             let num_objs = thread_rng().gen_range(1..15);
             let mut assigned_object_versions = Vec::new();
             for _ in 0..num_objs {
-                assigned_object_versions.push((ObjectID::random(), SequenceNumber::CONGESTED));
+                assigned_object_versions.push((
+                    (ObjectID::random(), SequenceNumber::UNKNOWN),
+                    SequenceNumber::CONGESTED,
+                ));
             }
             additional_cancelled_txns.push((TransactionDigest::random(), assigned_object_versions));
         }

diff --git a/crates/sui-core/src/authority/authority_per_epoch_store.rs b/crates/sui-core/src/authority/authority_per_epoch_store.rs
diff --git a/crates/sui-core/src/authority/epoch_start_configuration.rs b/crates/sui-core/src/authority/epoch_start_configuration.rs
@@ -39,6 +39,11 @@ pub trait EpochStartConfigTrait {
             ExecutionCacheConfigType::PassthroughCache
         }
     }
+
+    fn use_version_assignment_tables_v3(&self) -> bool {
+        self.flags()
+            .contains(&EpochFlag::UseVersionAssignmentTablesV3)
+    }
 }
 
 // IMPORTANT: Assign explicit values to each variant to ensure that the values are stable.
@@ -67,6 +72,8 @@ pub enum EpochFlag {
     StateAccumulatorV2EnabledMainnet = 6,
 
     ExecutedInEpochTable = 7,
+
+    UseVersionAssignmentTablesV3 = 8,
 }
 
 impl EpochFlag {
@@ -84,6 +91,7 @@ impl EpochFlag {
             EpochFlag::ExecutedInEpochTable,
             EpochFlag::StateAccumulatorV2EnabledTestnet,
             EpochFlag::StateAccumulatorV2EnabledMainnet,
+            EpochFlag::UseVersionAssignmentTablesV3,
         ];
 
         if matches!(
@@ -121,6 +129,9 @@ impl fmt::Display for EpochFlag {
             EpochFlag::StateAccumulatorV2EnabledMainnet => {
                 write!(f, "StateAccumulatorV2EnabledMainnet")
             }
+            EpochFlag::UseVersionAssignmentTablesV3 => {
+                write!(f, "UseVersionAssignmentTablesV3")
+            }
         }
     }
 }