diff --git a/Cargo.lock b/Cargo.lock index 0548f383..6dfeeae3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,8 +33,8 @@ dependencies = [ [[package]] name = "astroport" -version = "2.5.0" -source = "git+https://github.com/astroport-fi/astroport-core.git?branch=main#65ce7d1879cc5d95b09fa14202f0423bba52ae0e" +version = "2.7.1" +source = "git+https://github.com/astroport-fi/astroport-core.git?branch=main#c73a2db3c0b4f069e906d90970e1b72a5cf71bbf" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -129,7 +129,7 @@ dependencies = [ name = "astroport-periphery" version = "1.1.0" dependencies = [ - "astroport 2.5.0", + "astroport 2.7.1", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 0.15.1", @@ -272,7 +272,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4776e787b24d9568dd61d3237eeb4eb321d622fb881b858c7b82806420e87d4" dependencies = [ - "prost 0.11.8", + "prost 0.11.9", "prost-types", "tendermint-proto", ] @@ -337,7 +337,7 @@ dependencies = [ "hex", "schemars", "serde", - "serde-json-wasm 0.5.0", + "serde-json-wasm 0.5.1", "sha2 0.10.6", "thiserror", "uint", @@ -482,9 +482,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "0.16.2" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2eb84554bbfa6b66736abcd6a9bfdf237ee0ecb83910f746dff7f799093c80a" +checksum = "2a18afd2e201221c6d72a57f0886ef2a22151bbc9e6db7af276fde8a91081042" dependencies = [ "anyhow", "cosmwasm-std", @@ -752,7 +752,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "credits", - "cw-multi-test 0.16.2", + "cw-multi-test 0.16.4", "cw-storage-plus 1.0.1", "cw-utils 1.0.1", "cw2 1.0.1", @@ -946,9 +946,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -963,7 +963,7 @@ checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" dependencies = [ "proc-macro2", "quote 1.0.26", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -1152,12 +1152,12 @@ dependencies = [ name = "neutron-auction" version = "1.0.0" dependencies = [ - "astroport 2.5.0", + "astroport 2.7.1", "astroport-periphery", "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", - "cw-multi-test 0.16.2", + "cw-multi-test 0.16.4", "cw-storage-plus 1.0.1", "cw2 1.0.1", "cw20 1.0.1", @@ -1169,7 +1169,7 @@ dependencies = [ name = "neutron-lockdrop" version = "1.2.0" dependencies = [ - "astroport 2.5.0", + "astroport 2.7.1", "astroport-periphery", "cosmwasm-schema", "cosmwasm-std", @@ -1195,13 +1195,13 @@ dependencies = [ "cosmwasm-std", "cosmwasm-storage", "cw-band", - "cw-multi-test 0.16.2", + "cw-multi-test 0.16.4", "cw-storage-plus 1.0.1", "cw2 1.0.1", "neutron-sdk", "obi", "owasm-kit", - "prost 0.11.8", + "prost 0.11.9", "prost-types", "protobuf 3.2.0", "schemars", @@ -1223,7 +1223,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 1.0.1", - "prost 0.11.8", + "prost 0.11.9", "protobuf 3.2.0", "schemars", "serde", @@ -1446,9 +1446,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -1486,12 +1486,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.11.8", + "prost-derive 0.11.9", ] [[package]] @@ -1509,9 +1509,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", @@ -1522,11 +1522,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost 0.11.8", + "prost 0.11.9", ] [[package]] @@ -1803,9 +1803,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -1821,9 +1821,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15bee9b04dd165c3f4e142628982ddde884c2022a89e8ddf99c4829bf2c3a58" +checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137" dependencies = [ "serde", ] @@ -1839,13 +1839,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote 1.0.26", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -1861,9 +1861,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -2002,9 +2002,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote 1.0.26", @@ -2034,7 +2034,7 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.8", + "prost 0.11.9", "prost-types", "serde", "serde_bytes", @@ -2073,7 +2073,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote 1.0.26", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -2191,7 +2191,7 @@ dependencies = [ ] [[package]] -name = "vesting-managed" +name = "vesting-lti" version = "1.1.0" dependencies = [ "astroport 2.0.0", diff --git a/Cargo.toml b/Cargo.toml index b72f8d06..deb613e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["contracts/auction", "contracts/lockdrop", "contracts/credits", "contracts/vesting-lp", "contracts/vesting-managed", "contracts/vesting-investors", "contracts/cw20-merkle-airdrop", "contracts/price-feed", "contracts/astroport/*"] +members = ["contracts/auction", "contracts/lockdrop", "contracts/credits", "contracts/vesting-lp", "contracts/vesting-lti", "contracts/vesting-investors", "contracts/cw20-merkle-airdrop", "contracts/price-feed", "contracts/astroport/*"] [profile.release] rpath = false diff --git a/contracts/vesting-managed/.cargo/config b/contracts/vesting-lti/.cargo/config similarity index 100% rename from contracts/vesting-managed/.cargo/config rename to contracts/vesting-lti/.cargo/config diff --git a/contracts/vesting-managed/Cargo.toml b/contracts/vesting-lti/Cargo.toml similarity index 96% rename from contracts/vesting-managed/Cargo.toml rename to contracts/vesting-lti/Cargo.toml index 0c0cf702..b510f172 100644 --- a/contracts/vesting-managed/Cargo.toml +++ b/contracts/vesting-lti/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "vesting-managed" +name = "vesting-lti" version = "1.1.0" authors = ["andrei.z@p2p.org"] edition = "2021" diff --git a/contracts/vesting-managed/examples/vesting_schema.rs b/contracts/vesting-lti/examples/vesting_schema.rs similarity index 85% rename from contracts/vesting-managed/examples/vesting_schema.rs rename to contracts/vesting-lti/examples/vesting_schema.rs index 81c1e522..75ca4687 100644 --- a/contracts/vesting-managed/examples/vesting_schema.rs +++ b/contracts/vesting-lti/examples/vesting_schema.rs @@ -1,6 +1,6 @@ use cosmwasm_schema::write_api; use vesting_base::msg::{ExecuteMsg, MigrateMsg, QueryMsg}; -use vesting_managed::msg::InstantiateMsg; +use vesting_lti::msg::InstantiateMsg; fn main() { write_api! { diff --git a/contracts/vesting-managed/schema/raw/execute.json b/contracts/vesting-lti/schema/raw/execute.json similarity index 100% rename from contracts/vesting-managed/schema/raw/execute.json rename to contracts/vesting-lti/schema/raw/execute.json diff --git a/contracts/vesting-managed/schema/raw/instantiate.json b/contracts/vesting-lti/schema/raw/instantiate.json similarity index 100% rename from contracts/vesting-managed/schema/raw/instantiate.json rename to contracts/vesting-lti/schema/raw/instantiate.json diff --git a/contracts/vesting-managed/schema/raw/migrate.json b/contracts/vesting-lti/schema/raw/migrate.json similarity index 100% rename from contracts/vesting-managed/schema/raw/migrate.json rename to contracts/vesting-lti/schema/raw/migrate.json diff --git a/contracts/vesting-managed/schema/raw/query.json b/contracts/vesting-lti/schema/raw/query.json similarity index 100% rename from contracts/vesting-managed/schema/raw/query.json rename to contracts/vesting-lti/schema/raw/query.json diff --git a/contracts/vesting-managed/schema/raw/response_to_available_amount.json b/contracts/vesting-lti/schema/raw/response_to_available_amount.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_available_amount.json rename to contracts/vesting-lti/schema/raw/response_to_available_amount.json diff --git a/contracts/vesting-managed/schema/raw/response_to_config.json b/contracts/vesting-lti/schema/raw/response_to_config.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_config.json rename to contracts/vesting-lti/schema/raw/response_to_config.json diff --git a/contracts/vesting-managed/schema/raw/response_to_historical_extension.json b/contracts/vesting-lti/schema/raw/response_to_historical_extension.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_historical_extension.json rename to contracts/vesting-lti/schema/raw/response_to_historical_extension.json diff --git a/contracts/vesting-managed/schema/raw/response_to_managed_extension.json b/contracts/vesting-lti/schema/raw/response_to_managed_extension.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_managed_extension.json rename to contracts/vesting-lti/schema/raw/response_to_managed_extension.json diff --git a/contracts/vesting-managed/schema/raw/response_to_timestamp.json b/contracts/vesting-lti/schema/raw/response_to_timestamp.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_timestamp.json rename to contracts/vesting-lti/schema/raw/response_to_timestamp.json diff --git a/contracts/vesting-managed/schema/raw/response_to_vesting_account.json b/contracts/vesting-lti/schema/raw/response_to_vesting_account.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_vesting_account.json rename to contracts/vesting-lti/schema/raw/response_to_vesting_account.json diff --git a/contracts/vesting-managed/schema/raw/response_to_vesting_accounts.json b/contracts/vesting-lti/schema/raw/response_to_vesting_accounts.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_vesting_accounts.json rename to contracts/vesting-lti/schema/raw/response_to_vesting_accounts.json diff --git a/contracts/vesting-managed/schema/raw/response_to_vesting_state.json b/contracts/vesting-lti/schema/raw/response_to_vesting_state.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_vesting_state.json rename to contracts/vesting-lti/schema/raw/response_to_vesting_state.json diff --git a/contracts/vesting-managed/schema/raw/response_to_with_managers_extension.json b/contracts/vesting-lti/schema/raw/response_to_with_managers_extension.json similarity index 100% rename from contracts/vesting-managed/schema/raw/response_to_with_managers_extension.json rename to contracts/vesting-lti/schema/raw/response_to_with_managers_extension.json diff --git a/contracts/vesting-managed/schema/vesting-managed.json b/contracts/vesting-lti/schema/vesting-lti.json similarity index 99% rename from contracts/vesting-managed/schema/vesting-managed.json rename to contracts/vesting-lti/schema/vesting-lti.json index 80b5216f..2f9969f2 100644 --- a/contracts/vesting-managed/schema/vesting-managed.json +++ b/contracts/vesting-lti/schema/vesting-lti.json @@ -1,5 +1,5 @@ { - "contract_name": "vesting-managed", + "contract_name": "vesting-lti", "contract_version": "1.1.0", "idl_version": "1.0.0", "instantiate": { diff --git a/contracts/vesting-managed/src/contract.rs b/contracts/vesting-lti/src/contract.rs similarity index 100% rename from contracts/vesting-managed/src/contract.rs rename to contracts/vesting-lti/src/contract.rs diff --git a/contracts/vesting-managed/src/lib.rs b/contracts/vesting-lti/src/lib.rs similarity index 100% rename from contracts/vesting-managed/src/lib.rs rename to contracts/vesting-lti/src/lib.rs diff --git a/contracts/vesting-managed/src/msg.rs b/contracts/vesting-lti/src/msg.rs similarity index 100% rename from contracts/vesting-managed/src/msg.rs rename to contracts/vesting-lti/src/msg.rs diff --git a/contracts/vesting-managed/src/tests/integration.rs b/contracts/vesting-lti/src/tests/integration.rs similarity index 100% rename from contracts/vesting-managed/src/tests/integration.rs rename to contracts/vesting-lti/src/tests/integration.rs diff --git a/contracts/vesting-managed/src/tests/mod.rs b/contracts/vesting-lti/src/tests/mod.rs similarity index 100% rename from contracts/vesting-managed/src/tests/mod.rs rename to contracts/vesting-lti/src/tests/mod.rs