Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ci #530

Merged
merged 5 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
72 changes: 35 additions & 37 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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 = "27.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.3" }
cw-orch-daemon = { path = "./cw-orch-daemon", version = "0.28.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" }
12 changes: 6 additions & 6 deletions contracts-ws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
36 changes: 18 additions & 18 deletions contracts-ws/contracts/counter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"] }

Expand All @@ -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 }
26 changes: 13 additions & 13 deletions contracts-ws/contracts/mock_contract/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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" }
22 changes: 11 additions & 11 deletions contracts-ws/contracts/mock_contract_u64/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"]

Expand All @@ -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" }
Loading
Loading