diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 4de0076..433e637 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -5,6 +5,8 @@ on: branches: - master - main + tags: + - "v*.*.*" pull_request: branches: - master @@ -33,3 +35,10 @@ jobs: with: name: artifacts path: artifacts/ + + - name: Add artifacts to release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: artifacts/* + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7460fd7..9b78c4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +# [0.3.1] - 2024-02-06 + +- Bump `cw-dex` to version `0.5.1`. + # [0.3.0] - 2023-10-26 ### Changed diff --git a/Cargo.lock b/Cargo.lock index 2e240ca..b1d3695 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "cw-dex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8d40af4c29539a1c01e71d7c20cc0d65500b49ab98655e5ee7b5e7972c8bb5" +checksum = "6f47ce1f0a02665dfe244bd5e396ecd3f8628fb8e6aabd1be38689501b6c139a" dependencies = [ "apollo-cw-asset", "apollo-utils", @@ -733,7 +733,7 @@ dependencies = [ [[package]] name = "cw-dex-router" -version = "0.3.0" +version = "0.3.1" dependencies = [ "apollo-cw-asset", "apollo-utils", @@ -1073,7 +1073,7 @@ checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.8", "rfc6979 0.4.0", "signature 2.1.0", "spki 0.7.2", @@ -1143,9 +1143,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct 0.2.0", "crypto-bigint 0.5.3", @@ -1786,7 +1786,7 @@ checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", "ecdsa 0.16.8", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.8", "once_cell", "sha2 0.10.8", "signature 2.1.0", @@ -3941,9 +3941,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 45ac2cf..98e452e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Apollo Devs "] edition = "2021" name = "cw-dex-router" -version = "0.3.0" +version = "0.3.1" readme = "README.md" repository = "https://github.com/apollodao/cw-dex-router" homepage = "https://apollo.farm" @@ -51,7 +51,7 @@ cosmwasm-std = "1.2.1" cosmwasm-schema = "1.2.1" apollo-cw-asset = "0.1.0" cw-controllers = "1.0.1" -cw-dex = "0.5.0" +cw-dex = "0.5.1" cw-storage-plus = "1.0.1" cw2 = "1.0.1" cw20 = "1.0.1" diff --git a/deny.toml b/deny.toml index e4a189c..e14a44e 100644 --- a/deny.toml +++ b/deny.toml @@ -4,22 +4,15 @@ targets = [ { triple = "x86_64-unknown-linux-musl" }, ] +# Ignore dev dependencies +exclude-dev = true + [advisories] vulnerability = "deny" unmaintained = "deny" notice = "deny" unsound = "deny" -ignore = [ - # Potential unaligned pointer read on windows. Doesn't happen in practice. - "RUSTSEC-2021-0145", - # Not valid regarding the `chrono` dependency on `time`. May be valid for - # other crates. See - # https://github.com/chronotope/chrono/issues/602#issuecomment-1075915577 - "RUSTSEC-2020-0071", # Alias: RUSTSEC-2020-26235 - # Only in dev deps - "RUSTSEC-2022-0093", - "RUSTSEC-2023-0052" -] +ignore = [] [bans] multiple-versions = "allow" @@ -32,7 +25,7 @@ unknown-git = "deny" allow-git = [] [sources.allow-org] github = [ - "apollodao", + # "apollodao", ] [licenses] @@ -40,19 +33,5 @@ unlicensed = "deny" copyleft = "deny" # We want really high confidence when inferring licenses from text confidence-threshold = 0.93 -allow = ["Apache-2.0", "MIT", "BSD-3-Clause", "MPL-2.0", "ISC"] +allow = ["Apache-2.0", "MIT", "BSD-3-Clause", "MPL-2.0"] exceptions = [{ allow = ["Unicode-DFS-2016"], name = "unicode-ident" }] - -[[licenses.clarify]] -name = "webpki" -expression = "ISC" -license-files = [ - { path = "LICENSE", hash = 0x001c7e6c }, -] - -[[licenses.clarify]] -name = "ring" -expression = "ISC" -license-files = [ - { path = "LICENSE", hash = 0xbd0eed23 }, -] diff --git a/tests/migrate_from_0_1_0.rs b/tests/migrate_from_0_1_0.rs index d969561..4308319 100644 --- a/tests/migrate_from_0_1_0.rs +++ b/tests/migrate_from_0_1_0.rs @@ -9,12 +9,10 @@ mod tests { use cw_it::osmosis_std::types::cosmwasm::wasm::v1::{ MsgMigrateContract, MsgMigrateContractResponse, }; - use cw_it::osmosis_test_tube::Gamm; + use cw_it::osmosis_test_tube::{Gamm, OsmosisTestApp}; use cw_it::test_tube::{Account, Module, Runner, SigningAccount, Wasm}; - use cw_it::{ - osmosis_test_tube::OsmosisTestApp, traits::CwItRunner, Artifact, ContractType, - OwnedTestRunner, - }; + use cw_it::traits::CwItRunner; + use cw_it::{Artifact, ContractType, OwnedTestRunner}; const TEST_ARTIFACTS_DIR: &str = "tests/test_artifacts"; @@ -119,7 +117,8 @@ mod tests { wasm.execute(&contract_addr, &execute_msg, &[], &admin) .unwrap(); - // Try basket liquidate swapping ION and OSMO to ATOM, should fail due to overlapping paths bug + // Try basket liquidate swapping ION and OSMO to ATOM, should fail due to + // overlapping paths bug let basket_liq_msg = ExecuteMsg::BasketLiquidate { offer_assets: vec![ AssetUnchecked::new(