Bella ciao replay one setup at a time

Cargo.toml

@@ -40,9 +40,9 @@ exclude = [
     "external-crates/move/crates/move-ir-to-bytecode-syntax",
     "external-crates/move/crates/move-ir-types",
     "external-crates/move/crates/move-model",
-  "external-crates/move/crates/move-model-2",
+    "external-crates/move/crates/move-model-2",
     "external-crates/move/crates/move-package",
-  "external-crates/move/crates/move-package-alt",
+    "external-crates/move/crates/move-package-alt",
     "external-crates/move/crates/move-proc-macros",
   "external-crates/move/crates/move-regex-borrow-graph",
     "external-crates/move/crates/move-stackless-bytecode",
@@ -58,6 +58,10 @@ exclude = [
     "external-crates/move/crates/move-vm-transactional-tests",
     "external-crates/move/crates/serializer-tests",
     "external-crates/move/crates/test-generation",
+    "external-crates/move/move-execution/replay_cut/crates/move-bytecode-verifier",
+    "external-crates/move/move-execution/replay_cut/crates/move-stdlib-natives",
+    "external-crates/move/move-execution/replay_cut/crates/move-vm-runtime",
+    "external-crates/move/move-execution/replay_cut/crates/move-vm-types",
     "external-crates/move/move-execution/v0/crates/move-bytecode-verifier",
     "external-crates/move/move-execution/v0/crates/move-stdlib-natives",
     "external-crates/move/move-execution/v0/crates/move-vm-runtime",
@@ -212,6 +216,9 @@ members = [
   "sui-execution/latest/sui-adapter",
   "sui-execution/latest/sui-move-natives",
   "sui-execution/latest/sui-verifier",
+  "sui-execution/replay_cut/sui-adapter",
+  "sui-execution/replay_cut/sui-move-natives",
+  "sui-execution/replay_cut/sui-verifier",
   "sui-execution/v0/sui-adapter",
   "sui-execution/v0/sui-move-natives",
   "sui-execution/v0/sui-verifier",

crates/sui-protocol-config/src/lib.rs

@@ -778,6 +778,14 @@ struct FeatureFlags {
     #[serde(skip_serializing_if = "is_false")]
     enable_ptb_execution_v2: bool,
 
+    // Enable the new VM
+    #[serde(skip_serializing_if = "is_false")]
+    enable_vm_v2: bool,
+
+    // Enable the new adapter
+    #[serde(skip_serializing_if = "is_false")]
+    enable_adapter_v2: bool,
+
     // Provide better type resolution errors in the adapter.
     #[serde(skip_serializing_if = "is_false")]
     better_adapter_type_resolution_errors: bool,
@@ -2525,6 +2533,13 @@ impl ProtocolConfig {
         ProtocolConfig::get_for_version(ProtocolVersion::MAX, Chain::Unknown)
     }
 
+    pub fn get_use_vm_v2(&self) -> bool {
+        self.feature_flags.enable_vm_v2
+    }
+    pub fn get_use_adapter_v2(&self) -> bool {
+        self.feature_flags.enable_adapter_v2
+    }
+
     fn get_for_version_impl(version: ProtocolVersion, chain: Chain) -> Self {
         #[cfg(msim)]
         {
@@ -4533,6 +4548,14 @@ impl ProtocolConfig {
         self.feature_flags.correct_gas_payment_limit_check = val;
     }
 
+    pub fn set_enable_vm_v2_for_testing(&mut self, val: bool) {
+        self.feature_flags.enable_vm_v2 = val;
+    }
+
+    pub fn set_enable_adapter_v2_for_testing(&mut self, val: bool) {
+        self.feature_flags.enable_adapter_v2 = val;
+    }
+
     pub fn set_consensus_round_prober_probe_accepted_rounds(&mut self, val: bool) {
         self.feature_flags
             .consensus_round_prober_probe_accepted_rounds = val;

crates/sui-replay-2/Cargo.toml

@@ -52,6 +52,9 @@ tabled.workspace = true
 [build-dependencies]
 cynic-codegen.workspace = true
 
+[dev-dependencies]
+tempfile.workspace = true
+
 [features]
 tracing = [
     "sui-types/tracing",

crates/sui-replay-2/src/execution.rs

@@ -307,32 +307,30 @@ impl sui_types::storage::ObjectStore for ReplayStore<'_> {
     // at the checkpoint (mimic latest runtime behavior)
     fn get_object(&self, object_id: &ObjectID) -> Option<Object> {
         trace!("get_object({})", object_id);
-
-        match self.object_cache.borrow().get(object_id) {
-            Some(versions) => versions.last_key_value().map(|(_version, obj)| obj.clone()),
-            None => {
-                let fetched_object = self
-                    .store
-                    .get_objects(&[ObjectKey {
-                        object_id: *object_id,
-                        version_query: VersionQuery::AtCheckpoint(self.checkpoint),
-                    }])
-                    .map_err(|e| SuiErrorKind::Storage(e.to_string()))
-                    .ok()?
-                    .into_iter()
-                    .next()?
-                    .map(|(obj, _version)| obj)?;
-
-                // Add the fetched object to the cache
-                let mut cache = self.object_cache.borrow_mut();
-                cache
-                    .entry(*object_id)
-                    .or_default()
-                    .insert(fetched_object.version().value(), fetched_object.clone());
-
-                Some(fetched_object)
-            }
+        if let Some(cache) = self.object_cache.borrow().get(object_id) {
+            return cache.last_key_value().map(|(_version, obj)| obj.clone());
         }
+
+        let fetched_object = self
+            .store
+            .get_objects(&[ObjectKey {
+                object_id: *object_id,
+                version_query: VersionQuery::AtCheckpoint(self.checkpoint),
+            }])
+            .map_err(|e| SuiErrorKind::Storage(e.to_string()))
+            .ok()?
+            .into_iter()
+            .next()?
+            .map(|(obj, _version)| obj)?;
+
+        // Add the fetched object to the cache
+        let mut cache = self.object_cache.borrow_mut();
+        cache
+            .entry(*object_id)
+            .or_default()
+            .insert(fetched_object.version().value(), fetched_object.clone());
+
+        Some(fetched_object)
     }
 
     // Get an object by its ID and version