Enabled cw-orch derives, everything compiles

osmosis-labs · May 30, 2024 · a0d8d46 · a0d8d46
1 parent 7c142c2
commit a0d8d46
Show file tree

Hide file tree

Showing 12 changed files with 465 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,12 @@ mesh-converter = { path = "./contracts/consumer/converter" }
 mesh-simple-price-feed = { path = "./contracts/consumer/simple-price-feed" }
 mesh-virtual-staking = { path = "./contracts/consumer/virtual-staking" }
 
-sylvia = "0.10.1"
+# sylvia = "0.10.1"
+# from branch update/clean-add-cw-orch
+sylvia = { git = "https://github.com/AbstractSDK/sylvia.git", rev = "a4168a242d444cc97d6a6363304d99d630dcbef3", features = ["orch"] }
+# need this fork of cw-orch as well...
+cw-orch = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "update/relax-bound-on-derive" }
+# cw-orch = "0.22.1"
 
 cosmwasm-schema = "1.5.4"
 cosmwasm-std = { version = "1.5.4", features = ["ibc3", "cosmwasm_1_3"] }
@@ -43,6 +48,7 @@ thiserror = "1.0.59"
 semver = "1.0.22"
 itertools = "0.12.1"
 
+
 # dev deps
 anyhow = "1"
 cw-multi-test = "0.20"

diff --git a/contracts/consumer/converter/Cargo.toml b/contracts/consumer/converter/Cargo.toml
@@ -35,6 +35,8 @@ schemars = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 mesh-burn = { workspace = true }
 mesh-simple-price-feed = { workspace = true, features = ["mt"] }

diff --git a/contracts/consumer/remote-price-feed/Cargo.toml b/contracts/consumer/remote-price-feed/Cargo.toml
@@ -31,6 +31,8 @@ schemars         = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 cw-multi-test = { workspace = true }
 test-case     = { workspace = true }

diff --git a/contracts/consumer/simple-price-feed/Cargo.toml b/contracts/consumer/simple-price-feed/Cargo.toml
@@ -35,6 +35,8 @@ schemars = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 cw-multi-test = { workspace = true }
 test-case = { workspace = true }

diff --git a/contracts/consumer/virtual-staking/Cargo.toml b/contracts/consumer/virtual-staking/Cargo.toml
@@ -33,6 +33,7 @@ cw-utils         = { workspace = true }
 schemars         = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
+cw-orch = { workspace = true}
 
 [dev-dependencies]
 mesh-simple-price-feed = { workspace = true, features = ["mt", "fake-custom"] }

diff --git a/contracts/osmosis-price-provider/Cargo.toml b/contracts/osmosis-price-provider/Cargo.toml
@@ -29,3 +29,5 @@ serde           = { workspace = true }
 sylvia          = { workspace = true }
 thiserror       = { workspace = true }
 osmosis-std     = { workspace = true }
+
+cw-orch = { workspace = true}
diff --git a/contracts/provider/external-staking/Cargo.toml b/contracts/provider/external-staking/Cargo.toml
@@ -33,6 +33,8 @@ schemars         = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 sylvia        = { workspace = true, features = ["mt"] }
 cw-multi-test = { workspace = true }

diff --git a/contracts/provider/native-staking-proxy/Cargo.toml b/contracts/provider/native-staking-proxy/Cargo.toml
@@ -33,6 +33,8 @@ schemars         = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 sylvia        = { workspace = true, features = ["mt"] }
 cw-multi-test = { workspace = true }

diff --git a/contracts/provider/native-staking/Cargo.toml b/contracts/provider/native-staking/Cargo.toml
@@ -34,6 +34,8 @@ schemars         = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 sylvia        = { workspace = true, features = ["mt"] }
 cw-multi-test = { workspace = true }

diff --git a/contracts/provider/vault/Cargo.toml b/contracts/provider/vault/Cargo.toml
@@ -33,6 +33,8 @@ schemars         = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
 
+cw-orch = { workspace = true}
+
 [dev-dependencies]
 sylvia                    = { workspace = true, features = ["mt"] }
 cw-multi-test             = { workspace = true }

diff --git a/packages/apis/Cargo.toml b/packages/apis/Cargo.toml
@@ -15,3 +15,5 @@ semver           = { workspace = true }
 serde            = { workspace = true }
 sylvia           = { workspace = true }
 thiserror        = { workspace = true }
+
+cw-orch = { workspace = true }