From ae26e20886e5b0b39c0e9edf9e14c10e020525e7 Mon Sep 17 00:00:00 2001
From: Dariusz Depta <141360751+DariuszDepta@users.noreply.github.com>
Date: Fri, 22 Aug 2025 16:06:52 +0200
Subject: [PATCH 1/3] Unified dependencies for cosmwasm-check.

---
 Cargo.toml                | 2 ++
 packages/check/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bf6590a1e9..621a8beafa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,8 @@ resolver = "2"
 version = "3.0.2-dev"
 
 [workspace.dependencies]
+cosmwasm-vm = { path = "./packages/vm" }
+cosmwasm-std = { path = "./packages/std" }
 schemars = "0.8.4"
 serde = { version = "1.0.192", default-features = false, features = ["alloc", "derive"] }
 
diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml
index 1eac68fd49..c8f0478b6f 100644
--- a/packages/check/Cargo.toml
+++ b/packages/check/Cargo.toml
@@ -11,8 +11,8 @@ license = "Apache-2.0"
 anyhow = "1.0.57"
 clap = "4"
 colored = "2.1.0"
-cosmwasm-vm = { path = "../vm" }
-cosmwasm-std = { path = "../std" }
+cosmwasm-vm = { workspace = true }
+cosmwasm-std = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = "2.0.12"

From 9879a33ebd45cc929c79f2e2fc0a7a7b40343da0 Mon Sep 17 00:00:00 2001
From: Dariusz Depta <141360751+DariuszDepta@users.noreply.github.com>
Date: Fri, 22 Aug 2025 16:24:53 +0200
Subject: [PATCH 2/3] Unified dependencies for all packages.

---
 Cargo.lock                    |  4 ++--
 Cargo.toml                    | 12 +++++++++++-
 packages/check/Cargo.toml     |  2 +-
 packages/crypto/Cargo.toml    |  2 +-
 packages/cw-schema/Cargo.toml |  2 +-
 packages/go-gen/Cargo.toml    |  4 ++--
 packages/schema/Cargo.toml    |  8 ++++----
 packages/std/Cargo.toml       | 12 ++++++------
 packages/vm/Cargo.toml        |  8 ++++----
 9 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b104b4bd9e..6e386f464b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2806,9 +2806,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "itoa",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 621a8beafa..64c02bd65c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,10 +8,20 @@ resolver = "2"
 version = "3.0.2-dev"
 
 [workspace.dependencies]
+cosmwasm-core = { path = "./packages/core" }
+cosmwasm-crypto = { path = "./packages/crypto" }
+cosmwasm-derive = { path = "./packages/derive" }
+cosmwasm-schema = { path = "./packages/schema" }
+cosmwasm-schema-derive = { path = "./packages/schema-derive" }
+cosmwasm-std = { path = "./packages/std", default-features = false }
 cosmwasm-vm = { path = "./packages/vm" }
-cosmwasm-std = { path = "./packages/std" }
+cosmwasm-vm-derive = { path = "./packages/vm-derive" }
+cw-schema = { path = "./packages/cw-schema" }
+cw-schema-derive = { path = "./packages/cw-schema-derive" }
 schemars = "0.8.4"
 serde = { version = "1.0.192", default-features = false, features = ["alloc", "derive"] }
+serde_json = "1.0.140"
+thiserror = "1.0.26"
 
 [workspace.metadata.release]
 shared-version = true
diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml
index c8f0478b6f..a1064e216b 100644
--- a/packages/check/Cargo.toml
+++ b/packages/check/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.57"
 clap = "4"
 colored = "2.1.0"
 cosmwasm-vm = { workspace = true }
-cosmwasm-std = { workspace = true }
+cosmwasm-std = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_cmd = "2.0.12"
diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml
index 04737c1121..819ed14df7 100644
--- a/packages/crypto/Cargo.toml
+++ b/packages/crypto/Cargo.toml
@@ -16,7 +16,7 @@ ark-bls12-381 = "0.5.0"
 ark-ec = { version = "0.5.0", features = ["parallel"] }
 ark-ff = { version = "0.5.0", features = ["asm", "parallel"] }
 ark-serialize = "0.5.0"
-cosmwasm-core = { path = "../core" }
+cosmwasm-core = { workspace = true }
 digest = "0.10"
 ed25519-zebra = { version = "=4.0.3", default-features = false }
 k256 = { version = "0.13.3", default-features = false, features = ["ecdsa"] }
diff --git a/packages/cw-schema/Cargo.toml b/packages/cw-schema/Cargo.toml
index d71d84a07d..7ba277ee9f 100644
--- a/packages/cw-schema/Cargo.toml
+++ b/packages/cw-schema/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/cw-schema"
 license = "Apache-2.0"
 
 [dependencies]
-cw-schema-derive = { path = "../cw-schema-derive" }
+cw-schema-derive = { workspace = true }
 indexmap = { version = "2.3.0", default-features = false }
 schemars = { version = "1.0.4", optional = true }
 serde = { version = "1.0.204", features = ["derive"] }
diff --git a/packages/go-gen/Cargo.toml b/packages/go-gen/Cargo.toml
index 8e77f64e1d..a35e6a16fb 100644
--- a/packages/go-gen/Cargo.toml
+++ b/packages/go-gen/Cargo.toml
@@ -9,8 +9,8 @@ publish = false
 release = false
 
 [dependencies]
-cosmwasm-std = { path = "../std", features = ["cosmwasm_3_0", "staking", "stargate"] }
-cosmwasm-schema = { path = "../schema" }
+cosmwasm-std = { workspace = true, default-features = true, features = ["cosmwasm_3_0", "staking", "stargate"] }
+cosmwasm-schema = { workspace = true }
 anyhow = "1"
 indenter = "0.3.3"
 schemars = { workspace = true }
diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml
index bb43262f9f..cfd4ebe150 100644
--- a/packages/schema/Cargo.toml
+++ b/packages/schema/Cargo.toml
@@ -11,12 +11,12 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/schema"
 license = "Apache-2.0"
 
 [dependencies]
-cosmwasm-schema-derive = { path = "../schema-derive" }
-cw-schema = { path = "../cw-schema" }
+cosmwasm-schema-derive = { workspace = true }
+cw-schema = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
-serde_json = "1.0.140"
-thiserror = "1.0.26"
+serde_json = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 anyhow = "1.0.57"
diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml
index 23d9b6225c..645ba4b784 100644
--- a/packages/std/Cargo.toml
+++ b/packages/std/Cargo.toml
@@ -62,9 +62,9 @@ cosmwasm_3_0 = ["cosmwasm_2_2"]
 [dependencies]
 base64 = "0.22.0"
 bnum = "0.11.0"
-cosmwasm-core = { path = "../core" }
-cosmwasm-derive = { path = "../derive" }
-cw-schema = { path = "../cw-schema" }
+cosmwasm-core = { workspace = true }
+cosmwasm-derive = { workspace = true }
+cw-schema = { workspace = true }
 derive_more = { version = "2.0.1", default-features = false, features = ["debug"] }
 hex = "0.4"
 schemars = { workspace = true }
@@ -77,12 +77,12 @@ rmp-serde = "1.3.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 bech32 = "0.11.0"
-cosmwasm-crypto = { path = "../crypto" }
+cosmwasm-crypto = { workspace = true }
 rand_core = { version = "0.6.4", features = ["getrandom"] }
 
 [dev-dependencies]
-cosmwasm-core = { path = "../core" }
-cosmwasm-schema = { path = "../schema" }
+cosmwasm-core = { workspace = true }
+cosmwasm-schema = { workspace = true }
 # The chrono dependency is only used in an example, which Rust compiles for us. If this causes trouble, remove it.
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 crc32fast = "1.3.2"
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index 6b56075bd1..52c4effb28 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -44,10 +44,10 @@ crc32fast = "1.3.2"
 bech32 = "0.11.0"
 blake2 = "0.10.6"
 # Uses the path when built locally; uses the given version from crates.io when published
-cosmwasm-core = { path = "../core" }
-cosmwasm-std = { path = "../std", default-features = false, features = ["std"] }
-cosmwasm-crypto = { path = "../crypto" }
-cosmwasm-vm-derive = { path = "../vm-derive" }
+cosmwasm-core = { workspace = true }
+cosmwasm-std = { workspace = true, default-features = false, features = ["std"] }
+cosmwasm-crypto = { workspace = true }
+cosmwasm-vm-derive = { workspace = true }
 derive_more = { version = "=1.0.0-beta.6", default-features = false, features = ["debug"] }
 hex = "0.4"
 rand_core = { version = "0.6", features = ["getrandom"] }

From d26bb00966e296eb4ff283573ac7897b19ebecda Mon Sep 17 00:00:00 2001
From: Dariusz Depta <141360751+DariuszDepta@users.noreply.github.com>
Date: Fri, 22 Aug 2025 16:50:16 +0200
Subject: [PATCH 3/3] Reverted serde_json version upgrade.

---
 Cargo.lock             | 4 ++--
 packages/vm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e386f464b..b104b4bd9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2806,9 +2806,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index 52c4effb28..d304c21c3c 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -45,7 +45,7 @@ bech32 = "0.11.0"
 blake2 = "0.10.6"
 # Uses the path when built locally; uses the given version from crates.io when published
 cosmwasm-core = { workspace = true }
-cosmwasm-std = { workspace = true, default-features = false, features = ["std"] }
+cosmwasm-std = { workspace = true, features = ["std"] }
 cosmwasm-crypto = { workspace = true }
 cosmwasm-vm-derive = { workspace = true }
 derive_more = { version = "=1.0.0-beta.6", default-features = false, features = ["debug"] }