several improvements

Author: wtdcode

crates/movy-replay/src/env.rs

@@ -30,7 +30,7 @@ use sui_types::{
 use crate::{
     db::{ObjectStoreCachedStore, ObjectStoreInfo},
     exec::SuiExecutor,
-    tracer::NopTracer,
+    tracer::{NopTracer, tree::TreeTracer},
 };
 
 pub struct SuiTestingEnv<T> {
@@ -135,6 +135,7 @@ impl<
         epoch: u64,
         epoch_ms: u64,
         gas: ObjectID,
+        trace_movy_init: bool,
     ) -> Result<(MoveAddress, MovePackageAbi, MovePackageAbi, Vec<String>), MovyError> {
         tracing::info!("Compiling {} with non-test mode...", path.display());
         let abi_result = SuiCompiledPackage::build_all_unpublished_from_folder(path, false)?;
@@ -174,17 +175,34 @@ impl<
                 );
                 let ptb = builder.finish();
                 tracing::info!("Detected a {} at: {}", MOVY_INIT, md.module_id);
-                let results = executor.run_ptb_with_gas::<NopTracer>(
+                let tracer = if trace_movy_init {
+                    Some(TreeTracer::new())
+                } else {
+                    None
+                };
+                let mut results = executor.run_ptb_with_gas(
                     ptb,
                     epoch,
                     epoch_ms,
                     deployer.into(),
                     gas,
-                    None,
+                    tracer,
                 )?;
+                let trace = if let Some(tracer) = std::mem::take(&mut results.tracer) {
+                    Some(tracer.take_inner().pprint())
+                } else {
+                    None
+                };
                 if !results.effects.status().is_ok() {
+                    if let Some(trace) = trace {
+                        tracing::error!("movy_init reverts with:\n{}", trace);
+                    }
                     return Err(eyre!("movy_init reverts!").into());
                 }
+                tracing::trace!(
+                    "movy_init trace:\n{}",
+                    trace.unwrap_or_else(|| "-".to_string())
+                );
                 tracing::info!("Commiting movy_init effects...");
                 tracing::debug!(
                     "Status: {:?} Changed Objects: {}, Removed Objects: {}",
@@ -238,8 +256,8 @@ impl<
                     let objects = rpc
                         .filter_objects(ckpt, Some(OwnerKind::Shared), None, Some(tag))
                         .await?;
-                    for object in objects.iter() {
-                        self.db.load_object(object.id().into()).await?;
+                    for object in objects.into_iter() {
+                        self.db.commit_single_object(object)?;
                     }
                 }
             }

crates/movy-replay/src/exec.rs

@@ -13,11 +13,22 @@ use sui_adapter_latest::{
 };
 use sui_move_natives_latest::all_natives;
 use sui_types::{
-    TypeTag, base_types::{ObjectID, SuiAddress}, committee::ProtocolVersion, digests::TransactionDigest, effects::{TransactionEffects, TransactionEffectsAPI}, gas::SuiGasStatus, inner_temporary_store::InnerTemporaryStore, metrics::LimitsMetrics, object::Owner, storage::{BackingStore, ObjectStore, WriteKind}, supported_protocol_versions::{Chain, ProtocolConfig}, transaction::{
+    TypeTag,
+    base_types::{ObjectID, SuiAddress},
+    committee::ProtocolVersion,
+    digests::TransactionDigest,
+    effects::{TransactionEffects, TransactionEffectsAPI},
+    gas::SuiGasStatus,
+    inner_temporary_store::InnerTemporaryStore,
+    metrics::LimitsMetrics,
+    object::Owner,
+    storage::{BackingStore, ObjectStore, WriteKind},
+    supported_protocol_versions::{Chain, ProtocolConfig},
+    transaction::{
         Argument, CallArg, CheckedInputObjects, Command, InputObjectKind, ObjectReadResult,
         ObjectReadResultKind, ProgrammableTransaction, TransactionData, TransactionDataAPI,
         TransactionKind,
-    }
+    },
 };
 use tracing::{debug, trace, warn};
 
@@ -78,7 +89,7 @@ where
             metrics,
             registry,
             movevm,
-            deploy_ids: 0
+            deploy_ids: 0,
         })
     }
     pub fn new(db: T) -> Result<Self, MovyError> {

crates/movy/src/sui/env.rs

@@ -38,6 +38,8 @@ pub struct SuiTargetArgs {
     pub objects: Option<Vec<MoveAddress>>,
     #[arg(short, long, help = "Local packages to build.")]
     pub locals: Option<Vec<PathBuf>>,
+    #[arg(long, help = "Trace movy_init")]
+    pub trace_movy_init: bool,
 }
 
 impl SuiTargetArgs {
@@ -99,7 +101,15 @@ impl SuiTargetArgs {
         for local in self.locals.iter().flatten() {
             tracing::info!("Deploying the local package at {}", local.display());
             let (target_package, testing_abi, abi, package_names) = env
-                .load_local(local, deployer, attacker, epoch, epoch_ms, gas.into())
+                .load_local(
+                    local,
+                    deployer,
+                    attacker,
+                    epoch,
+                    epoch_ms,
+                    gas.into(),
+                    self.trace_movy_init,
+                )
                 .await?;
             for name in package_names.iter() {
                 local_name_map.insert(name.clone(), target_package);

crates/movy/src/sui/fuzz.rs

@@ -12,8 +12,9 @@ use movy_replay::{
     env::SuiTestingEnv,
 };
 use movy_sui::{
-    database::{cache::CachedStore, graphql::GraphQlDatabase},
+    database::{cache::CachedStore, empty::EmptyStore, graphql::GraphQlDatabase},
     rpc::{graphql::GraphQlClient, grpc::SuiGrpcArg},
+    utils::TrivialBackStore,
 };
 use movy_types::{
     abi::MoveModuleId,
@@ -137,6 +138,11 @@ pub struct SuiFuzzArgs {
     )]
     pub force_removal: bool,
 
+    #[arg(short, long, help = "Enable GraphQL fallback")]
+    pub graphql: bool,
+    #[arg(long, help = "Enable GraphQL during deployment")]
+    pub graphql_deployment: bool,
+
     #[clap(flatten)]
     pub onchain: SuiOnchainArguments,
     #[clap(flatten)]
@@ -189,10 +195,16 @@ impl SuiFuzzArgs {
             .onchain
             .resolve_onchain_primitives(Some(&graphql))
             .await?;
-        let env = CachedStore::new(GraphQlDatabase::new_client(
-            graphql.clone(),
-            primitives.checkpoint,
-        ));
+
+        let inner = if self.graphql_deployment {
+            TrivialBackStore::T1(GraphQlDatabase::new_client(
+                graphql.clone(),
+                primitives.checkpoint,
+            ))
+        } else {
+            TrivialBackStore::T2(EmptyStore::default())
+        };
+        let env = CachedStore::new(inner);
         let gas_id = ObjectID::random_from_rng(&mut rand);
         env.mint_coin_id(
             MoveTypeTag::from_str("0x2::sui::SUI").unwrap(),
@@ -283,8 +295,19 @@ impl SuiFuzzArgs {
         // Arc<T> is send only if T is Sync while RefCell is not.
         let inner = testing_env.into_inner();
         let inner = Arc::try_unwrap(inner).unwrap();
+        let dump = inner.inner.take();
+        let inner = if self.graphql {
+            TrivialBackStore::T1(GraphQlDatabase::new_client(
+                graphql.clone(),
+                primitives.checkpoint,
+            ))
+        } else {
+            TrivialBackStore::T2(EmptyStore::default())
+        };
+        let store = CachedStore::new(inner);
+        store.restore_snapshot(dump);
         tokio::task::spawn_blocking(move || {
-            let env = SuiTestingEnv::new(inner.wrapped());
+            let env = SuiTestingEnv::new(store.wrapped());
             sui_fuzz::fuzz(
                 meta,
                 env,