diff --git a/Cargo.lock b/Cargo.lock index 71a5120dd..a790a73d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -41,18 +41,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arrayvec" @@ -85,18 +85,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] @@ -118,13 +118,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", + "bitflags", "bytes", "futures-util", "http", @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -188,41 +188,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "base64" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" - [[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bindgen" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap", - "env_logger 0.9.3", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bip32" version = "0.4.0" @@ -247,12 +218,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - [[package]] name = "bitvec" version = "1.0.1" @@ -283,12 +248,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bnum" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "845141a4fade3f790628b7daaaa298a25b204fb28907eb54febe5142db6ce653" - [[package]] name = "bootstrap-env" version = "0.2.0" @@ -297,8 +256,8 @@ dependencies = [ "cosm-orc", "cosmwasm-std", "cw-admin-factory", - "cw-utils 1.0.1", - "cw20 1.1.0", + "cw-utils 0.16.0", + "cw20 0.16.0", "cw20-stake 2.2.0", "dao-dao-core", "dao-interface", @@ -306,7 +265,7 @@ dependencies = [ "dao-proposal-single", "dao-voting 2.2.0", "dao-voting-cw20-staked", - "env_logger 0.10.0", + "env_logger", "serde", "serde_json", "serde_yaml", @@ -411,21 +370,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -433,50 +380,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "config" version = "0.13.3" @@ -498,9 +401,18 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "core-foundation" @@ -541,24 +453,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "596064e3608349aa302eb68b2df8ed3a66bbb51d9b470dbd9afff70843e44642" dependencies = [ "async-trait", - "cosmrs 0.10.0", + "cosmrs", "regex", "schemars", "serde", "serde_json", "thiserror", - "tonic 0.8.3", -] - -[[package]] -name = "cosmos-sdk-proto" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b42021d8488665b1a0d9748f1f81df7235362d194f44481e2e61bf376b77b4" -dependencies = [ - "prost 0.11.9", - "prost-types", - "tendermint-proto 0.23.9", + "tonic", ] [[package]] @@ -570,40 +471,19 @@ dependencies = [ "prost 0.11.9", "prost-types", "tendermint-proto 0.26.0", - "tonic 0.8.3", + "tonic", ] [[package]] name = "cosmos-sdk-proto" -version = "0.19.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c9d2043a9e617b0d602fbc0a0ecd621568edbf3a9774890a6d562389bd8e1c" +checksum = "c4776e787b24d9568dd61d3237eeb4eb321d622fb881b858c7b82806420e87d4" dependencies = [ "prost 0.11.9", "prost-types", - "tendermint-proto 0.32.2", - "tonic 0.9.2", -] - -[[package]] -name = "cosmrs" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3903590099dcf1ea580d9353034c9ba1dbf55d1389a5bd2ade98535c3445d1f9" -dependencies = [ - "bip32", - "cosmos-sdk-proto 0.14.0", - "ecdsa", - "eyre", - "getrandom", - "k256", - "rand_core 0.6.4", - "serde", - "serde_json", - "subtle-encoding", - "tendermint 0.23.9", - "tendermint-rpc 0.23.9", - "thiserror", + "tendermint-proto 0.27.0", + "tonic", ] [[package]] @@ -622,16 +502,16 @@ dependencies = [ "serde", "serde_json", "subtle-encoding", - "tendermint 0.26.0", - "tendermint-rpc 0.26.0", + "tendermint", + "tendermint-rpc", "thiserror", ] [[package]] name = "cosmwasm-crypto" -version = "1.3.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871ce1d5a4b00ed1741f84b377eec19fadd81a904a227bc1e268d76539d26f5e" +checksum = "bb64554a91d6a9231127f4355d351130a0b94e663d5d9dc8b3a54ca17d83de49" dependencies = [ "digest 0.10.7", "ed25519-zebra", @@ -642,18 +522,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.3.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce8b44b45a7c8c6d6f770cd0a51458c2445c7c15b6115e1d215fa35c77b305c" +checksum = "a0fb2ce09f41a3dae1a234d56a9988f9aff4c76441cd50ef1ee9a4f20415b028" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.3.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99222fa0401ee36389550d8a065700380877a2299c3043d24c38d705708c9d9d" +checksum = "230e5d1cefae5331db8934763c81b9c871db6a2cd899056a5694fa71d292c815" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -664,9 +544,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.3.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b74eaf9e585ef8e5e3486b240b13ee593cb0f658b5879696937d8c22243d4fb" +checksum = "43dadf7c23406cb28079d69e6cb922c9c29b9157b0fe887e3b79c783b7d4bcb8" dependencies = [ "proc-macro2", "quote", @@ -675,12 +555,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.3.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78abcf059181e8cb01e95e5003cf64fe95dde6c72b3fe37e5cabc75cdba32a" +checksum = "4337eef8dfaf8572fe6b6b415d6ec25f9308c7bb09f2da63789209fb131363be" dependencies = [ - "base64 0.13.1", - "bnum", + "base64", "cosmwasm-crypto", "cosmwasm-derive", "derivative", @@ -691,13 +570,14 @@ dependencies = [ "serde-json-wasm", "sha2 0.10.7", "thiserror", + "uint", ] [[package]] name = "cosmwasm-storage" -version = "1.3.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52be0d56b78f502f3acb75e40908a0d04d9f265b6beb0f86b36ec2ece048748" +checksum = "e8601d284db8776e39fe99b3416516c5636ca73cef14666b7bb9648ca32c4b89" dependencies = [ "cosmwasm-std", "serde", @@ -712,6 +592,12 @@ dependencies = [ "libc", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-bigint" version = "0.4.9" @@ -760,19 +646,24 @@ dependencies = [ name = "cw-abc" version = "0.0.1" dependencies = [ + "anyhow", "cosmwasm-schema", "cosmwasm-std", + "cw-abc", "cw-address-like", + "cw-orch", "cw-ownable", + "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "getrandom", "integer-cbrt", "integer-sqrt", "rust_decimal", "speculoos", "thiserror", - "token-bindings 0.9.0", + "token-bindings", ] [[package]] @@ -793,9 +684,9 @@ dependencies = [ "cosmwasm-storage", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20-base 0.16.0", "dao-dao-core", "dao-interface", "thiserror", @@ -831,14 +722,14 @@ dependencies = [ [[package]] name = "cw-controllers" -version = "1.1.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8edce4b78785f36413f67387e4be7d0cb7d032b5d4164bcc024f9c3f3f2ea" +checksum = "24bd6738c3fd59c87d2f84911c1cad1e4f2d1c58ecaa6e52549b4f78f4ed6f07" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", "schemars", "serde", "thiserror", @@ -918,8 +809,8 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "thiserror", ] @@ -932,10 +823,10 @@ dependencies = [ "cw-multi-test", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", "dao-dao-core", "dao-interface", @@ -956,14 +847,15 @@ dependencies = [ [[package]] name = "cw-multi-test" version = "0.16.5" -source = "git+https://github.com/JakeHartnell/cw-multi-test.git?branch=bank-supply-support#8c618c8dcc014dacf2cc10627805b36bbc0bfc6e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "127c7bb95853b8e828bdab97065c81cb5ddc20f7339180b61b2300565aaa99d1" dependencies = [ "anyhow", "cosmwasm-std", "cw-storage-plus 1.1.0", "cw-utils 1.0.1", "derivative", - "itertools 0.10.5", + "itertools", "k256", "prost 0.9.0", "schemars", @@ -971,6 +863,46 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cw-orch" +version = "0.13.3" +source = "git+https://github.com/AbstractSDK/cw-orchestrator?branch=main#e30d672a4a5f4b307a522b0aa9e428562b6d17ea" +dependencies = [ + "anyhow", + "cosmwasm-std", + "cw-multi-test", + "cw-orch-contract-derive", + "cw-orch-fns-derive", + "log", + "schemars", + "serde", + "serde_json", + "sha256", + "thiserror", +] + +[[package]] +name = "cw-orch-contract-derive" +version = "0.13.3" +source = "git+https://github.com/AbstractSDK/cw-orchestrator?branch=main#e30d672a4a5f4b307a522b0aa9e428562b6d17ea" +dependencies = [ + "convert_case", + "log", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cw-orch-fns-derive" +version = "0.13.3" +source = "git+https://github.com/AbstractSDK/cw-orchestrator?branch=main#e30d672a4a5f4b307a522b0aa9e428562b6d17ea" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "cw-ownable" version = "0.5.1" @@ -1030,11 +962,11 @@ dependencies = [ "cw-multi-test", "cw-ownable", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", + "cw-utils 0.16.0", "cw-vesting", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "thiserror", "wynd-utils", ] @@ -1125,31 +1057,11 @@ dependencies = [ "cosmwasm-std", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", - "thiserror", -] - -[[package]] -name = "cw-tokenfactory-issuer" -version = "2.2.0" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cosmwasm-storage", - "cw-multi-test", - "cw-storage-plus 1.1.0", - "cw2 1.1.0", - "osmosis-std 0.16.2", - "osmosis-test-tube", - "prost 0.11.9", - "schemars", - "serde", - "serde_json", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "thiserror", - "token-bindings 0.11.0 (git+https://github.com/CosmosContracts/token-bindings.git?rev=0cd084b68172ffc9af29eb37fb915392ce351954)", ] [[package]] @@ -1219,11 +1131,11 @@ dependencies = [ "cw-paginate-storage 2.2.0", "cw-stake-tracker", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", + "cw-utils 0.16.0", "cw-wormhole", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "dao-testing", "serde", "thiserror", @@ -1317,13 +1229,13 @@ dependencies = [ [[package]] name = "cw20" -version = "1.1.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011c45920f8200bd5d32d4fe52502506f64f2f75651ab408054d4cfc75ca3a9b" +checksum = "a45a8794a5dd33b66af34caee52a7beceb690856adcc1682b6e3db88b2cdee62" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 1.0.1", + "cw-utils 0.16.0", "schemars", "serde", ] @@ -1362,16 +1274,16 @@ dependencies = [ [[package]] name = "cw20-base" -version = "1.1.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3ad456059901a36cfa68b596d85d579c3df2b797dae9950dc34c27e14e995f" +checksum = "61d826fa1084d026d0abdb54faa5956972efa3a9053473bfcefb5388960aab69" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", "schemars", "semver", "serde", @@ -1405,16 +1317,16 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", - "cw-controllers 1.1.0", + "cw-controllers 0.16.0", "cw-multi-test", "cw-ownable", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", "cw-utils 0.13.4", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 0.2.6", "thiserror", ] @@ -1427,15 +1339,15 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", - "cw-controllers 1.1.0", + "cw-controllers 0.16.0", "cw-multi-test", "cw-ownable", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "cw20 0.13.4", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", "stake-cw20-external-rewards", "thiserror", @@ -1450,10 +1362,10 @@ dependencies = [ "cw-multi-test", "cw-ownable", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", "stake-cw20-reward-distributor", "thiserror", @@ -1494,17 +1406,15 @@ dependencies = [ [[package]] name = "cw3" -version = "1.1.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171af3d9127de6805a7dd819fb070c7d2f6c3ea85f4193f42cef259f0a7f33d5" +checksum = "4054911cd88826fc7472851d4e799e6ca7246925cf318d6acd21a102486be30c" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 1.0.1", - "cw20 1.1.0", + "cw-utils 0.16.0", "schemars", "serde", - "thiserror", ] [[package]] @@ -1521,13 +1431,13 @@ dependencies = [ [[package]] name = "cw4" -version = "1.1.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a398696307efadaaa2d0850076f865fa706c959d493cb4203314f72be6b77a64" +checksum = "86a93c2764ddb44038b948d9a9a8aadc9f92f5ef3e61249af2fad16091e43412" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 1.1.0", + "cw-storage-plus 0.16.0", "schemars", "serde", ] @@ -1551,17 +1461,17 @@ dependencies = [ [[package]] name = "cw4-group" -version = "1.1.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58db332c4039bec8ade6aaa1f5fff24b94b111f21134db172cd27fb2e7f0ceb6" +checksum = "dba1d15bff40b97bde05f36a0d44ac3369a085a4bda6c4673e33a9359513fdd2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-controllers 1.1.0", - "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw4 1.1.0", + "cw-controllers 0.16.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", "schemars", "serde", "thiserror", @@ -1613,9 +1523,9 @@ dependencies = [ [[package]] name = "cw721" -version = "0.18.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c4d286625ccadc957fe480dd3bdc54ada19e0e6b5b9325379db3130569e914" +checksum = "aa49f5096cc1587489ac5d1d345936e8139738f40ad07a94c7b157b19f975c00" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1643,9 +1553,9 @@ dependencies = [ [[package]] name = "cw721-base" -version = "0.18.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da518d9f68bfda7d972cbaca2e8fcf04651d0edc3de72b04ae2bcd9289c81614" +checksum = "72c2be7476fa786c3adc96b00e33a0c5917d2a84774d94c5dd76e987c315570f" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1653,7 +1563,7 @@ dependencies = [ "cw-storage-plus 1.1.0", "cw-utils 1.0.1", "cw2 1.1.0", - "cw721 0.18.0", + "cw721 0.17.0", "cw721-base 0.16.0", "schemars", "serde", @@ -1667,7 +1577,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", + "cw-utils 0.16.0", "thiserror", ] @@ -1677,15 +1587,15 @@ version = "2.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-controllers 1.1.0", + "cw-controllers 0.16.0", "cw-multi-test", "cw-ownable", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw4 1.1.0", - "cw721 0.18.0", - "cw721-base 0.18.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", + "cw721 0.17.0", + "cw721-base 0.17.0", "dao-cw721-extensions", "dao-testing", "dao-voting-cw721-staked", @@ -1699,8 +1609,8 @@ version = "2.2.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-controllers 1.1.0", - "cw4 1.1.0", + "cw-controllers 0.16.0", + "cw4 0.16.0", ] [[package]] @@ -1713,12 +1623,12 @@ dependencies = [ "cw-multi-test", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", - "cw721 0.18.0", - "cw721-base 0.18.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", + "cw721 0.17.0", + "cw721-base 0.17.0", "dao-dao-macros", "dao-interface", "dao-proposal-sudo", @@ -1747,10 +1657,10 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-hooks", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw721 0.18.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw721 0.17.0", ] [[package]] @@ -1766,11 +1676,11 @@ dependencies = [ "cw-proposal-single", "cw-storage-plus 1.1.0", "cw-utils 0.13.4", - "cw-utils 1.0.1", - "cw2 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "cw20 0.13.4", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 0.2.6", "cw20-stake 2.2.0", "cw20-staked-balance-voting", @@ -1797,11 +1707,11 @@ dependencies = [ "cw-multi-test", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", - "cw4-group 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", + "cw4-group 0.16.0", "dao-dao-core", "dao-interface", "dao-pre-propose-base", @@ -1823,11 +1733,11 @@ dependencies = [ "cw-denom", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", - "cw4-group 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", + "cw4-group 0.16.0", "dao-dao-core", "dao-interface", "dao-pre-propose-approval-single", @@ -1850,8 +1760,8 @@ dependencies = [ "cw-hooks", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "dao-interface", "dao-proposal-hooks", "dao-voting 2.2.0", @@ -1867,12 +1777,12 @@ dependencies = [ "cosmwasm-std", "cw-denom", "cw-multi-test", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", - "cw4-group 1.1.0", - "dao-dao-core", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", + "cw4-group 0.16.0", + "dao-dao-core", "dao-interface", "dao-pre-propose-base", "dao-proposal-hooks", @@ -1892,11 +1802,11 @@ dependencies = [ "cw-denom", "cw-hooks", "cw-multi-test", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", - "cw4-group 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", + "cw4-group 0.16.0", "dao-dao-core", "dao-interface", "dao-pre-propose-base", @@ -1917,10 +1827,10 @@ dependencies = [ "cosmwasm-std", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw4 1.1.0", - "cw4-group 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", + "cw4-group 0.16.0", "dao-dao-core", "dao-dao-macros", "dao-interface", @@ -1939,10 +1849,10 @@ dependencies = [ "cw-hooks", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "dao-dao-core", "dao-interface", "dao-proposal-hooks", @@ -1974,15 +1884,15 @@ dependencies = [ "cw-hooks", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", - "cw3 1.1.0", - "cw4 1.1.0", - "cw4-group 1.1.0", - "cw721-base 0.18.0", + "cw3 0.16.0", + "cw4 0.16.0", + "cw4-group 0.16.0", + "cw721-base 0.17.0", "dao-dao-macros", "dao-interface", "dao-pre-propose-base", @@ -2015,15 +1925,15 @@ dependencies = [ "cw-proposal-single", "cw-storage-plus 1.1.0", "cw-utils 0.13.4", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", - "cw3 1.1.0", - "cw4 1.1.0", - "cw4-group 1.1.0", - "cw721-base 0.18.0", + "cw3 0.16.0", + "cw4 0.16.0", + "cw4-group 0.16.0", + "cw721-base 0.17.0", "dao-dao-core", "dao-dao-macros", "dao-interface", @@ -2051,7 +1961,7 @@ dependencies = [ "cosmwasm-storage", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw2 1.1.0", + "cw2 0.16.0", "dao-dao-macros", "dao-interface", "thiserror", @@ -2067,16 +1977,15 @@ dependencies = [ "cw-hooks", "cw-multi-test", "cw-proposal-single", - "cw-tokenfactory-issuer", - "cw-utils 1.0.1", + "cw-utils 0.16.0", "cw-vesting", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", - "cw4 1.1.0", - "cw4-group 1.1.0", - "cw721-base 0.18.0", + "cw4 0.16.0", + "cw4-group 0.16.0", + "cw721-base 0.17.0", "cw721-roles", "dao-dao-core", "dao-interface", @@ -2092,14 +2001,8 @@ dependencies = [ "dao-voting-cw721-roles", "dao-voting-cw721-staked", "dao-voting-native-staked", - "dao-voting-token-factory-staked", - "osmosis-std 0.16.2", - "osmosis-test-tube", "rand", - "serde", - "serde_json", "stake-cw20", - "token-bindings 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2132,8 +2035,8 @@ dependencies = [ "cosmwasm-std", "cw-denom", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw20 1.1.0", + "cw-utils 0.16.0", + "cw20 0.16.0", "dao-dao-macros", "dao-interface", "thiserror", @@ -2147,10 +2050,10 @@ dependencies = [ "cosmwasm-std", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "dao-dao-macros", "dao-interface", "thiserror", @@ -2165,10 +2068,10 @@ dependencies = [ "cosmwasm-storage", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", "dao-dao-macros", "dao-interface", @@ -2185,10 +2088,10 @@ dependencies = [ "cosmwasm-storage", "cw-multi-test", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw4 1.1.0", - "cw4-group 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", + "cw4-group 0.16.0", "dao-dao-macros", "dao-interface", "thiserror", @@ -2205,11 +2108,11 @@ dependencies = [ "cw-ownable", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw4 1.1.0", - "cw721 0.18.0", - "cw721-base 0.18.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", + "cw721 0.17.0", + "cw721-base 0.17.0", "cw721-controllers", "cw721-roles", "dao-cw721-extensions", @@ -2226,23 +2129,19 @@ dependencies = [ "anyhow", "cosmwasm-schema", "cosmwasm-std", - "cw-controllers 1.1.0", + "cw-controllers 0.16.0", "cw-multi-test", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw721 0.18.0", - "cw721-base 0.18.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw721 0.17.0", + "cw721-base 0.17.0", "cw721-controllers", "dao-dao-macros", "dao-interface", "dao-testing", "dao-voting 2.2.0", - "sg-multi-test", - "sg-std", - "sg721", - "sg721-base", "thiserror", ] @@ -2254,45 +2153,15 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", - "cw-controllers 1.1.0", - "cw-hooks", - "cw-multi-test", - "cw-paginate-storage 2.2.0", - "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "dao-dao-macros", - "dao-interface", - "dao-voting 2.2.0", - "thiserror", -] - -[[package]] -name = "dao-voting-token-factory-staked" -version = "2.2.0" -dependencies = [ - "anyhow", - "cosmwasm-schema", - "cosmwasm-std", - "cosmwasm-storage", - "cw-controllers 1.1.0", - "cw-hooks", + "cw-controllers 0.16.0", "cw-multi-test", "cw-paginate-storage 2.2.0", "cw-storage-plus 1.1.0", - "cw-tokenfactory-issuer", - "cw-utils 1.0.1", - "cw2 1.1.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "dao-dao-macros", "dao-interface", - "dao-testing", - "dao-voting 2.2.0", - "osmosis-std 0.17.0-rc0", - "osmosis-test-tube", - "serde", "thiserror", - "token-bindings 0.11.0 (git+https://github.com/CosmosContracts/token-bindings.git?rev=0cd084b68172ffc9af29eb37fb915392ce351954)", - "token-bindings-test", ] [[package]] @@ -2344,9 +2213,9 @@ checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" @@ -2398,9 +2267,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -2435,55 +2304,21 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" dependencies = [ "serde", ] -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "eyre" version = "0.6.8" @@ -2597,7 +2432,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] @@ -2655,15 +2490,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "glob" -version = "0.3.1" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "group" @@ -2678,9 +2507,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -2725,8 +2554,8 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64", + "bitflags", "bytes", "headers-core", "http", @@ -2804,9 +2633,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -2831,7 +2660,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2962,15 +2791,15 @@ dependencies = [ "assert_matches", "cosm-orc", "cosm-tome", - "cosmos-sdk-proto 0.19.0", + "cosmos-sdk-proto 0.16.0", "cosmwasm-std", - "cw-utils 1.0.1", + "cw-utils 0.16.0", "cw-vesting", - "cw20 1.1.0", - "cw20-base 1.1.0", + "cw20 0.16.0", + "cw20-base 0.16.0", "cw20-stake 2.2.0", - "cw721 0.18.0", - "cw721-base 0.18.0", + "cw721 0.17.0", + "cw721-base 0.17.0", "cw721-roles", "dao-dao-core", "dao-interface", @@ -2979,7 +2808,7 @@ dependencies = [ "dao-voting 2.2.0", "dao-voting-cw20-staked", "dao-voting-cw721-staked", - "env_logger 0.10.0", + "env_logger", "once_cell", "rand", "serde", @@ -2987,17 +2816,6 @@ dependencies = [ "test-context", ] -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix", - "windows-sys", -] - [[package]] name = "itertools" version = "0.10.5" @@ -3007,20 +2825,11 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "js-sys" @@ -3070,57 +2879,35 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "memchr" -version = "2.6.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mime" @@ -3166,9 +2953,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ "num-bigint", "num-complex", @@ -3180,9 +2967,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -3191,9 +2978,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -3244,9 +3031,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -3261,20 +3048,11 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "object" -version = "0.32.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -3307,91 +3085,11 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - -[[package]] -name = "osmosis-std" -version = "0.16.2" -source = "git+https://github.com/osmosis-labs/osmosis-rust?branch=autobuild-v17.0.0-rc0#36ef03c6d61b860c6bd25cac56bc52144c4e6b9c" -dependencies = [ - "chrono", - "cosmwasm-std", - "osmosis-std-derive 0.16.2 (git+https://github.com/osmosis-labs/osmosis-rust?branch=autobuild-v17.0.0-rc0)", - "prost 0.11.9", - "prost-types", - "schemars", - "serde", - "serde-cw-value", -] - -[[package]] -name = "osmosis-std" -version = "0.17.0-rc0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b022b748710ecdf1adc6a124c3bef29f17ef05e7fa1260a08889d1d53f9cc5" -dependencies = [ - "chrono", - "cosmwasm-std", - "osmosis-std-derive 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)", - "prost 0.11.9", - "prost-types", - "schemars", - "serde", - "serde-cw-value", -] - -[[package]] -name = "osmosis-std-derive" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47f0b2f22adb341bb59e5a3a1b464dde033181954bd055b9ae86d6511ba465b" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "osmosis-std-derive" -version = "0.16.2" -source = "git+https://github.com/osmosis-labs/osmosis-rust?branch=autobuild-v17.0.0-rc0#36ef03c6d61b860c6bd25cac56bc52144c4e6b9c" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "osmosis-test-tube" -version = "17.0.0-rc0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a2b4f088dd704a47e96b5914e28465cfcdb1cb1145a1f9b45c219a9b145c5" -dependencies = [ - "base64 0.13.1", - "bindgen", - "cosmrs 0.9.0", - "cosmwasm-std", - "osmosis-std 0.17.0-rc0", - "prost 0.11.9", - "serde", - "serde_json", - "test-tube", - "thiserror", -] - [[package]] name = "paste" -version = "1.0.14" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pathdiff" @@ -3408,12 +3106,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "peg" version = "0.7.0" @@ -3449,20 +3141,19 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" dependencies = [ - "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b" dependencies = [ "pest", "pest_generator", @@ -3470,22 +3161,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0" dependencies = [ "once_cell", "pest", @@ -3494,29 +3185,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -3551,9 +3242,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -3597,7 +3288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 1.0.109", @@ -3610,7 +3301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 1.0.109", @@ -3647,9 +3338,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -3698,9 +3389,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", @@ -3710,9 +3401,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" dependencies = [ "aho-corasick", "memchr", @@ -3721,9 +3412,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" [[package]] name = "rend" @@ -3794,7 +3485,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.4.1", + "uuid 1.4.0", ] [[package]] @@ -3814,8 +3505,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64", + "bitflags", "serde", ] @@ -3831,12 +3522,14 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.32.0" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +checksum = "d0446843641c69436765a35a5a77088e28c2e6a12da93e84aa3ab1cd4aa5a042" dependencies = [ "arrayvec", "borsh", + "bytecheck", + "byteorder", "bytes", "num-traits", "rand", @@ -3851,32 +3544,13 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - [[package]] name = "rustls" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.1", + "base64", "log", "ring", "sct", @@ -3897,15 +3571,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "same-file" @@ -3927,9 +3601,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.13" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", "schemars_derive", @@ -3939,9 +3613,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.13" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", @@ -3981,11 +3655,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -3994,9 +3668,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -4004,28 +3678,19 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bd51c3db8f9500d531e6c12dd0fd4ad13d133e9117f5aebac3cdbb8b6d9824b0" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-cw-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4" -dependencies = [ - "serde", -] - [[package]] name = "serde-json-wasm" version = "0.5.1" @@ -4037,22 +3702,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "27738cfea0d944ab72c3ed01f3d5f23ec4322af8a1431e40ce630e4c01ea74fd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] @@ -4068,9 +3733,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -4079,20 +3744,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" dependencies = [ "indexmap 2.0.0", "itoa", @@ -4102,75 +3767,10 @@ dependencies = [ ] [[package]] -name = "sg-multi-test" -version = "3.1.0" +name = "sha1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20744734b8049c64747bfb083bbc06a3c7204d1d34881ed3d89698e182aa9f97" -dependencies = [ - "anyhow", - "cosmwasm-std", - "cw-multi-test", - "schemars", - "serde", - "sg-std", -] - -[[package]] -name = "sg-std" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db53aebc2b4f981dc20a51213544adde8beaace6880345627f4babe2e1bc3ab" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 1.0.1", - "cw721 0.18.0", - "schemars", - "serde", - "thiserror", -] - -[[package]] -name = "sg721" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7d8f93b519c4c95973a68c7abee2de838497974d666dddb4dabd04d9c7cbf6" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-ownable", - "cw-utils 1.0.1", - "cw721-base 0.18.0", - "serde", - "thiserror", -] - -[[package]] -name = "sg721-base" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af08801d6f50cb13be05a3d2e815fbdb9dbba82086bbab877599ed4d422e9441" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-ownable", - "cw-storage-plus 1.1.0", - "cw-utils 1.0.1", - "cw2 1.1.0", - "cw721 0.18.0", - "cw721-base 0.18.0", - "serde", - "sg-std", - "sg721", - "thiserror", - "url", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -4201,6 +3801,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha256" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a975c1bc0941703000eaf232c4d8ce188d8d5408d6344b6b2c8c6262772828" +dependencies = [ + "hex", + "sha2 0.10.7", +] + [[package]] name = "sha3" version = "0.10.8" @@ -4211,12 +3821,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - [[package]] name = "signature" version = "1.6.4" @@ -4235,9 +3839,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -4252,16 +3856,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys", -] - [[package]] name = "speculoos" version = "0.11.0" @@ -4346,10 +3940,10 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.10.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" @@ -4379,9 +3973,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "36ccaf716a23c35ff908f91c971a86a9a71af5998c1d8f10e828d9f55f68ac00" dependencies = [ "proc-macro2", "quote", @@ -4400,37 +3994,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "tendermint" -version = "0.23.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467f82178deeebcd357e1273a0c0b77b9a8a0313ef7c07074baebe99d87851f4" -dependencies = [ - "async-trait", - "bytes", - "ed25519", - "ed25519-dalek", - "flex-error", - "futures", - "k256", - "num-traits", - "once_cell", - "prost 0.11.9", - "prost-types", - "ripemd160", - "serde", - "serde_bytes", - "serde_json", - "serde_repr", - "sha2 0.9.9", - "signature", - "subtle", - "subtle-encoding", - "tendermint-proto 0.23.9", - "time", - "zeroize", -] - [[package]] name = "tendermint" version = "0.26.0" @@ -4462,20 +4025,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tendermint-config" -version = "0.23.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d42ee0abc27ef5fc34080cce8d43c189950d331631546e7dfb983b6274fa327" -dependencies = [ - "flex-error", - "serde", - "serde_json", - "tendermint 0.23.9", - "toml", - "url", -] - [[package]] name = "tendermint-config" version = "0.26.0" @@ -4485,29 +4034,11 @@ dependencies = [ "flex-error", "serde", "serde_json", - "tendermint 0.26.0", + "tendermint", "toml", "url", ] -[[package]] -name = "tendermint-proto" -version = "0.23.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ce80bf536476db81ecc9ebab834dc329c9c1509a694f211a73858814bfe023" -dependencies = [ - "bytes", - "flex-error", - "num-derive", - "num-traits", - "prost 0.11.9", - "prost-types", - "serde", - "serde_bytes", - "subtle-encoding", - "time", -] - [[package]] name = "tendermint-proto" version = "0.26.0" @@ -4528,9 +4059,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.32.2" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cec054567d16d85e8c3f6a3139963d1a66d9d3051ed545d31562550e9bcc3d" +checksum = "d5895470f28c530f8ae8c4071bf8190304ce00bd131d25e81730453124a3375c" dependencies = [ "bytes", "flex-error", @@ -4544,39 +4075,6 @@ dependencies = [ "time", ] -[[package]] -name = "tendermint-rpc" -version = "0.23.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f14aafe3528a0f75e9f3f410b525617b2de16c4b7830a21f717eee62882ec60" -dependencies = [ - "async-trait", - "bytes", - "flex-error", - "futures", - "getrandom", - "http", - "hyper", - "hyper-proxy", - "hyper-rustls", - "peg", - "pin-project", - "serde", - "serde_bytes", - "serde_json", - "subtle-encoding", - "tendermint 0.23.9", - "tendermint-config 0.23.9", - "tendermint-proto 0.23.9", - "thiserror", - "time", - "tokio", - "tracing", - "url", - "uuid 0.8.2", - "walkdir", -] - [[package]] name = "tendermint-rpc" version = "0.26.0" @@ -4599,8 +4097,8 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.26.0", - "tendermint-config 0.26.0", + "tendermint", + "tendermint-config", "tendermint-proto 0.26.0", "thiserror", "time", @@ -4641,64 +4139,51 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "test-tube" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b1f7cafdf7738331999fb1465d2d3032f08ac61940e1ef4601dbbef21d6a5e" -dependencies = [ - "base64 0.13.1", - "cosmrs 0.9.0", - "cosmwasm-std", - "osmosis-std 0.17.0-rc0", - "prost 0.11.9", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] name = "time" -version = "0.3.11" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ - "libc", - "num_threads", + "serde", + "time-core", "time-macros", ] +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] [[package]] name = "tinyvec" @@ -4726,58 +4211,20 @@ dependencies = [ "serde", ] -[[package]] -name = "token-bindings" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be1c893c90d2993320d9722516ece705460f464616313a62edadb9e71df4502" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "schemars", - "serde", -] - -[[package]] -name = "token-bindings" -version = "0.11.0" -source = "git+https://github.com/CosmosContracts/token-bindings.git?rev=0cd084b68172ffc9af29eb37fb915392ce351954#0cd084b68172ffc9af29eb37fb915392ce351954" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "schemars", - "serde", -] - -[[package]] -name = "token-bindings-test" -version = "0.11.0" -source = "git+https://github.com/CosmosContracts/token-bindings.git?rev=0cd084b68172ffc9af29eb37fb915392ce351954#0cd084b68172ffc9af29eb37fb915392ce351954" -dependencies = [ - "anyhow", - "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus 0.16.0", - "itertools 0.11.0", - "schemars", - "serde", - "thiserror", - "token-bindings 0.11.0 (git+https://github.com/CosmosContracts/token-bindings.git?rev=0cd084b68172ffc9af29eb37fb915392ce351954)", -] - [[package]] name = "tokio" -version = "1.32.0" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ + "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "socket2", "tokio-macros", "windows-sys", ] @@ -4800,7 +4247,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] @@ -4857,7 +4304,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64", "bytes", "futures-core", "futures-util", @@ -4880,34 +4327,6 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum", - "base64 0.21.3", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.11.9", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.4.13" @@ -4960,7 +4379,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] [[package]] @@ -5000,6 +4419,18 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "uint" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -5008,9 +4439,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization" @@ -5021,11 +4452,17 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" [[package]] name = "untrusted" @@ -5035,9 +4472,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -5052,9 +4489,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" [[package]] name = "version_check" @@ -5120,7 +4557,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", "wasm-bindgen-shared", ] @@ -5142,7 +4579,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5182,17 +4619,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - [[package]] name = "winapi" version = "0.3.9" @@ -5235,9 +4661,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -5250,45 +4676,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "wynd-utils" @@ -5337,5 +4763,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.24", ] diff --git a/contracts/external/cw-abc/Cargo.toml b/contracts/external/cw-abc/Cargo.toml index 0223dc1b9..d5fdc2b5a 100644 --- a/contracts/external/cw-abc/Cargo.toml +++ b/contracts/external/cw-abc/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "cw-abc" version = "0.0.1" -authors = ["Ethan Frey ", "Jake Hartnell", "Adair "] +authors = [ + "Ethan Frey ", + "Jake Hartnell", + "Adair ", +] edition = { workspace = true } description = "Implements an Augmented Bonding Curve" license = "Apache-2.0" @@ -16,7 +20,7 @@ crate-type = ["cdylib", "rlib"] backtraces = ["cosmwasm-std/backtraces"] # use library feature to disable all instantiate/execute/query exports library = [] -boot = ["dep:boot-core"] +boot = ["dep:cw-orch"] [dependencies] cw-utils = { workspace = true } @@ -30,11 +34,12 @@ cw-address-like = "1.0.4" rust_decimal = "1.14.3" integer-sqrt = "0.1.5" integer-cbrt = "0.1.2" +getrandom = { version = "0.2", features = ["js"] } # TODO publish this token-bindings = { git = "https://github.com/CosmosContracts/token-bindings", rev = "1412b94" } cw-ownable = { workspace = true } cw-paginate-storage = { workspace = true } -boot-core = { version = "0.10.0", optional = true, git = "https://github.com/AbstractSDK/BOOT", branch = "fix/custom_binding_contract_wrapper" } +cw-orch = { version = "0.13.3", optional = true, git = "https://github.com/AbstractSDK/cw-orchestrator", branch = "main" } [dev-dependencies] # TODO move to workspace diff --git a/contracts/external/cw-abc/src/boot.rs b/contracts/external/cw-abc/src/boot.rs index d8376b0e5..ad2309b0b 100644 --- a/contracts/external/cw-abc/src/boot.rs +++ b/contracts/external/cw-abc/src/boot.rs @@ -1,9 +1,9 @@ use crate::msg::*; -use boot_core::{contract, Contract, CwEnv}; -#[cfg(feature = "daemon")] -use boot_core::{ArtifactsDir, Daemon, WasmPath}; -use boot_core::{ContractWrapper, Mock, MockState, TxHandler, Uploadable}; use cosmwasm_std::Empty; +use cw_orch::{contract, Contract, CwEnv}; +#[cfg(feature = "daemon")] +use cw_orch::{ArtifactsDir, Daemon, WasmPath}; +use cw_orch::{ContractWrapper, Mock, MockState, TxHandler, Uploadable}; use token_bindings::{TokenFactoryMsg, TokenFactoryQuery}; #[contract(InstantiateMsg, ExecuteMsg, QueryMsg, Empty)] @@ -18,7 +18,7 @@ impl CwAbc { /// Basic app for the token factory contract /// TODO: should be in the bindings, along with custom handler for multi-test -pub(crate) type TokenFactoryBasicApp = boot_core::BasicApp; +pub(crate) type TokenFactoryBasicApp = cw_orch::BasicApp; type TokenFactoryMock = Mock; diff --git a/contracts/external/cw-abc/src/integration.rs b/contracts/external/cw-abc/src/integration.rs index d6b23b8bc..767dbdf77 100644 --- a/contracts/external/cw-abc/src/integration.rs +++ b/contracts/external/cw-abc/src/integration.rs @@ -1,6 +1,6 @@ use crate::{abc::CurveType, boot::CwAbc}; -use boot_core::{BootUpload, Mock}; use cosmwasm_std::{Addr, Uint128}; +use cw_orch::{CwOrcUpload, Mock}; use crate::testing::prelude::*; diff --git a/contracts/external/cw-abc/src/lib.rs b/contracts/external/cw-abc/src/lib.rs index 5070715b8..24ac48a7d 100644 --- a/contracts/external/cw-abc/src/lib.rs +++ b/contracts/external/cw-abc/src/lib.rs @@ -33,8 +33,8 @@ pub(crate) mod testing { pub(crate) mod prelude { pub use super::{ - default_instantiate_msg, default_supply_metadata, mock_tf_dependencies, TEST_BUYER, - TEST_CREATOR, TEST_INVESTOR, TEST_RESERVE_DENOM, TEST_SUPPLY_DENOM, + default_instantiate_msg, default_supply_metadata, mock_tf_dependencies, TEST_CREATOR, + TEST_RESERVE_DENOM, TEST_SUPPLY_DENOM, _TEST_BUYER, _TEST_INVESTOR, }; pub use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg}; pub use speculoos::prelude::*; @@ -42,8 +42,8 @@ pub(crate) mod testing { pub const TEST_RESERVE_DENOM: &str = "satoshi"; pub const TEST_CREATOR: &str = "creator"; - pub const TEST_INVESTOR: &str = "investor"; - pub const TEST_BUYER: &str = "buyer"; + pub const _TEST_INVESTOR: &str = "investor"; + pub const _TEST_BUYER: &str = "buyer"; pub const TEST_SUPPLY_DENOM: &str = "subdenom"; diff --git a/contracts/external/cw-abc/src/msg.rs b/contracts/external/cw-abc/src/msg.rs index c1c30a1ca..92de30f70 100644 --- a/contracts/external/cw-abc/src/msg.rs +++ b/contracts/external/cw-abc/src/msg.rs @@ -41,7 +41,7 @@ pub enum UpdatePhaseConfigMsg { #[cw_ownable::cw_ownable_execute] #[cw_serde] -#[cfg_attr(feature = "boot", derive(boot_core::ExecuteFns))] +#[cfg_attr(feature = "boot", derive(cw_orch::ExecuteFns))] pub enum ExecuteMsg { /// Buy will attempt to purchase as many supply tokens as possible. /// You must send only reserve tokens in that message @@ -66,7 +66,7 @@ pub enum ExecuteMsg { #[cw_ownable::cw_ownable_query] #[cw_serde] #[derive(QueryResponses)] -#[cfg_attr(feature = "boot", derive(boot_core::QueryFns))] +#[cfg_attr(feature = "boot", derive(cw_orch::QueryFns))] pub enum QueryMsg { /// Returns the reserve and supply quantities, as well as the spot price to buy 1 token /// Returns [`CurveInfoResponse`]