minor update

Author: wtdcode

crates/movy-replay/src/env.rs

@@ -153,16 +153,32 @@ impl<
         let package_names = compiled_result.package_names.clone();
         let compiled_result = compiled_result.movy_mock()?;
 
-        // 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() {
+        // Deploy onchain deps or deps used by immediate dependencies
+        for dep in abi_result.dependencies().iter().map(|v| v.clone()).chain(
+            abi_result
+                .all_modules_iter()
+                .map(|t| {
+                    t.immediate_dependencies()
+                        .into_iter()
+                        .map(|im| (*im.address()).into())
+                })
+                .flatten(),
+        ) {
+            let dep = AccountAddress::from(dep);
+
+            if dep != AccountAddress::ZERO && 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?;
+                if let Err(e) = self.deploy_package_at_address(dep.into(), rpc).await {
+                    tracing::warn!(
+                        "Fail to add the object {} due to {}, this might be fine though.",
+                        dep,
+                        e
+                    );
+                }
             }
         }
 
@@ -317,12 +333,14 @@ impl<
                 .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?;
+                if self.db.get_object(&upgrade_info.upgraded_id).is_none() {
+                    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 {

crates/movy-sui/src/compile.rs

@@ -91,10 +91,7 @@ impl Display for SuiCompiledPackage {
                     format!("{}:{}", id.address(), id.name().as_str())
                 })
                 .join(", "),
-            self.published_dependencies
-                .iter()
-                .map(|t| t.to_string())
-                .join(", ")
+            self.dependencies.iter().map(|t| t.to_string()).join(", ")
         ))
     }
 }
@@ -110,7 +107,7 @@ impl SuiCompiledPackage {
         MovePackageAbi::from_sui_id_and_modules(self.package_id, self.all_modules_iter())
     }
     pub fn dependencies(&self) -> &Vec<ObjectID> {
-        &self.published_dependencies
+        &self.dependencies
     }
 
     pub fn test_modules(&self) -> Vec<&CompiledModule> {
@@ -167,7 +164,7 @@ impl SuiCompiledPackage {
             published_dependencies: self.published_dependencies.clone(),
         };
 
-        let deps: BTreeSet<ObjectID> = self.published_dependencies.clone().into_iter().collect();
+        let deps: BTreeSet<ObjectID> = self.dependencies.clone().into_iter().collect();
         for md in self.modules.iter() {
             let md = Self::mock_module(md);
             // deps.extend(
@@ -330,25 +327,31 @@ impl SuiCompiledPackage {
             .published
             .iter()
             .map(|v| *v.1)
+            // .chain(modules.iter().map(|v| {
+            //     v.immediate_dependencies().into_iter().map(|t| (*t.address()).into()) // we comment this because we may add multiple addresses that belongs to the upgraded packages which share the same UpgradeCap.
+            // }).flatten())
+            .filter(|t| t != &ObjectID::ZERO && t != &root_address)
             .collect::<BTreeSet<ObjectID>>();
 
+        let published: Vec<ObjectID> = artifacts
+            .dependency_ids
+            .published
+            .values()
+            .cloned()
+            .collect();
         debug!(
-            "Package {} transitively depends on {}",
+            "Package {} transitively depends on {}, the publised ids are {}",
             root_address,
-            deps.iter().map(|t| t.to_string()).join(",")
+            deps.iter().map(|t| t.to_string()).join(","),
+            published.iter().map(|t| t.to_string()).join(",")
         );
         Ok(SuiCompiledPackage {
             package_id: (*root_address).into(),
             package_name,
             package_names,
             modules,
             dependencies: deps.into_iter().collect(),
-            published_dependencies: artifacts
-                .dependency_ids
-                .published
-                .values()
-                .cloned()
-                .collect(),
+            published_dependencies: published,
         })
     }