From 4296d8cd09087009e5869e87b8110be283cc8d01 Mon Sep 17 00:00:00 2001 From: Pacman Date: Thu, 20 Jul 2023 17:21:01 +0200 Subject: [PATCH] Bump version. Bump deps. --- Cargo.lock | 602 +++++++----------- Cargo.toml | 38 +- contracts/oracle/osmosis/src/migrations.rs | 4 +- .../mars-address-provider.json | 2 +- schemas/mars-incentives/mars-incentives.json | 2 +- .../mars-oracle-osmosis.json | 2 +- .../mars-oracle-wasm/mars-oracle-wasm.json | 2 +- schemas/mars-red-bank/mars-red-bank.json | 2 +- .../mars-rewards-collector-base.json | 2 +- .../mars-swapper-astroport.json | 2 +- .../mars-swapper-osmosis.json | 2 +- 11 files changed, 268 insertions(+), 392 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15a83f955..ceffa0018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,60 +45,53 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] -name = "astro-satellite-package" -version = "0.1.0" -source = "git+https://github.com/astroport-fi/astroport_ibc?branch=main#aad024371d0427f07e2676e37918bc40e8bcde4d" +name = "apollo-cw-multi-test" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c7e04dcaeab52c3390867822b3019f81e239b8bbd3146fb91a83b10fb1f27b" dependencies = [ - "astroport-governance 1.2.0 (git+https://github.com/astroport-fi/astroport-governance?branch=feat/merge_hidden_2023_05_22)", - "cosmwasm-schema", + "anyhow", "cosmwasm-std", + "cw-storage-plus 1.1.0", + "cw-utils 1.0.1", + "derivative", + "itertools", + "k256", + "osmosis-std", + "prost 0.9.0", + "regex", + "schemars", + "serde", + "thiserror", ] [[package]] -name = "astroport" -version = "2.8.0" +name = "astro-satellite-package" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcea351626899d205aab091c891fc878fc9b3c930585fd3ef6222de028d8a7a" +checksum = "5cf737cf762c341a9575ee8fc6da47cc0c4ec11725c9fd0fc5fbb2c31ce0d61a" dependencies = [ + "astroport-governance", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "cw20 0.15.1", - "itertools", - "uint", ] [[package]] name = "astroport" version = "2.8.0" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcea351626899d205aab091c891fc878fc9b3c930585fd3ef6222de028d8a7a" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw-utils 0.15.1", - "cw20 0.15.1", - "itertools", - "uint", -] - -[[package]] -name = "astroport" -version = "2.10.0" -source = "git+https://github.com/astroport-fi/astroport-core?branch=feat/merge_hidden_2023_05_22#11e7a81d4b18a40bed916177061a549633e02b1b" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 1.0.1", - "cw20 0.15.1", - "cw3", + "cw20", "itertools", "uint", ] @@ -106,9 +99,10 @@ dependencies = [ [[package]] name = "astroport-factory" version = "1.5.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ecf768e2d3153bebfbe0c502ffa4199a52598e9b6e89fca54339615b2de77eb" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", @@ -121,16 +115,17 @@ dependencies = [ [[package]] name = "astroport-generator" version = "2.3.0" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6144780ac014665b07616de0cfb35ca6a9411ed821e20c21e02f4f428c8ed51f" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", - "astroport-governance 1.2.0 (git+https://github.com/astroport-fi/astroport-governance?branch=main)", + "astroport", + "astroport-governance", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw1-whitelist", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "protobuf 2.28.0", "thiserror", ] @@ -138,48 +133,39 @@ dependencies = [ [[package]] name = "astroport-governance" version = "1.2.0" -source = "git+https://github.com/astroport-fi/astroport-governance?branch=feat/merge_hidden_2023_05_22#1e865abe55093d249b69b538e2d54472b643d6c7" -dependencies = [ - "astroport 2.10.0", - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw20 0.15.1", -] - -[[package]] -name = "astroport-governance" -version = "1.2.0" -source = "git+https://github.com/astroport-fi/astroport-governance?branch=main#a5412c8c0c16f1c47ed6d23593be9ab0f648a20d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72806ace350e81c4e1cab7e275ef91f05bad830275d697d67ad1bd4acc6f016d" dependencies = [ - "astroport 2.10.0", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", - "cw20 0.15.1", + "cw20", ] [[package]] name = "astroport-maker" version = "1.3.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92403e5d00e3c77d13d9616661ea9d9308d493fff6bec5e6e5e7bd7b7e0ff6af" dependencies = [ "astro-satellite-package", - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "thiserror", ] [[package]] name = "astroport-native-coin-registry" version = "1.0.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648ed6827a8f11012c0377fb60329204e8511fe46c86db3220113e70bdc57826" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", @@ -191,14 +177,15 @@ dependencies = [ [[package]] name = "astroport-pair" version = "1.3.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2287463c922ef2a73f03fe6b16b37123f3f26da5a76998e6ddf828856068f7" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "integer-sqrt", "protobuf 2.28.0", "thiserror", @@ -207,15 +194,16 @@ dependencies = [ [[package]] name = "astroport-pair-stable" version = "2.1.2" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a262f2b6916e2a83808b246ff16cb2306a416e88b15a47ddbea5f8b666b1a4" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw-utils 1.0.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "itertools", "thiserror", ] @@ -223,14 +211,15 @@ dependencies = [ [[package]] name = "astroport-router" version = "1.1.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e3bbb33c00370bd194cf3a166f1e3f4029a2add2bea01a5eb61e886aefbc85b" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "integer-sqrt", "thiserror", ] @@ -238,14 +227,15 @@ dependencies = [ [[package]] name = "astroport-staking" version = "1.1.0" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67adbc4240794e886ca1edbc7d46bc8a54c7aca7217d73ddcfbc90e1dbb030e7" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "protobuf 2.28.0", "thiserror", ] @@ -253,13 +243,14 @@ dependencies = [ [[package]] name = "astroport-token" version = "1.1.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3360383a2e585211da9a455ad57eb100578253b5d18a387f025cadd666604d99" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "cw20-base", "snafu", ] @@ -267,24 +258,26 @@ dependencies = [ [[package]] name = "astroport-vesting" version = "1.3.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffce7cf86bf4d4f177ef941145352499e802abc4b898032af7808d16cca6371" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", "cw-utils 0.15.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "thiserror", ] [[package]] name = "astroport-whitelist" version = "1.0.1" -source = "git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0#3b44a4044b823a145730f66ffaf7ae4205b2cd35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44156757bfab3d4bd208d9b86b890d1478f45d07c8f8d3d1c3e3da91081cb54d" dependencies = [ - "astroport 2.8.0 (git+https://github.com/astroport-fi/astroport-core.git?tag=v2.8.0)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw1-whitelist", @@ -294,13 +287,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -371,7 +364,7 @@ version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "clap", @@ -427,6 +420,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.9.0" @@ -445,6 +444,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bnum" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "845141a4fade3f790628b7daaaa298a25b204fb28907eb54febe5142db6ce653" + [[package]] name = "borsh" version = "0.9.3" @@ -569,7 +574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", "indexmap", "strsim", @@ -607,9 +612,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" [[package]] name = "core-foundation" @@ -672,9 +677,9 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb64554a91d6a9231127f4355d351130a0b94e663d5d9dc8b3a54ca17d83de49" +checksum = "7e272708a9745dad8b591ef8a718571512130f2b39b33e3d7a27c558e3069394" dependencies = [ "digest 0.10.7", "ed25519-zebra", @@ -685,18 +690,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0fb2ce09f41a3dae1a234d56a9988f9aff4c76441cd50ef1ee9a4f20415b028" +checksum = "296db6a3caca5283425ae0cf347f4e46999ba3f6620dbea8939a0e00347831ce" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230e5d1cefae5331db8934763c81b9c871db6a2cd899056a5694fa71d292c815" +checksum = "63c337e097a089e5b52b5d914a7ff6613332777f38ea6d9d36e1887cd0baa72e" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -707,9 +712,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dadf7c23406cb28079d69e6cb922c9c29b9157b0fe887e3b79c783b7d4bcb8" +checksum = "766cc9e7c1762d8fc9c0265808910fcad755200cd0e624195a491dd885a61169" dependencies = [ "proc-macro2", "quote", @@ -718,11 +723,12 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4337eef8dfaf8572fe6b6b415d6ec25f9308c7bb09f2da63789209fb131363be" +checksum = "eb5e05a95fd2a420cca50f4e94eb7e70648dac64db45e90403997ebefeb143bd" dependencies = [ "base64 0.13.1", + "bnum", "cosmwasm-crypto", "cosmwasm-derive", "derivative", @@ -733,14 +739,13 @@ dependencies = [ "serde-json-wasm 0.5.1", "sha2 0.10.7", "thiserror", - "uint", ] [[package]] name = "cosmwasm-storage" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8601d284db8776e39fe99b3416516c5636ca73cef14666b7bb9648ca32c4b89" +checksum = "800aaddd70ba915e19bf3d2d992aa3689d8767857727fdd3b414df4fd52d2aa1" dependencies = [ "cosmwasm-std", "serde", @@ -808,10 +813,12 @@ dependencies = [ [[package]] name = "cw-it" version = "0.1.0" -source = "git+https://github.com/apollodao/cw-it.git?rev=af23474183cc56746a0b9785328a0009427caa9a#af23474183cc56746a0b9785328a0009427caa9a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e3120d46b30b900c4b9ab0f996ce527c1187095c75ffa61d9ea5aa6d1e93b41" dependencies = [ "anyhow", - "astroport 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "apollo-cw-multi-test", + "astroport", "astroport-factory", "astroport-generator", "astroport-maker", @@ -827,37 +834,16 @@ dependencies = [ "cosmrs", "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.2", - "cw20 0.15.1", - "osmosis-std 0.16.0", - "osmosis-test-tube 15.1.0", + "cw20", + "osmosis-std", + "osmosis-test-tube", "paste", "prost 0.11.9", "regex", "serde", "serde_json", "strum", - "test-tube 0.1.2", - "thiserror", -] - -[[package]] -name = "cw-multi-test" -version = "0.16.2" -source = "git+https://github.com/pacmanifold/cw-multi-test.git?rev=a0a28465f3ffee47831c2f20cc20c15c599e70c5#a0a28465f3ffee47831c2f20cc20c15c599e70c5" -dependencies = [ - "anyhow", - "cosmwasm-std", - "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "derivative", - "itertools", - "k256", - "osmosis-std 0.15.3", - "prost 0.9.0", - "regex", - "schemars", - "serde", + "test-tube", "thiserror", ] @@ -1012,19 +998,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw20" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011c45920f8200bd5d32d4fe52502506f64f2f75651ab408054d4cfc75ca3a9b" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 1.0.1", - "schemars", - "serde", -] - [[package]] name = "cw20-base" version = "0.15.1" @@ -1036,28 +1009,13 @@ dependencies = [ "cw-storage-plus 0.15.1", "cw-utils 0.15.1", "cw2 0.15.1", - "cw20 0.15.1", + "cw20", "schemars", "semver", "serde", "thiserror", ] -[[package]] -name = "cw3" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171af3d9127de6805a7dd819fb070c7d2f6c3ea85f4193f42cef259f0a7f33d5" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 1.0.1", - "cw20 1.1.0", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "der" version = "0.6.1" @@ -1113,9 +1071,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "ecdsa" @@ -1167,9 +1125,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1237,12 +1195,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "ff" @@ -1341,7 +1296,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -1464,7 +1419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -1648,15 +1603,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "integer-sqrt" version = "0.1.5" @@ -1666,17 +1612,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1688,9 +1623,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" @@ -1776,9 +1711,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "log" @@ -1788,7 +1723,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "mars-address-provider" -version = "1.1.0" +version = "1.2.0" dependencies = [ "bech32", "cosmwasm-schema", @@ -1803,7 +1738,7 @@ dependencies = [ [[package]] name = "mars-health" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-std", "mars-red-bank-types", @@ -1813,7 +1748,7 @@ dependencies = [ [[package]] name = "mars-incentives" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1824,19 +1759,19 @@ dependencies = [ "mars-red-bank-types", "mars-testing", "mars-utils", - "osmosis-std 0.16.0", + "osmosis-std", "test-case", "thiserror", ] [[package]] name = "mars-integration-tests" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", "cosmwasm-std", "cw-it", - "cw-multi-test 0.16.5", + "cw-multi-test", "mars-oracle-base", "mars-oracle-osmosis", "mars-osmosis", @@ -1846,14 +1781,14 @@ dependencies = [ "mars-swapper-osmosis", "mars-testing", "mars-utils", - "osmosis-std 0.16.0", - "osmosis-test-tube 16.0.0", + "osmosis-std", + "osmosis-test-tube", "serde", ] [[package]] name = "mars-oracle-base" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-std", "cw-storage-plus 1.1.0", @@ -1868,7 +1803,7 @@ dependencies = [ [[package]] name = "mars-oracle-osmosis" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1880,7 +1815,7 @@ dependencies = [ "mars-red-bank-types", "mars-testing", "mars-utils", - "osmosis-std 0.16.0", + "osmosis-std", "pyth-sdk-cw", "schemars", "serde", @@ -1888,9 +1823,9 @@ dependencies = [ [[package]] name = "mars-oracle-wasm" -version = "1.1.0" +version = "1.2.0" dependencies = [ - "astroport 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-it", @@ -1907,10 +1842,10 @@ dependencies = [ [[package]] name = "mars-osmosis" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-std", - "osmosis-std 0.16.0", + "osmosis-std", "serde", ] @@ -1929,7 +1864,7 @@ dependencies = [ [[package]] name = "mars-red-bank" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1946,7 +1881,7 @@ dependencies = [ [[package]] name = "mars-red-bank-types" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1958,7 +1893,7 @@ dependencies = [ [[package]] name = "mars-rewards-collector-base" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1968,7 +1903,7 @@ dependencies = [ "mars-red-bank-types", "mars-testing", "mars-utils", - "osmosis-std 0.16.0", + "osmosis-std", "schemars", "serde", "thiserror", @@ -1976,7 +1911,7 @@ dependencies = [ [[package]] name = "mars-rewards-collector-neutron" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1988,7 +1923,7 @@ dependencies = [ "mars-testing", "mars-utils", "neutron-sdk", - "osmosis-std 0.16.0", + "osmosis-std", "schemars", "serde", "thiserror", @@ -1996,7 +1931,7 @@ dependencies = [ [[package]] name = "mars-rewards-collector-osmosis" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -2007,7 +1942,7 @@ dependencies = [ "mars-rewards-collector-base", "mars-testing", "mars-utils", - "osmosis-std 0.16.0", + "osmosis-std", "schemars", "serde", "thiserror", @@ -2015,10 +1950,10 @@ dependencies = [ [[package]] name = "mars-swapper-astroport" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", - "astroport 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "astroport", "cosmwasm-schema", "cosmwasm-std", "cw-it", @@ -2032,7 +1967,7 @@ dependencies = [ [[package]] name = "mars-swapper-base" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -2047,17 +1982,17 @@ dependencies = [ [[package]] name = "mars-swapper-mock" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", "cosmwasm-std", - "cw-multi-test 0.16.5", + "cw-multi-test", "mars-red-bank-types", ] [[package]] name = "mars-swapper-osmosis" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -2068,18 +2003,18 @@ dependencies = [ "mars-owner", "mars-red-bank-types", "mars-swapper-base", - "osmosis-std 0.16.0", + "osmosis-std", ] [[package]] name = "mars-testing" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", - "astroport 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "astroport", "cosmwasm-std", "cw-it", - "cw-multi-test 0.16.5", + "cw-multi-test", "mars-address-provider", "mars-incentives", "mars-oracle-osmosis", @@ -2090,14 +2025,14 @@ dependencies = [ "mars-red-bank-types", "mars-rewards-collector-osmosis", "mars-swapper-astroport", - "osmosis-std 0.16.0", + "osmosis-std", "prost 0.11.9", "pyth-sdk-cw", ] [[package]] name = "mars-utils" -version = "1.1.0" +version = "1.2.0" dependencies = [ "cosmwasm-std", "thiserror", @@ -2185,9 +2120,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -2257,28 +2192,13 @@ checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "osmosis-std" -version = "0.15.3" -source = "git+https://github.com/apollodao/osmosis-rust.git?rev=cd3e84201b08d168ee848acbebc85b1da7cab3fa#cd3e84201b08d168ee848acbebc85b1da7cab3fa" -dependencies = [ - "chrono", - "cosmwasm-std", - "osmosis-std-derive 0.15.3", - "prost 0.11.9", - "prost-types", - "schemars", - "serde", - "serde-cw-value", -] - -[[package]] -name = "osmosis-std" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c254b73ab62f7e7a19eb7249cf1443e49999ecc8169bb4535a855b6e87d55498" +checksum = "2fa46d2ad5ae738572887974e000934374ce3546b820505c0ee19ca708e49622" dependencies = [ "chrono", "cosmwasm-std", - "osmosis-std-derive 0.16.0", + "osmosis-std-derive", "prost 0.11.9", "prost-types", "schemars", @@ -2288,20 +2208,9 @@ dependencies = [ [[package]] name = "osmosis-std-derive" -version = "0.15.3" -source = "git+https://github.com/apollodao/osmosis-rust.git?rev=cd3e84201b08d168ee848acbebc85b1da7cab3fa#cd3e84201b08d168ee848acbebc85b1da7cab3fa" -dependencies = [ - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "osmosis-std-derive" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a6feeb2c5de684262032a6719ff58cfecfdffa5f31eba1835faa857ac3a762" +checksum = "11c2ba5535743617d6f44ae8d572d064fabab6d06ffcf403512f89c58954dbe9" dependencies = [ "itertools", "proc-macro2", @@ -2312,44 +2221,27 @@ dependencies = [ [[package]] name = "osmosis-test-tube" -version = "15.1.0" -source = "git+https://github.com/apollodao/test-tube.git?rev=800a2af15bdd8270a4d832a2b1b799446fc8e1cf#800a2af15bdd8270a4d832a2b1b799446fc8e1cf" -dependencies = [ - "base64 0.13.1", - "bindgen", - "cosmrs", - "cosmwasm-std", - "osmosis-std 0.16.0", - "prost 0.11.9", - "serde", - "serde_json", - "test-tube 0.1.2", - "thiserror", -] - -[[package]] -name = "osmosis-test-tube" -version = "16.0.0" +version = "16.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4988b1215f3fffdb1af5ae4930ed97e0be2d61221fc27dff7b89973670cbb50" +checksum = "527375c01396e7e4de4ccc18a0141aeb6b342dc089d30c57282025f3a8753e72" dependencies = [ "base64 0.13.1", "bindgen", "cosmrs", "cosmwasm-std", - "osmosis-std 0.16.0", + "osmosis-std", "prost 0.11.9", "serde", "serde_json", - "test-tube 0.1.4", + "test-tube", "thiserror", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pathdiff" @@ -2407,9 +2299,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" +checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" dependencies = [ "thiserror", "ucd-trie", @@ -2417,9 +2309,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b" +checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3" dependencies = [ "pest", "pest_generator", @@ -2427,22 +2319,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190" +checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] name = "pest_meta" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0" +checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341" dependencies = [ "once_cell", "pest", @@ -2466,7 +2358,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -2532,9 +2424,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2546,7 +2438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -2677,9 +2569,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -2735,7 +2627,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2747,18 +2639,18 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] name = "regex-automata" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] @@ -2769,9 +2661,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rfc6979" @@ -2826,7 +2718,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -2854,13 +2746,12 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -2893,9 +2784,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -2911,9 +2802,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -2983,11 +2874,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2996,9 +2887,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3006,15 +2897,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] @@ -3048,22 +2939,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -3079,9 +2970,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -3090,13 +2981,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -3278,9 +3169,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.25" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -3289,11 +3180,10 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", @@ -3461,28 +3351,14 @@ dependencies = [ [[package]] name = "test-tube" -version = "0.1.2" -source = "git+https://github.com/apollodao/test-tube.git?rev=800a2af15bdd8270a4d832a2b1b799446fc8e1cf#800a2af15bdd8270a4d832a2b1b799446fc8e1cf" -dependencies = [ - "base64 0.13.1", - "cosmrs", - "cosmwasm-std", - "osmosis-std 0.16.0", - "prost 0.11.9", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "test-tube" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2152b79646afbca662896e917b94fb839af6939eb592b7af9cd5dcb1cd42f99e" +checksum = "a520f35c8ca6665ea5231a81ce9110f49a6901a1cbedb751e72859e83320bfea" dependencies = [ "base64 0.13.1", "cosmrs", "cosmwasm-std", + "osmosis-std", "prost 0.11.9", "serde", "serde_json", @@ -3497,22 +3373,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -3573,7 +3449,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] [[package]] @@ -3680,9 +3556,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -3777,7 +3653,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", "wasm-bindgen-shared", ] @@ -3799,7 +3675,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3973,5 +3849,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.27", ] diff --git a/Cargo.toml b/Cargo.toml index eac520c78..27ce7fde4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ resolver = "2" [workspace.package] -version = "1.1.0" +version = "1.2.0" authors = [ "Gabe R. ", "Larry Engineer ", @@ -46,7 +46,7 @@ cw2 = "1.1.0" cw-storage-plus = "1.0.1" cw-utils = "1.0.1" mars-owner = { version = "1.2.0", features = ["emergency-owner"] } -osmosis-std = "0.16.0" +osmosis-std = "0.16.1" prost = { version = "0.11.5", default-features = false, features = ["prost-derive"] } schemars = "0.8.12" serde = { version = "1.0.163", default-features = false, features = ["derive"] } @@ -59,30 +59,30 @@ neutron-sdk = "0.6.0" # dev-dependencies cw-multi-test = "0.16.5" -cw-it = { git = "https://github.com/apollodao/cw-it.git", rev = "af23474183cc56746a0b9785328a0009427caa9a" } +cw-it = "0.1.0" osmosis-test-tube = "16.0.0" test-case = "3.0.0" proptest = "1.1.0" # packages -mars-health = { version = "1.0.0", path = "./packages/health" } -mars-osmosis = { version = "1.0.0", path = "./packages/chains/osmosis" } -mars-red-bank-types = { version = "1.0.0", path = "./packages/types" } -mars-testing = { version = "1.0.0", path = "./packages/testing" } -mars-utils = { version = "1.0.0", path = "./packages/utils" } +mars-health = { path = "./packages/health" } +mars-osmosis = { path = "./packages/chains/osmosis" } +mars-red-bank-types = { path = "./packages/types" } +mars-testing = { path = "./packages/testing" } +mars-utils = { path = "./packages/utils" } # contracts -mars-address-provider = { version = "1.0.0", path = "./contracts/address-provider" } -mars-incentives = { version = "1.0.0", path = "./contracts/incentives" } -mars-oracle-base = { version = "1.0.0", path = "./contracts/oracle/base" } -mars-oracle-osmosis = { version = "1.0.0", path = "./contracts/oracle/osmosis" } -mars-oracle-wasm = { version = "1.0.0", path = "./contracts/oracle/wasm" } -mars-red-bank = { version = "1.0.0", path = "./contracts/red-bank" } -mars-rewards-collector-base = { version = "1.0.0", path = "./contracts/rewards-collector/base" } -mars-rewards-collector-osmosis = { version = "1.0.0", path = "./contracts/rewards-collector/osmosis" } -mars-swapper-base = { version = "1.0.0", path = "./contracts/swapper/base" } -mars-swapper-astroport = { version = "1.0.0", path = "./contracts/swapper/astroport" } -mars-swapper-osmosis = { version = "1.0.0", path = "./contracts/swapper/osmosis" } +mars-address-provider = { path = "./contracts/address-provider" } +mars-incentives = { path = "./contracts/incentives" } +mars-oracle-base = { path = "./contracts/oracle/base" } +mars-oracle-osmosis = { path = "./contracts/oracle/osmosis" } +mars-oracle-wasm = { path = "./contracts/oracle/wasm" } +mars-red-bank = { path = "./contracts/red-bank" } +mars-rewards-collector-base = { path = "./contracts/rewards-collector/base" } +mars-rewards-collector-osmosis = { path = "./contracts/rewards-collector/osmosis" } +mars-swapper-base = { path = "./contracts/swapper/base" } +mars-swapper-astroport = { path = "./contracts/swapper/astroport" } +mars-swapper-osmosis = { path = "./contracts/swapper/osmosis" } [profile.release] codegen-units = 1 diff --git a/contracts/oracle/osmosis/src/migrations.rs b/contracts/oracle/osmosis/src/migrations.rs index 67ecd6176..a10f865b3 100644 --- a/contracts/oracle/osmosis/src/migrations.rs +++ b/contracts/oracle/osmosis/src/migrations.rs @@ -101,7 +101,7 @@ pub mod v1_0_1 { vec![ attr("action", "migrate"), attr("from_version", "1.0.1"), - attr("to_version", "1.1.0") + attr("to_version", "1.2.0") ] ); @@ -131,7 +131,7 @@ pub mod v1_0_1 { vec![ attr("action", "migrate"), attr("from_version", "1.0.1"), - attr("to_version", "1.1.0") + attr("to_version", "1.2.0") ] ); diff --git a/schemas/mars-address-provider/mars-address-provider.json b/schemas/mars-address-provider/mars-address-provider.json index a0c593c9d..5ea2304a6 100644 --- a/schemas/mars-address-provider/mars-address-provider.json +++ b/schemas/mars-address-provider/mars-address-provider.json @@ -1,6 +1,6 @@ { "contract_name": "mars-address-provider", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-incentives/mars-incentives.json b/schemas/mars-incentives/mars-incentives.json index 7bbb22178..7ef20e6f0 100644 --- a/schemas/mars-incentives/mars-incentives.json +++ b/schemas/mars-incentives/mars-incentives.json @@ -1,6 +1,6 @@ { "contract_name": "mars-incentives", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json b/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json index b6e331d9c..d221cbbc0 100644 --- a/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json +++ b/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json @@ -1,6 +1,6 @@ { "contract_name": "mars-oracle-osmosis", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-oracle-wasm/mars-oracle-wasm.json b/schemas/mars-oracle-wasm/mars-oracle-wasm.json index 6ccbd3a76..fb7bfaf98 100644 --- a/schemas/mars-oracle-wasm/mars-oracle-wasm.json +++ b/schemas/mars-oracle-wasm/mars-oracle-wasm.json @@ -1,6 +1,6 @@ { "contract_name": "mars-oracle-wasm", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-red-bank/mars-red-bank.json b/schemas/mars-red-bank/mars-red-bank.json index d961e6207..5f07b26ca 100644 --- a/schemas/mars-red-bank/mars-red-bank.json +++ b/schemas/mars-red-bank/mars-red-bank.json @@ -1,6 +1,6 @@ { "contract_name": "mars-red-bank", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-rewards-collector-base/mars-rewards-collector-base.json b/schemas/mars-rewards-collector-base/mars-rewards-collector-base.json index 8d5f29cf4..2be4ffe4f 100644 --- a/schemas/mars-rewards-collector-base/mars-rewards-collector-base.json +++ b/schemas/mars-rewards-collector-base/mars-rewards-collector-base.json @@ -1,6 +1,6 @@ { "contract_name": "mars-rewards-collector-base", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-swapper-astroport/mars-swapper-astroport.json b/schemas/mars-swapper-astroport/mars-swapper-astroport.json index 76e63bb85..93ef8f7c2 100644 --- a/schemas/mars-swapper-astroport/mars-swapper-astroport.json +++ b/schemas/mars-swapper-astroport/mars-swapper-astroport.json @@ -1,6 +1,6 @@ { "contract_name": "mars-swapper-astroport", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/schemas/mars-swapper-osmosis/mars-swapper-osmosis.json b/schemas/mars-swapper-osmosis/mars-swapper-osmosis.json index 8e270e411..5fd1ac9ee 100644 --- a/schemas/mars-swapper-osmosis/mars-swapper-osmosis.json +++ b/schemas/mars-swapper-osmosis/mars-swapper-osmosis.json @@ -1,6 +1,6 @@ { "contract_name": "mars-swapper-osmosis", - "contract_version": "1.1.0", + "contract_version": "1.2.0", "idl_version": "1.0.0", "instantiate": { "$schema": "http://json-schema.org/draft-07/schema#",