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

chore: bump cw-dex to 0.5.1 #31

Merged
merged 2 commits into from
Feb 6, 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
9 changes: 9 additions & 0 deletions .github/workflows/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches:
- master
- main
tags:
- "v*.*.*"
pull_request:
branches:
- master
Expand Down Expand Up @@ -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 }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Apollo Devs <[email protected]>"]
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"
Expand Down Expand Up @@ -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"
Expand Down
33 changes: 6 additions & 27 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -32,27 +25,13 @@ unknown-git = "deny"
allow-git = []
[sources.allow-org]
github = [
"apollodao",
# "apollodao",
]

[licenses]
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 },
]
11 changes: 5 additions & 6 deletions tests/migrate_from_0_1_0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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(
Expand Down
Loading