fix deploy

Author: wtdcode

Cargo.toml

@@ -86,7 +86,7 @@ sui-execution = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"
 shared-crypto = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"}
 sui-move-natives-latest = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"}
 sui-adapter-latest = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"}
-# sui-adapter-v2 = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"}
+
 
 sui-rpc = { git = "https://github.com/MystenLabs/sui-rust-sdk.git", rev = "fb62af78b30f5dc64eeaec0094ab95b5ce5b7ce2" }
 sui-sdk-types =  { git = "https://github.com/MystenLabs/sui-rust-sdk.git", rev = "fb62af78b30f5dc64eeaec0094ab95b5ce5b7ce2" }
@@ -114,9 +114,9 @@ fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "09f86974
 # sui-snapshot = {path = "../sui/crates/sui-snapshot"}
 # sui-core = {path = "../sui/crates/sui-core"}
 # sui-execution = {path = "../sui/sui-execution", features = ["testing"]}
-# # sui-adapter-v2 = {path = "../sui/sui-execution/v2/sui-adapter/"}
 # shared-crypto = {path = "../sui/crates/shared-crypto"}
-
+# sui-move-natives-latest = {path = "../sui/sui-execution/latest/sui-move-natives/"}
+# sui-adapter-latest = {path = "../sui/sui-execution/latest/sui-adapter/"}
 
 # Aptos dependencies
 

crates/movy-replay/src/env.rs

@@ -6,9 +6,10 @@ use std::{
 
 use color_eyre::eyre::eyre;
 use itertools::Itertools;
+use move_core_types::account_address::AccountAddress;
 use movy_sui::{
     compile::SuiCompiledPackage,
-    database::cache::ObjectSuiStoreCommit,
+    database::{cache::ObjectSuiStoreCommit, graphql::GraphQlDatabase},
     rpc::graphql::{GraphQlClient, OwnerKind},
 };
 use movy_types::{
@@ -135,23 +136,36 @@ impl<
         epoch: u64,
         epoch_ms: u64,
         gas: ObjectID,
+        unpublished: bool,
+        verify_deps: bool,
         trace_movy_init: bool,
+        rpc: &GraphQlDatabase,
     ) -> 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)?;
+        let abi_result = SuiCompiledPackage::build_checked(path, false, unpublished, verify_deps)?;
         let mut non_test_abi = abi_result.abi()?;
+        tracing::info!("Compiled summary: {}", &abi_result);
         tracing::info!("Compiling {} with test mode...", path.display());
-        let compiled_result = SuiCompiledPackage::build_all_unpublished_from_folder(path, true)?;
+        let compiled_result =
+            SuiCompiledPackage::build_checked(path, true, unpublished, verify_deps)?;
+        tracing::info!("Compiled summary: {}", &compiled_result);
+
         let package_names = compiled_result.package_names.clone();
         let compiled_result = compiled_result.movy_mock()?;
-        tracing::debug!(
-            "test modules are {}",
-            compiled_result
-                .test_modules()
-                .iter()
-                .map(|v| v.self_id().name().to_string())
-                .join(", ")
-        );
+
+        // Deploy onchain deps (execpt stds)
+        for dep in abi_result.dependencies().iter() {
+            let dep = AccountAddress::from(*dep);
+            if self.db.get_object(&dep.into()).is_none() {
+                tracing::info!(
+                    "Dependency {} not found in our db for {}, trying to fetch it from onchain",
+                    dep,
+                    path.display()
+                );
+                self.deploy_package_at_address(dep.into(), rpc).await?;
+            }
+        }
+
         let mut executor = SuiExecutor::new(self.db.clone())?;
         let address =
             executor.deploy_contract(epoch, epoch_ms, deployer.into(), gas, compiled_result)?;
@@ -279,23 +293,47 @@ impl<
         Ok(())
     }
 
-    pub async fn deploy_address(&self, package_id: MoveAddress) -> Result<(), MovyError> {
-        let Some(package_object) = self.db.get_object(&package_id.into()) else {
-            return Err(eyre!("Package object not found: {}", package_id).into());
-        };
-
-        // Analyze package dependencies
-        let pkg = package_object
-            .data
-            .try_as_package()
-            .ok_or_else(|| eyre!("Expected package data"))?;
-        for upgrade_info in pkg.linkage_table().values() {
-            self.db.load_object(upgrade_info.upgraded_id.into()).await?;
+    pub async fn deploy_object_id(
+        &self,
+        package_id: MoveAddress,
+        rpc: &GraphQlDatabase,
+    ) -> Result<(), MovyError> {
+        if let Some(object) = rpc.get_object(package_id.into()).await? {
+            self.db.commit_single_object(object)?;
+        } else {
+            return Err(eyre!("object {} not found", package_id).into());
         }
 
         Ok(())
     }
 
+    pub async fn deploy_package_at_address(
+        &self,
+        package_id: MoveAddress,
+        rpc: &GraphQlDatabase,
+    ) -> Result<(), MovyError> {
+        tracing::info!("Fetching package {} from chain", package_id);
+        if let Some(object) = rpc.get_object(package_id.into()).await? {
+            let pkg = object
+                .data
+                .try_as_package()
+                .ok_or_else(|| eyre!("Expected package data for {}", object.id()))?;
+
+            for upgrade_info in pkg.linkage_table().values() {
+                tracing::info!(
+                    "Fetching ugprade cap {} from chain",
+                    upgrade_info.upgraded_id
+                );
+                self.deploy_object_id(upgrade_info.upgraded_id.into(), rpc)
+                    .await?;
+            }
+            self.db.commit_single_object(object)?;
+        } else {
+            return Err(eyre!("package {} not found", package_id).into());
+        }
+        Ok(())
+    }
+
     pub async fn all_tys(&self) -> Result<BTreeSet<MoveStructTag>, MovyError> {
         let mut tags = BTreeSet::new();
         for obj in self.db.list_objects().await? {

crates/movy-replay/src/exec.rs

@@ -41,6 +41,10 @@ pub fn testing_proto() -> ProtocolConfig {
     ProtocolConfig::get_for_version(ProtocolVersion::max(), Chain::Mainnet)
 }
 
+fn random_digest() -> TransactionDigest {
+    TransactionDigest::from_str("8thja5nUwaEw7L5ji9tnhCurpkjHdMunRffxwx1H9HsT").unwrap()
+}
+
 #[derive(Clone)]
 pub struct SuiExecutor<T> {
     pub db: T,
@@ -288,42 +292,12 @@ where
                 })
                 .join(",")
         );
-        // rebase to zero address as sui publish requires
-        // for it in modules.iter_mut() {
-        //     let self_handle = it.self_handle().clone();
-        //     if let Some(address_mut) = it
-        //         .address_identifiers
-        //         .get_mut(self_handle.address.0 as usize)
-        //         && *address_mut != AccountAddress::ZERO
-        //     {
-        //         *address_mut = AccountAddress::ZERO;
-        //     }
-
-        //     // TODO: Maybe unnecessary?
-        //     if package_id != ObjectID::ZERO {
-        //         for ident in it.address_identifiers.iter_mut() {
-        //             if ObjectID::from(*ident) == package_id {
-        //                 *ident = AccountAddress::ZERO;
-        //             }
-        //         }
-        //     }
-        // }
 
         if package_id == ObjectID::ZERO {
             // derive id
-            let id = ObjectID::derive_id(TransactionDigest::genesis_marker(), self.deploy_ids);
+            let id = ObjectID::derive_id(random_digest(), self.deploy_ids);
             self.deploy_ids += 1;
             substitute_package_id(&mut modules, id)?;
-        } else {
-            // ensure the modules has the expected id
-            for it in modules.iter_mut() {
-                let self_handle = it.self_handle().clone();
-                let self_address_idx = self_handle.address;
-
-                let addrs = &mut it.address_identifiers;
-                let address_mut = addrs.get_mut(self_address_idx.0 as usize).unwrap();
-                *address_mut = package_id.into();
-            }
         }
 
         let mut modules_bytes = vec![];
@@ -367,7 +341,7 @@ where
             self.db.commit_store(store, &effects)?;
             Ok(new_object.0)
         } else {
-            Err(eyre!("fail to deploy").into())
+            Err(eyre!("fail to deploy with {:?}", effects.status()).into())
         }
     }
 }