resolve publish issues

wtdcode · wtdcode · commit 225bf6915e9b · 2026-02-16T14:48:47.000Z
diff --git a/crates/movy-replay/src/env.rs b/crates/movy-replay/src/env.rs
@@ -128,6 +128,44 @@ impl<
         self.install_std(true)
     }
 
+    pub async fn fetch_package_at_address(
+        &self,
+        package_id: MoveAddress,
+        rpc: &GraphQlDatabase,
+    ) -> Result<BTreeSet<ObjectID>, MovyError> {
+        let mut out = BTreeSet::new();
+        if let Some(object) = rpc.get_object(package_id.into()).await? {
+            tracing::info!(
+                "Fetching package {}:{} from chain",
+                package_id,
+                object.version()
+            );
+            let pkg = object
+                .data
+                .try_as_package()
+                .ok_or_else(|| eyre!("Expected package data for {}", object.id()))?;
+
+            for (id, upgrade_info) in pkg.linkage_table() {
+                if self.db.get_object(&upgrade_info.upgraded_id).is_none() {
+                    tracing::info!(
+                        "Fetching ugprade cap {}:{} from chain",
+                        upgrade_info.upgraded_id,
+                        upgrade_info.upgraded_version
+                    );
+                    self.deploy_object_id(upgrade_info.upgraded_id.into(), rpc)
+                        .await?;
+                } else {
+                    tracing::debug!("Upgrade info {:?} already exists", upgrade_info);
+                }
+                out.insert(*id);
+            }
+            self.db.commit_single_object(object)?;
+        } else {
+            return Err(eyre!("package {} not found", package_id).into());
+        }
+        Ok(out)
+    }
+
     pub async fn load_local(
         &self,
         path: &Path,
@@ -154,31 +192,39 @@ impl<
         let compiled_result = compiled_result.movy_mock()?;
 
         // Deploy onchain deps or deps used by immediate dependencies
-        for dep in
-            abi_result
-                .dependencies()
-                .iter()
-                .copied()
-                .chain(abi_result.all_modules_iter().flat_map(|t| {
-                    t.immediate_dependencies()
-                        .into_iter()
-                        .map(|im| (*im.address()).into())
-                }))
-        {
+        let mut packages_to_deploy = abi_result
+            .dependencies()
+            .iter()
+            .copied()
+            .chain(abi_result.all_modules_iter().flat_map(|t| {
+                t.immediate_dependencies()
+                    .into_iter()
+                    .map(|im| (*im.address()).into())
+            }))
+            .collect::<BTreeSet<_>>();
+        while let Some(dep) = packages_to_deploy.pop_last() {
             let dep = AccountAddress::from(dep);
 
-            if dep != AccountAddress::ZERO && self.db.get_object(&dep.into()).is_none() {
+            if dep != AccountAddress::ZERO
+                && dep != compiled_result.package_id.into()
+                && 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()
                 );
-                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
-                    );
+                match self.fetch_package_at_address(dep.into(), rpc).await {
+                    Ok(nexts) => {
+                        packages_to_deploy.extend(nexts.into_iter());
+                    }
+                    Err(e) => {
+                        tracing::warn!(
+                            "Fail to add the object {} due to {}, this might be fine though.",
+                            dep,
+                            e
+                        );
+                    }
                 }
             }
         }
@@ -321,35 +367,6 @@ impl<
         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() {
-                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 {
-            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? {
diff --git a/crates/movy-replay/src/exec.rs b/crates/movy-replay/src/exec.rs
@@ -313,6 +313,7 @@ where
             // derive id
             let id = ObjectID::derive_id(random_digest(), self.deploy_ids);
             self.deploy_ids += 1;
+            tracing::info!("Generate a new package id: {}", id);
             substitute_package_id(&mut modules, id)?;
         }
 
diff --git a/crates/movy/src/sui/env.rs b/crates/movy/src/sui/env.rs
@@ -100,7 +100,7 @@ impl SuiTargetArgs {
         let mut local_name_map = BTreeMap::new();
 
         for onchain in self.onchains.iter().flatten() {
-            env.deploy_package_at_address(*onchain, rpc).await?;
+            env.fetch_package_at_address(*onchain, rpc).await?;
             target_packages.push(*onchain);
         }
 
diff --git a/test-data/onchain/hello1/Move.toml b/test-data/onchain/hello1/Move.toml
@@ -3,11 +3,12 @@ name = "hello1"
 edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move
 # license = ""           # e.g., "MIT", "GPL", "Apache 2.0"
 # authors = ["..."]      # e.g., ["Joe Smith (joesmith@noemail.com)", "John Snow (johnsnow@noemail.com)"]
+published-at = "0x18f8f4ebada51361c6558c7cfa77cb46be72fca7caacc475dc828858becfaa75"
 
 [dependencies]
 
 [addresses]
-hello1 = "0bcb4367516cc4f22b7c0265db04e9b4e83b1f24b0b0455020f26e448df6fd08"
+hello1 = "0x0bcb4367516cc4f22b7c0265db04e9b4e83b1f24b0b0455020f26e448df6fd08"
 
 [dev-dependencies]
 
diff --git a/test-data/onchain/hello1/Readme.md b/test-data/onchain/hello1/Readme.md
@@ -3,4 +3,61 @@
 
 The package was deployed at bcb4367516cc4f22b7c0265db04e9b4e83b1f24b0b0455020f26e448df6fd08 firstly and then upgraded to 0x18f8f4ebada51361c6558c7cfa77cb46be72fca7caacc475dc828858becfaa75 with a new module hello1_upgrade.
 
-No published-at field is added.
+Published-at field is added for compatibility.
+
+## Some notes
+
+On Sui, a package's named address must always be its original (v1) package ID, not the upgraded version's ID. The `published-at` field correctly points to the latest version (for linking), but the address must remain the original.
+
+Each package object has a `linkage_table: BTreeMap<ObjectID, UpgradeInfo>,` that maps the original package address to the (possibly upgraded) actual used package address. 
+
+
+AI Explanation:
+
+Yes, exactly — the `linkage_table` is at the heart of it. Let me break down how it works:
+
+### Sui's On-Chain Package Model
+
+Every on-chain package object has a structure roughly like:
+
+```
+Package {
+    id: ObjectID,                                    // this package's own ID
+    modules: BTreeMap<String, CompiledModule>,
+    linkage_table: BTreeMap<ObjectID, UpgradeInfo>,  // key = original ID
+}
+```
+
+The `linkage_table` maps **original package IDs → `UpgradeInfo`** (which contains the upgraded/actual version ID to use at runtime). This is how Sui resolves dependencies when a depended-on package has been upgraded.
+
+### Why the named address must be the original ID
+
+When the Move compiler builds your bytecode, **the named address (`hello1 = "0x..."`) gets baked into the compiled module as the package address**. Every cross-module reference in the bytecode uses this address — e.g., when `hello2` calls `hello1::hello1_upgrade::hello1_upgrade()`, the bytecode literally encodes a reference to the address from `[addresses] hello1`.
+
+At publish/execution time, Sui's runtime does a lookup in the **calling package's `linkage_table`** to resolve which actual on-chain package to load:
+
+1. It sees bytecode referencing address `0x0bcb...` (the original ID)
+2. It looks up `0x0bcb...` in the `linkage_table`
+3. The `linkage_table` entry says: "use version at `0x18f8...`"
+4. It loads the modules from `0x18f8...`
+
+If you set the named address to the **upgraded** ID (`0x18f8...`) instead:
+
+1. The bytecode references `0x18f8...`
+2. Sui looks up `0x18f8...` in the `linkage_table`
+3. **No entry found** — because the key is always the *original* ID (`0x0bcb...`)
+4. → `PublishUpgradeMissingDependency`
+
+### The role of `published-at`
+
+`published-at` serves a **different purpose** — it tells the **Move linker** (at build time) which on-chain package version to link against, so it can verify that the modules and functions you're calling actually exist in that version. It does **not** affect the address baked into bytecode.
+
+So in summary:
+
+| Concept | Value | Used by | Purpose |
+|---|---|---|---|
+| `[addresses] hello1` | Original ID (`0x0bcb...`) | Compiler → bytecode | Baked into bytecode; used as `linkage_table` lookup key at runtime |
+| `published-at` | Latest version ID (`0x18f8...`) | Build-time linker | Verifies the dependency's modules/functions exist on-chain |
+| `linkage_table` key | Original ID (`0x0bcb...`) | Runtime | Maps original → upgraded version for actual code loading |
+
+The invariant is: **bytecode addresses must match `linkage_table` keys, which are always original package IDs**. That's why the named address must never change across upgrades.
diff --git a/test-data/onchain/hello1_published_at/Move.toml b/test-data/onchain/hello1_published_at/Move.toml
@@ -8,7 +8,7 @@ published-at = "0x18f8f4ebada51361c6558c7cfa77cb46be72fca7caacc475dc828858becfaa
 [dependencies]
 
 [addresses]
-hello1 = "0x18f8f4ebada51361c6558c7cfa77cb46be72fca7caacc475dc828858becfaa75"
+hello1 = "0x0bcb4367516cc4f22b7c0265db04e9b4e83b1f24b0b0455020f26e448df6fd08"
 
 [dev-dependencies]
 
diff --git a/test-data/onchain/hello1_published_at/Readme.md b/test-data/onchain/hello1_published_at/Readme.md
@@ -3,4 +3,20 @@
 
 The package was deployed at bcb4367516cc4f22b7c0265db04e9b4e83b1f24b0b0455020f26e448df6fd08 firstly and then upgraded to 0x18f8f4ebada51361c6558c7cfa77cb46be72fca7caacc475dc828858becfaa75 with a new module hello1_upgrade.
 
-There is a `published-at` added by design.
+There is a `published-at` added by design.
+
+Please note the address alias:
+
+```
+[addresses]
+hello1 = "0x0bcb4367516cc4f22b7c0265db04e9b4e83b1f24b0b0455020f26e448df6fd08"
+```
+
+if we wrongly set it to:
+
+```
+[addresses]
+hello1 = "0x18f8f4ebada51361c6558c7cfa77cb46be72fca7caacc475dc828858becfaa75"
+```
+
+the deployment of `hello5` will fail because it should be the original id.
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/.gitignore b/test-data/onchain/hello2_use_upgraded_hello1/.gitignore
@@ -0,0 +1,4 @@
+build/*
+traces/*
+.trace
+.coverage*
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/Move.lock b/test-data/onchain/hello2_use_upgraded_hello1/Move.lock
@@ -0,0 +1,29 @@
+# Generated by move; do not edit
+# This file should be checked in.
+
+[move]
+version = 4
+
+[pinned.mainnet.MoveStdlib]
+source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/move-stdlib", rev = "868c226359ef914f1f3b080518f27eb13d8967f5" }
+use_environment = "mainnet"
+manifest_digest = "C4FE4C91DE74CBF223B2E380AE40F592177D21870DC2D7EB6227D2D694E05363"
+deps = {}
+
+[pinned.mainnet.Sui]
+source = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "868c226359ef914f1f3b080518f27eb13d8967f5" }
+use_environment = "mainnet"
+manifest_digest = "CD547CB1ACCE0880C835DAED2D8FFCB91D56C833AE5240D3AA5B918398263195"
+deps = { MoveStdlib = "MoveStdlib" }
+
+[pinned.mainnet.hello1]
+source = { local = "../hello1" }
+use_environment = "mainnet"
+manifest_digest = "E41BBD67BE8940D26C79D78B028477EF5B33BA217A1282C78ACB344CF8A5ECF6"
+deps = { std = "MoveStdlib", sui = "Sui" }
+
+[pinned.mainnet.hello2]
+source = { root = true }
+use_environment = "mainnet"
+manifest_digest = "5E41B999946BE28C1E620B4E6C5F1B8A9232B5BC411CF52F8C2E1A086A901B98"
+deps = { hello1 = "hello1", std = "MoveStdlib", sui = "Sui" }
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/Move.toml b/test-data/onchain/hello2_use_upgraded_hello1/Move.toml
@@ -0,0 +1,38 @@
+[package]
+name = "hello2"
+edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move
+# license = ""           # e.g., "MIT", "GPL", "Apache 2.0"
+# authors = ["..."]      # e.g., ["Joe Smith (joesmith@noemail.com)", "John Snow (johnsnow@noemail.com)"]
+
+[dependencies]
+
+# For remote import, use the `{ git = "...", subdir = "...", rev = "..." }`.
+# Revision can be a branch, a tag, and a commit hash.
+# MyRemotePackage = { git = "https://some.remote/host.git", subdir = "remote/path", rev = "main" }
+
+# For local dependencies use `local = path`. Path is relative to the package root
+# Local = { local = "../path/to" }
+
+# To resolve a version conflict and force a specific version for dependency
+# override use `override = true`
+# Override = { local = "../conflicting/version", override = true }
+hello1 = {local = "../hello1"}
+
+[addresses]
+hello2 = "0x0"
+
+# Named addresses will be accessible in Move as `@name`. They're also exported:
+# for example, `std = "0x1"` is exported by the Standard Library.
+# alice = "0xA11CE"
+
+[dev-dependencies]
+# The dev-dependencies section allows overriding dependencies for `--test` and
+# `--dev` modes. You can introduce test-only dependencies here.
+# Local = { local = "../path/to/dev-build" }
+
+
+[dev-addresses]
+# The dev-addresses section allows overwriting named addresses for the `--test`
+# and `--dev` modes.
+# alice = "0xB0B"
+
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/Published.toml b/test-data/onchain/hello2_use_upgraded_hello1/Published.toml
@@ -0,0 +1,12 @@
+# Generated by Move
+# This file contains metadata about published versions of this package in different environments
+# This file SHOULD be committed to source control
+
+[published.mainnet]
+chain-id = "35834a8a"
+published-at = "0x1f4a0c8ecb5ab2dbf2304b21d2bcdc1f9a7da3163ca940f4b2434568921f8628"
+original-id = "0x1f4a0c8ecb5ab2dbf2304b21d2bcdc1f9a7da3163ca940f4b2434568921f8628"
+version = 1
+toolchain-version = "1.65.2"
+build-config = { flavor = "sui", edition = "2024" }
+upgrade-capability = "0x62f40d1d8121d1d996e5fd6b07e60e3092d4a63a84795fb8babc37fcbd234f7a"
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/Readme.md b/test-data/onchain/hello2_use_upgraded_hello1/Readme.md
@@ -0,0 +1,5 @@
+# Hello2 Using Upgraded Hello1
+
+This package is the `hello2` using the upgrade `hello1`.
+
+This is deployed to `0x1f4a0c8ecb5ab2dbf2304b21d2bcdc1f9a7da3163ca940f4b2434568921f8628`
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/sources/hello2.move b/test-data/onchain/hello2_use_upgraded_hello1/sources/hello2.move
@@ -0,0 +1,15 @@
+/*
+/// Module: hello2
+module hello2::hello2;
+*/
+
+// For Move coding conventions, see
+// https://docs.sui.io/concepts/sui-move-concepts/conventions
+
+
+module hello2::hello2;
+use hello1::hello1_upgrade;
+
+public fun movy_hello2(): u64 {
+    42 + hello1_upgrade::hello1_upgrade()
+}
diff --git a/test-data/onchain/hello2_use_upgraded_hello1/tests/hello2_tests.move b/test-data/onchain/hello2_use_upgraded_hello1/tests/hello2_tests.move
@@ -0,0 +1,18 @@
+/*
+#[test_only]
+module hello2::hello2_tests;
+// uncomment this line to import the module
+// use hello2::hello2;
+
+const ENotImplemented: u64 = 0;
+
+#[test]
+fun test_hello2() {
+    // pass
+}
+
+#[test, expected_failure(abort_code = ::hello2::hello2_tests::ENotImplemented)]
+fun test_hello2_fail() {
+    abort ENotImplemented
+}
+*/
diff --git a/test-data/onchain/hello5/Move.lock b/test-data/onchain/hello5/Move.lock
diff --git a/test-data/onchain/hello5/Published.toml b/test-data/onchain/hello5/Published.toml

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ where`
`313`	`313`	`// derive id`
`314`	`314`	`let id = ObjectID::derive_id(random_digest(), self.deploy_ids);`
`315`	`315`	`self.deploy_ids += 1;`
	`316`	`+ tracing::info!("Generate a new package id: {}", id);`
`316`	`317`	`substitute_package_id(&mut modules, id)?;`
`317`	`318`	`}`
`318`	`319`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ impl SuiTargetArgs {`
`100`	`100`	`let mut local_name_map = BTreeMap::new();`
`101`	`101`
`102`	`102`	`for onchain in self.onchains.iter().flatten() {`
`103`		`- env.deploy_package_at_address(*onchain, rpc).await?;`
	`103`	`+ env.fetch_package_at_address(*onchain, rpc).await?;`
`104`	`104`	`target_packages.push(*onchain);`
`105`	`105`	`}`
`106`	`106`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +build/*
 +traces/*
 +.trace
 +.coverage*