diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml deleted file mode 100644 index db63209d2..000000000 --- a/.github/workflows/artifacts.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Artifacts - -on: - push: - branches: - - master - - main - pull_request: - -env: - RUST_BACKTRACE: 1 - CARGO_TERM_COLOR: always - -jobs: - artifacts: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Install cargo make - uses: davidB/rust-cargo-make@v1 - - - name: Compile contracts to wasm - run: cargo make rust-optimizer diff --git a/Cargo.lock b/Cargo.lock index b938e3260..f5f0b5b99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -842,7 +842,7 @@ dependencies = [ "regex", "serde", "serde_json", - "strum", + "strum 0.24.1", "test-tube", "thiserror", ] @@ -1884,9 +1884,9 @@ dependencies = [ [[package]] name = "mars-owner" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd53908ffc561da878ce5ff4f5ec9f25a193af28ec0b6e7c8e6d1a0866d9dfc" +checksum = "ab46e0b2f81a8a98036b46730fbe33a337e98e87cb3d34553b45a5ae87c5828c" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1948,7 +1948,7 @@ dependencies = [ "cosmwasm-std", "mars-owner", "mars-utils", - "strum", + "strum 0.25.0", "thiserror", ] @@ -2969,9 +2969,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" dependencies = [ "serde_derive", ] @@ -3005,9 +3005,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" dependencies = [ "proc-macro2", "quote", @@ -3182,7 +3182,16 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", +] + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.1", ] [[package]] @@ -3198,6 +3207,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.28", +] + [[package]] name = "subtle" version = "2.5.0" diff --git a/Cargo.toml b/Cargo.toml index 41b21ba77..8955b9a95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,32 +42,32 @@ keywords = [ ] [workspace.dependencies] -anyhow = "1.0.71" +anyhow = "1.0.72" bech32 = "0.9.1" -cosmwasm-schema = "1.2.6" +cosmwasm-schema = "1.3.1" cosmwasm-std = "1.3.1" cw2 = "1.1.0" -cw-storage-plus = "1.0.1" +cw-storage-plus = "1.1.0" cw-utils = "1.0.1" -mars-owner = { version = "1.2.0", features = ["emergency-owner"] } +mars-owner = { version = "2.0.0", features = ["emergency-owner"] } osmosis-std = "0.16.1" -prost = { version = "0.11.5", default-features = false, features = ["prost-derive"] } +prost = { version = "0.11.9", default-features = false, features = ["prost-derive"] } schemars = "0.8.12" -serde = { version = "1.0.163", default-features = false, features = ["derive"] } -thiserror = "1.0.40" -pyth-sdk-cw = "1.2.0" +serde = { version = "1.0.181", default-features = false, features = ["derive"] } +thiserror = "1.0.44" +pyth-sdk-cw = "1.2.0" cw-paginate = "0.2.1" astroport = "2.8.0" -strum = "0.24.1" -neutron-sdk = "0.6.0" +strum = "0.25.0" +neutron-sdk = "0.6.1" serde_json = "1.0" # dev-dependencies cw-multi-test = "0.16.5" cw-it = "0.1.0" osmosis-test-tube = "=16.1.1" -test-case = "3.0.0" -proptest = "1.1.0" +test-case = "3.1.0" +proptest = "1.2.0" # packages mars-health = { path = "./packages/health" } diff --git a/Makefile.toml b/Makefile.toml index 0f985ef21..a27c7d1ae 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -10,7 +10,7 @@ default_to_workspace = false # Directory with wasm files used by integration tests (another directory can be used instead, for example 'artifacts' from rust-optimizer) ARTIFACTS_DIR_PATH = "target/wasm32-unknown-unknown/release" # If you bump this version, verify RUST_VERSION correctness -RUST_OPTIMIZER_VERSION = "0.12.13" +RUST_OPTIMIZER_VERSION = "0.13.0" # Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/rust-optimizer/blob/main/Dockerfile#L1) # to be sure that we compile / test against the same version RUST_VERSION = "1.69.0" @@ -44,7 +44,7 @@ else image="cosmwasm/workspace-optimizer:${RUST_OPTIMIZER_VERSION}" fi docker run --rm -v "$(pwd)":/code \ - --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \ + --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \ --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ ${image} """