Merge branch 'adairrr-patch-1' of github.com:AbstractSDK/cw-orchestra…

…tor into adairrr-patch-1
AbstractSDK · Jan 27, 2025 · 3d0b351 · 3d0b351
2 parents 30b991a + ce63803
commit 3d0b351
Show file tree

Hide file tree

Showing 57 changed files with 779 additions and 711 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -79,7 +79,7 @@ jobs:
     # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
     strategy:
       matrix:
-        msrv: [1.76.0] # dep/feat syntax fixed with co-exist dep
+        msrv: [1.78.0] # dep/feat syntax fixed with co-exist dep
     name: ubuntu / ${{ matrix.msrv }}
     steps:
       - uses: actions/checkout@v4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,18 @@
 # cw-orchestrator Changelog
 
-## Unpublished
+## Cw-orch-daemon 0.29.0 - cw-orch-core 2.1.4 [16. December 2024]
 
 - [networks] Replaced union testnet-8 by union-testnet-9
 
 ### Breaking
 
-- [cw-orch-interchain-core] Modify the structure and the names of the IBC analysis and following structure. 
+- [interchain-core] Modify the structure and the names of the IBC analysis and following structure. 
+- [osmosis-test-tube] Update `osmosis-test-tube` to "v27.0.0"
+- [daemon]: Move the bank_send method from the Wallet to the TxSender trait. 
+
+### Added
+
+- [core] bank_send method on TxHandler to facilitate sending funds in script
 
 ## 0.26.0 [8. October 2024]
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,7 @@
 [workspace]
+exclude = [
+  "test_contracts/compatibility-test", # TODO: add new after cw-orch-core 2.0.0 as it's breaking, it shouldn't be compatible
+]
 members = [
   "cw-orch",
   "cw-orch-daemon",
@@ -15,77 +18,72 @@ members = [
   "packages/interchain/*",
   "packages/integrations/*",
 ]
-exclude = [
-  "test_contracts/compatibility-test", # TODO: add new after cw-orch-core 2.0.0 as it's breaking, it shouldn't be compatible
-]
 resolver = "2"
 
 [workspace.package]
-authors = ["CyberHoward <cyberhoward@protonmail.com>"]
-edition = "2021"
-license = "LGPL-3.0"
+authors    = ["CyberHoward <cyberhoward@protonmail.com>"]
+edition    = "2021"
+license    = "LGPL-3.0"
 repository = "https://github.com/AbstractSDK/cw-orchestrator"
 
 [workspace.dependencies]
-cw-utils = { version = "2.0.0" }
-cosmwasm-std = { version = "2.1" }
-cw-storage-plus = { version = "2.0.0" }
 cosmos-sdk-proto = { version = "0.24.0", default-features = false }
+cosmwasm-std     = { version = "2.1" }
+cw-storage-plus  = { version = "2.0.0" }
+cw-utils         = { version = "2.0.0" }
 
-cw-multi-test = { package = "abstract-cw-multi-test", version = "2.0.2", features = [
-  "cosmwasm_1_2",
-] }
-cw20 = { version = "2.0.0" }
-cw20-base = { version = "2.0.0" }
+cw-multi-test = { package = "abstract-cw-multi-test", version = "2.0.2", features = ["cosmwasm_1_2"] }
+cw20          = { version = "2.0.0" }
+cw20-base     = { version = "2.0.0" }
 
-osmosis-test-tube = { version = "26.0.0" }
 neutron-test-tube = { version = "=5.0.1" }
+osmosis-test-tube = { version = "27.0.0" }
 
 anyhow = "1.0"
-serde = { version = "1.0.208", default-features = false, features = ["derive"] }
-tokio = { version = "1.39", features = ["full"] }
+serde  = { version = "1.0.208", default-features = false, features = ["derive"] }
+tokio  = { version = "1.39", features = ["full"] }
 
-cw-orch = { path = "./cw-orch", version = "0.27.0" }
-cw-orch-daemon = { path = "./cw-orch-daemon", version = "0.28.0" }
-cw-orch-core = { path = "packages/cw-orch-core", version = "2.1.3" }
-cw-orch-traits = { path = "packages/cw-orch-traits", version = "0.25.0" }
-cw-orch-mock = { path = "packages/cw-orch-mock", version = "0.24.2" }
+cw-orch          = { path = "./cw-orch", version = "0.27.0" }
+cw-orch-core     = { path = "packages/cw-orch-core", version = "2.1.4" }
+cw-orch-daemon   = { path = "./cw-orch-daemon", version = "0.29.0" }
+cw-orch-mock     = { path = "packages/cw-orch-mock", version = "0.24.2" }
 cw-orch-networks = { path = "packages/cw-orch-networks", version = "0.24.3" }
+cw-orch-traits   = { path = "packages/cw-orch-traits", version = "0.25.0" }
 
 # Macros
 cw-orch-contract-derive = { path = "packages/macros/cw-orch-contract-derive", version = "0.21.0" }
-cw-orch-fns-derive = { path = "packages/macros/cw-orch-fns-derive", version = "0.23.0" }
+cw-orch-fns-derive      = { path = "packages/macros/cw-orch-fns-derive", version = "0.23.0" }
 
 # Extensions
-cw-orch-osmosis-test-tube = { version = "0.4.0", path = "packages/cw-orch-osmosis-test-tube" }
 cw-orch-neutron-test-tube = { version = "0.1.0", path = "packages/cw-orch-neutron-test-tube" }
+cw-orch-osmosis-test-tube = { version = "0.4.0", path = "packages/cw-orch-osmosis-test-tube" }
 
 #Clone Testing
 cw-orch-clone-testing = { version = "0.8.0", path = "packages/clone-testing" }
 
 # Interchain
-cw-orch-interchain = { path = "cw-orch-interchain", version = "0.8.0" }
-cw-orch-interchain-core = { path = "packages/interchain/interchain-core", version = "0.9.0" }
+cw-orch-interchain        = { path = "cw-orch-interchain", version = "0.8.0" }
+cw-orch-interchain-core   = { path = "packages/interchain/interchain-core", version = "0.9.0" }
 cw-orch-interchain-daemon = { path = "packages/interchain/interchain-daemon", version = "0.9.0" }
-cw-orch-interchain-mock = { path = "packages/interchain/interchain-mock", version = "0.9.0" }
-cw-orch-starship = { path = "packages/interchain/starship", version = "0.7.0" }
-cw-orch-proto = { path = "packages/interchain/proto", version = "0.9.0" }
+cw-orch-interchain-mock   = { path = "packages/interchain/interchain-mock", version = "0.9.0" }
+cw-orch-proto             = { path = "packages/interchain/proto", version = "0.9.0" }
+cw-orch-starship          = { path = "packages/interchain/starship", version = "0.7.0" }
 
 
-thiserror = { version = "1.0.63" }
-sha2 = { version = "0.10.8" }
-serde_json = "1.0.125"
-tonic = { version = "0.12.1" }
+cosmrs      = { version = "0.19.0" }
+ibc-proto   = { version = "0.47.0" }
+prost       = "0.13.1"
 prost-types = "0.13.1"
-prost = "0.13.1"
-cosmrs = { version = "0.19.0" }
-ibc-proto = { version = "0.47.0" }
+serde_json  = "1.0.125"
+sha2        = { version = "0.10.8" }
+thiserror   = { version = "1.0.63" }
+tonic       = { version = "0.12.1" }
 # Test deps
 speculoos = "0.11.0"
 
 # Logging
 log = "0.4.22"
 
 # Interchain
-ibc-relayer-types = { version = "0.29.2" }
 ibc-chain-registry = { version = "0.29.2" }
+ibc-relayer-types  = { version = "0.29.2" }
diff --git a/contracts-ws/Cargo.toml b/contracts-ws/Cargo.toml
@@ -8,14 +8,14 @@ resolver = "2"
 edition = "2021"
 
 [workspace.dependencies]
-cosmwasm-std = "2.0.0"
-cw20 = { version = "2.0.0" }
-cw20-base = { version = "2.0.0" }
+cosmwasm-std    = "2.0.0"
 cw-storage-plus = { version = "2.0.0" }
+cw20            = { version = "2.0.0" }
+cw20-base       = { version = "2.0.0" }
 
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 anyhow = "1.0"
-log = "0.4.14"
+log    = "0.4.14"
+serde  = { version = "1.0.103", default-features = false, features = ["derive"] }
 
-cw-orch = { path = "../cw-orch", version = "0.27.0" }
+cw-orch            = { path = "../cw-orch", version = "0.27.0" }
 cw-orch-interchain = { path = "../cw-orch-interchain", version = "0.8.1" }
diff --git a/contracts-ws/contracts/counter/Cargo.toml b/contracts-ws/contracts/counter/Cargo.toml
@@ -1,29 +1,29 @@
 [package]
-name = "counter-contract"
-version = "0.27.1"
 description = "counter constract"
-keywords = ["cosmwasm", "blockchain"]
-edition = { workspace = true }
-license = "LGPL-3.0"
-exclude = [".env"]
+edition     = { workspace = true }
+exclude     = [".env"]
+keywords    = ["cosmwasm", "blockchain"]
+license     = "LGPL-3.0"
+name        = "counter-contract"
+version     = "0.27.1"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export = []
+export  = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = "2.0"
 cosmwasm-schema = "2.1"
-schemars = "0.8.21"
-thiserror = { version = "1.0.63" }
-serde = { workspace = true }
-serde_json = "1.0.125"
-cw-orch = { workspace = true, features = ["daemon"] }
+cosmwasm-std    = { workspace = true }
+cw-orch         = { workspace = true, features = ["daemon"] }
+cw-storage-plus = { workspace = true }
+cw2             = "2.0"
+schemars        = "0.8.21"
+serde           = { workspace = true }
+serde_json      = "1.0.125"
+thiserror       = { version = "1.0.63" }
 # Unused, only there to check for wasm compatibility
 cw-orch-interchain = { workspace = true, features = ["daemon"] }
 
@@ -32,7 +32,7 @@ name = "deploy"
 
 [dev-dependencies]
 # Deps for deployment
-dotenv = { version = "0.15.0" }
+anyhow            = { workspace = true }
+cw-orch           = { workspace = true, features = ["daemon"] }
+dotenv            = { version = "0.15.0" }
 pretty_env_logger = { version = "0.5.0" }
-cw-orch = { workspace = true, features = ["daemon"] }
-anyhow = { workspace = true }
diff --git a/contracts-ws/contracts/mock_contract/Cargo.toml b/contracts-ws/contracts/mock_contract/Cargo.toml
@@ -1,27 +1,27 @@
 [package]
-name = "mock-contract"
-version = "0.1.0"
 description = "Mock constract for cw-orch macro testing"
-keywords = ["cosmwasm", "blockchain"]
-edition = { workspace = true }
+edition     = { workspace = true }
+keywords    = ["cosmwasm", "blockchain"]
+name        = "mock-contract"
+version     = "0.1.0"
 
 exclude = [".env"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = ["export"]
-export = []
+default   = ["export"]
+export    = []
 interface = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cw2 = { version = "2.0.0" }
-serde = { workspace = true }
-schemars = "0.8.21"
-serde_json = "1.0.125"
-thiserror = { version = "1.0.63" }
 cosmwasm-schema = "2.1"
-cw-orch = { workspace = true }
+cosmwasm-std    = { workspace = true }
+cw-orch         = { workspace = true }
 cw-storage-plus = { workspace = true }
+cw2             = { version = "2.0.0" }
+schemars        = "0.8.21"
+serde           = { workspace = true }
+serde_json      = "1.0.125"
+thiserror       = { version = "1.0.63" }
diff --git a/contracts-ws/contracts/mock_contract_u64/Cargo.toml b/contracts-ws/contracts/mock_contract_u64/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "mock-contract-u64"
-version = "0.1.0"
 description = "Mock constract for cw-orch macro testing"
-keywords = ["cosmwasm", "blockchain"]
-edition = { workspace = true }
+edition     = { workspace = true }
+keywords    = ["cosmwasm", "blockchain"]
+name        = "mock-contract-u64"
+version     = "0.1.0"
 
 exclude = [".env"]
 
@@ -12,15 +12,15 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export = []
+export  = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-serde = { workspace = true }
-schemars = "0.8.21"
-serde_json = "1.0.125"
-thiserror = { version = "1.0.63" }
 cosmwasm-schema = "2.1"
-cw-orch = { workspace = true }
+cosmwasm-std    = { workspace = true }
+cw-orch         = { workspace = true }
+schemars        = "0.8.21"
+serde           = { workspace = true }
+serde_json      = "1.0.125"
+thiserror       = { version = "1.0.63" }
 
 mock-contract = { path = "../mock_contract" }