Separate contracts (#468)

* separate contracts * Remove contracts from top level toml * Update comment * fix ci wasm build * We don't have cw20 wasm * update makefile * deps fixes * generate lockfile in contracts-ws
AbstractSDK · Aug 19, 2024 · 5b167ac · 5b167ac
1 parent 388dc29
commit 5b167ac
Show file tree

Hide file tree

Showing 41 changed files with 50 additions and 34 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -100,11 +100,11 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Generate Cargo.lock
         run: |
-          cargo fetch --verbose
+          (cd contracts-ws && cargo fetch --verbose)
       - name: Build Artifacts
         run: |
           docker run --rm -v "$(pwd)":/code \
-          --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
+          --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/contracts-ws/target \
           --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-          cosmwasm/optimizer:0.16.0
+          cosmwasm/optimizer:0.16.0 ./contracts-ws
           tar -zcvf cosmwasm-artifacts.tar.gz artifacts
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
   # "packages/clone-testing",
   # "packages/cw-orch-osmosis-test-tube",
   "packages/cw-orch-traits",
-  "contracts/*",
   "test_contracts/*",
   "packages/macros/*",
   "packages/interchain/*",

diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,4 +1,4 @@
-877962e071ee6213cb42e93c8b08d7a706c603ffbfb6c0f4141210ce2fa257ab  counter_contract.wasm
-4cf7e489c29fe736f1a7d6903019bc76053c0531caad5c5d5f6c1783452336e2  cw_orch_compatibility_test.wasm
-1404ed74888640c4c7a422a5e436cf6d46d5252add3f12905ee499057f6f4c87  mock_contract.wasm
-f39c5344861fc07a0aeb074c962f5b1ac413c7afb2749a4d6cbae487bc7f2fab  mock_contract_u64.wasm
+cc02664dc02c571fd0e4bb02061b737571a510a6a4ac01f8cc783545bec6fff4  counter_contract.wasm
+a266c5ab0ffdf78b3aee593d07d3c822fa3c2745bc7bc8210e49860439d65a73  cw_orch_compatibility_test.wasm
+0dc79fb31e732310554a07881cfe8a193c068d2f93539356817e5aaf551650dd  mock_contract.wasm
+08d65b781d7357a6777c836229d971b6c87a5fdfc7cba9806ed508f917859f08  mock_contract_u64.wasm
diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt
diff --git a/artifacts/counter_contract.wasm b/artifacts/counter_contract.wasm
diff --git a/artifacts/cw_orch_compatibility_test.wasm b/artifacts/cw_orch_compatibility_test.wasm
diff --git a/artifacts/mock_contract.wasm b/artifacts/mock_contract.wasm
diff --git a/artifacts/mock_contract_u64.wasm b/artifacts/mock_contract_u64.wasm
diff --git a/contracts-ws/Cargo.toml b/contracts-ws/Cargo.toml
@@ -0,0 +1,25 @@
+[workspace]
+
+members = ["contracts/*"]
+
+resolver = "2"
+
+[workspace.package]
+edition = "2021"
+
+[workspace.dependencies]
+cosmwasm-std = "2.0.0"
+cw20 = { package = "abstract-cw20", version = "2.0.0" }
+cw20-base = { package = "abstract-cw20-base", version = "2.0.0" }
+cw-storage-plus = { version = "2.0.0" }
+
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+anyhow = "1.0"
+log = "0.4.14"
+
+cw-orch = { version = "0.25.0" }
+cw-orch-interchain = { version = "0.4.0" }
+
+[patch.crates-io]
+cw-orch = { path = "../cw-orch" }
+cw-orch-interchain = { path = "../cw-orch-interchain" }
diff --git a/contracts/counter/Cargo.toml → contracts-ws/contracts/counter/Cargo.toml b/contracts/counter/Cargo.toml → contracts-ws/contracts/counter/Cargo.toml
@@ -33,6 +33,5 @@ name = "deploy"
 # Deps for deployment
 dotenv = { version = "0.15.0" }
 pretty_env_logger = { version = "0.5.0" }
-cw-orch = { path = "../../cw-orch", features = ["daemon"] }
-# cw-orch-osmosis-test-tube = { workspace = true }
+cw-orch = { workspace = true, features = ["daemon"] }
 anyhow = { workspace = true }
diff --git a/contracts/counter/README.md → contracts-ws/contracts/counter/README.md b/contracts/counter/README.md → contracts-ws/contracts/counter/README.md
diff --git a/contracts/counter/examples/async.rs → ...ts-ws/contracts/counter/examples/async.rs b/contracts/counter/examples/async.rs → ...ts-ws/contracts/counter/examples/async.rs
diff --git a/contracts/counter/examples/deploy.rs → ...s-ws/contracts/counter/examples/deploy.rs b/contracts/counter/examples/deploy.rs → ...s-ws/contracts/counter/examples/deploy.rs
diff --git a/contracts/counter/src/contract.rs → ...acts-ws/contracts/counter/src/contract.rs b/contracts/counter/src/contract.rs → ...acts-ws/contracts/counter/src/contract.rs
diff --git a/contracts/counter/src/error.rs → contracts-ws/contracts/counter/src/error.rs b/contracts/counter/src/error.rs → contracts-ws/contracts/counter/src/error.rs
diff --git a/contracts/counter/src/execute.rs → ...racts-ws/contracts/counter/src/execute.rs b/contracts/counter/src/execute.rs → ...racts-ws/contracts/counter/src/execute.rs
diff --git a/contracts/counter/src/interface.rs → ...cts-ws/contracts/counter/src/interface.rs b/contracts/counter/src/interface.rs → ...cts-ws/contracts/counter/src/interface.rs
diff --git a/contracts/counter/src/lib.rs → contracts-ws/contracts/counter/src/lib.rs b/contracts/counter/src/lib.rs → contracts-ws/contracts/counter/src/lib.rs
diff --git a/contracts/counter/src/msg.rs → contracts-ws/contracts/counter/src/msg.rs b/contracts/counter/src/msg.rs → contracts-ws/contracts/counter/src/msg.rs
diff --git a/contracts/counter/src/query.rs → contracts-ws/contracts/counter/src/query.rs b/contracts/counter/src/query.rs → contracts-ws/contracts/counter/src/query.rs
diff --git a/contracts/counter/src/state.rs → contracts-ws/contracts/counter/src/state.rs b/contracts/counter/src/state.rs → contracts-ws/contracts/counter/src/state.rs
diff --git a/contracts/counter/tests/checksum.rs → ...ts-ws/contracts/counter/tests/checksum.rs b/contracts/counter/tests/checksum.rs → ...ts-ws/contracts/counter/tests/checksum.rs
@@ -7,7 +7,7 @@ fn checksum() {
     use std::io::{self, BufRead};
     use std::path::Path;
 
-    let path = Path::new("../../artifacts/checksums.txt");
+    let path = Path::new("../../../artifacts/checksums.txt");
     let file = File::open(path).unwrap();
     let lines = io::BufReader::new(file).lines();
     let mut found = false;

diff --git a/contracts/counter/tests/integration_tests.rs → ...tracts/counter/tests/integration_tests.rs b/contracts/counter/tests/integration_tests.rs → ...tracts/counter/tests/integration_tests.rs
diff --git a/contracts/mock_contract/Cargo.toml → ...cts-ws/contracts/mock_contract/Cargo.toml b/contracts/mock_contract/Cargo.toml → ...cts-ws/contracts/mock_contract/Cargo.toml
@@ -23,5 +23,5 @@ schemars = "0.8.10"
 serde_json = "1.0.79"
 thiserror = { version = "1.0.21" }
 cosmwasm-schema = "1.2"
-cw-orch = { path = "../../cw-orch" }
+cw-orch = { workspace = true }
 cw-storage-plus = { workspace = true }
diff --git a/contracts/mock_contract/README.md → ...acts-ws/contracts/mock_contract/README.md b/contracts/mock_contract/README.md → ...acts-ws/contracts/mock_contract/README.md
diff --git a/contracts/mock_contract/src/custom_resp.rs → ...ontracts/mock_contract/src/custom_resp.rs b/contracts/mock_contract/src/custom_resp.rs → ...ontracts/mock_contract/src/custom_resp.rs
diff --git a/contracts/mock_contract/src/lib.rs → ...cts-ws/contracts/mock_contract/src/lib.rs b/contracts/mock_contract/src/lib.rs → ...cts-ws/contracts/mock_contract/src/lib.rs
diff --git a/contracts/mock_contract/src/msg_tests.rs → .../contracts/mock_contract/src/msg_tests.rs b/contracts/mock_contract/src/msg_tests.rs → .../contracts/mock_contract/src/msg_tests.rs
diff --git a/contracts/mock_contract_u64/Cargo.toml → ...ws/contracts/mock_contract_u64/Cargo.toml b/contracts/mock_contract_u64/Cargo.toml → ...ws/contracts/mock_contract_u64/Cargo.toml
@@ -21,6 +21,6 @@ schemars = "0.8.10"
 serde_json = "1.0.79"
 thiserror = { version = "1.0.21" }
 cosmwasm-schema = "1.2"
-cw-orch = { path = "../../cw-orch" }
+cw-orch = { workspace = true }
 
 mock-contract = { path = "../mock_contract" }
diff --git a/contracts/mock_contract_u64/README.md → ...-ws/contracts/mock_contract_u64/README.md b/contracts/mock_contract_u64/README.md → ...-ws/contracts/mock_contract_u64/README.md
diff --git a/contracts/mock_contract_u64/src/lib.rs → ...ws/contracts/mock_contract_u64/src/lib.rs b/contracts/mock_contract_u64/src/lib.rs → ...ws/contracts/mock_contract_u64/src/lib.rs
diff --git a/cw-orch-daemon/Cargo.toml b/cw-orch-daemon/Cargo.toml
@@ -87,7 +87,7 @@ cosmwasm-schema = "1.2"
 speculoos = "0.11.0"
 ctor = "0.2.0"
 duct = "0.13"
-mock-contract = { path = "../contracts/mock_contract", features = [
+mock-contract = { path = "../contracts-ws/contracts/mock_contract", features = [
   "interface",
 ] }
 serial_test = { version = "3.0.0" }
@@ -99,6 +99,6 @@ tokio-test = "0.4.3"
 
 # File lock test
 nix = { version = "0.28.0", features = ["process"] }
-counter-contract = { path = "../contracts/counter" }
+counter-contract = { path = "../contracts-ws/contracts/counter" }
 dotenv = "0.15.0"
 pretty_env_logger = "0.5.0"
diff --git a/cw-orch/Cargo.toml b/cw-orch/Cargo.toml
@@ -95,9 +95,9 @@ cw-orch-mock = { workspace = true }
 cw-orch = { features = ["daemon", "snapshot-testing"], path = "." }
 env_logger = "0.11.2"
 cosmwasm-schema = "1.2"
-counter-contract = { path = "../contracts/counter" }
-mock-contract = { path = "../contracts/mock_contract" }
-mock-contract-u64 = { path = "../contracts/mock_contract_u64" }
+counter-contract = { path = "../contracts-ws/contracts/counter" }
+mock-contract = { path = "../contracts-ws/contracts/mock_contract" }
+mock-contract-u64 = { path = "../contracts-ws/contracts/mock_contract_u64" }
 serde_json = { workspace = true }
 dotenv = "0.15.0"
 osmosis-std = "0.25.0"

diff --git a/packages/clone-testing/Cargo.toml b/packages/clone-testing/Cargo.toml
@@ -31,6 +31,6 @@ cw20 = { workspace = true }
 cw20-base = { workspace = true }
 
 env_logger = "0.10.0"
-counter-contract = { path = "../../contracts/counter" }
+counter-contract = { path = "../../contracts-ws/contracts/counter" }
 cw-orch = { path = "../../cw-orch", features = ["daemon"] }
 pretty_env_logger = "0.5.0"
diff --git a/packages/clone-testing/src/core.rs b/packages/clone-testing/src/core.rs
@@ -474,8 +474,6 @@ impl BankSetter for CloneTesting {
 
 #[cfg(test)]
 mod test {
-    use std::{path::PathBuf, str::FromStr};
-
     use crate::core::*;
     use clone_cw_multi_test::LOCAL_RUST_CODE_OFFSET;
     use cosmwasm_std::{
@@ -518,9 +516,7 @@ mod test {
     }
     impl Uploadable for MockCw20 {
         fn wasm(_chain: &ChainInfoOwned) -> WasmPath {
-            let path = PathBuf::from_str(env!("CARGO_MANIFEST_DIR")).unwrap();
-            let path = path.join("../../artifacts/cw20_base.wasm");
-            WasmPath::new(path).unwrap()
+            unimplemented!()
         }
 
         fn wrapper() -> Box<dyn MockContract<Empty, Empty>> {

diff --git a/packages/cw-orch-mock/Cargo.toml b/packages/cw-orch-mock/Cargo.toml
@@ -24,5 +24,5 @@ speculoos = { workspace = true }
 cw20 = { version = "2.0.0" }
 cw20-base = { version = "2.0.0" }
 
-mock-contract = { path = "../../contracts/mock_contract" }
+mock-contract = { path = "../../contracts-ws/contracts/mock_contract" }
 anyhow = { workspace = true }
diff --git a/packages/cw-orch-osmosis-test-tube/Cargo.toml b/packages/cw-orch-osmosis-test-tube/Cargo.toml
@@ -22,7 +22,7 @@ cw-orch-mock = { workspace = true }
 cw-orch-traits = { workspace = true }
 
 [dev-dependencies]
-counter-contract = { path = "../../contracts/counter" }
+counter-contract = { path = "../../contracts-ws/contracts/counter" }
 env_logger = "0.11.3"
 
 cw-orch = { workspace = true }
diff --git a/packages/interchain/interchain-core/Cargo.toml b/packages/interchain/interchain-core/Cargo.toml
@@ -31,7 +31,7 @@ tokio = "1.32.0"
 tonic = { workspace = true, features = ["tls", "tls-roots"] }
 
 [dev-dependencies]
-counter-contract = { path = "../../../contracts/counter" }
+counter-contract = { path = "../../../contracts-ws/contracts/counter" }
 cw-orch-interchain = { path = "../../../cw-orch-interchain", features = [
   "daemon",
 ] }

diff --git a/packages/interchain/starship/starship/Makefile b/packages/interchain/starship/starship/Makefile
@@ -35,7 +35,7 @@ setup-helm:
 	starship setup
 
 install:
-	starship start --helmFile $(FILE)
+	starship start --config $(FILE)
 
 install-tiny:
 	$(MAKE) install FILE=$(TINY_FILE)

diff --git a/test_contracts/compatibility-test/Cargo.toml b/test_contracts/compatibility-test/Cargo.toml
@@ -21,7 +21,7 @@ serde = { workspace = true }
 schemars = "0.8.10"
 serde_json = "1.0.79"
 thiserror = { version = "1.0.21" }
-cosmwasm-schema = "1.2"
+cosmwasm-schema = "2.0"
 # This version should not be a path dependency and be kept to the last cw-orch version (beyond v0.23)
 # Keeping a different package until v0.23 to avoid package conflicts
 cw-orch = { package = "aaa-test-cw-orch", version = "0.25" }

diff --git a/wasm_contracts.sh b/wasm_contracts.sh
@@ -8,6 +8,6 @@ fi
 
 # Optimized builds
 docker run --rm -v "$(pwd)":/code \
---mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
+--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/contracts-ws/target \
 --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-${image}
+${image} ./contracts-ws