From 874d77356aac823514361a4a4a96551fdfcad4a4 Mon Sep 17 00:00:00 2001 From: orkunkl Date: Fri, 6 Dec 2024 12:57:00 +0300 Subject: [PATCH] WIP --- Cargo.lock | 960 +++++++++++++++++++------ Cargo.toml | 22 +- .cargo/config => config.toml | 0 contracts/controller/Cargo.toml | 2 - contracts/controller/src/error.rs | 2 +- contracts/stream/Cargo.toml | 2 - contracts/stream/src/contract.rs | 13 +- contracts/stream/src/error.rs | 6 +- contracts/stream/src/pool.rs | 2 +- contracts/stream/src/vesting.rs | 9 +- packages/types/Cargo.toml | 1 - packages/types/src/stream/threshold.rs | 6 +- packages/utils/Cargo.toml | 2 - tests/Cargo.toml | 2 - 14 files changed, 774 insertions(+), 255 deletions(-) rename .cargo/config => config.toml (100%) diff --git a/Cargo.lock b/Cargo.lock index 15b48073..066f93a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,27 +4,27 @@ version = 3 [[package]] name = "abstract-cw-multi-test" -version = "1.0.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c77f8d4bac08f74fbc4fce8943cb2d35e742682b6cae8cb65555d6cd3830feb" +checksum = "4f46c402f2c8e053c7bf1fa78cbfb728c0f508a1bc3dd0dd4cad978b68e268d0" dependencies = [ "anyhow", "bech32 0.11.0", - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "cw20-ics20", "derivative", "hex", - "itertools 0.12.1", + "itertools 0.13.0", "log", - "prost 0.12.6", + "prost 0.13.3", "schemars", "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -38,11 +38,150 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" + +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "rayon", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rayon", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand", + "rayon", +] [[package]] name = "autocfg" @@ -62,6 +201,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -110,6 +255,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" +[[package]] +name = "bnum" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e31ea183f6ee62ac8b8a8cf7feddd766317adfb13ff469de57ce033efd6a790" + [[package]] name = "byteorder" version = "1.5.0" @@ -157,15 +308,20 @@ dependencies = [ [[package]] name = "cosmos-sdk-proto" -version = "0.21.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e23f6ab56d5f031cde05b8b82a5fefd3a1a223595c79e32317a97189e612bc" +checksum = "1d0afc4daf81936e6ef5a2cf76f00c913ba5bc385d58ae1e09644e25d16b0381" dependencies = [ - "prost 0.12.6", - "prost-types 0.12.6", + "prost 0.13.3", "tendermint-proto", ] +[[package]] +name = "cosmwasm-core" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6ceb8624260d0d3a67c4e1a1d43fc7e9406720afbcb124521501dd138f90aa" + [[package]] name = "cosmwasm-crypto" version = "1.5.7" @@ -173,10 +329,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f862b355f7e47711e0acfe6af92cb3fd8fd5936b66a9eaa338b51edabd1e77d" dependencies = [ "digest 0.10.7", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "k256", "rand_core 0.6.4", - "thiserror", + "thiserror 1.0.63", +] + +[[package]] +name = "cosmwasm-crypto" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4125381e5fd7fefe9f614640049648088015eca2b60d861465329a5d87dfa538" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "cosmwasm-core", + "digest 0.10.7", + "ecdsa", + "ed25519-zebra 4.0.3", + "k256", + "num-traits", + "p256", + "rand_core 0.6.4", + "rayon", + "sha2 0.10.8", + "thiserror 1.0.63", ] [[package]] @@ -188,17 +367,41 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cosmwasm-derive" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5658b1dc64e10b56ae7a449f678f96932a96f6cfad1769d608d1d1d656480a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "cosmwasm-schema" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b4cd28147a66eba73720b47636a58097a979ad8c8bfdb4ed437ebcbfe362576" dependencies = [ - "cosmwasm-schema-derive", + "cosmwasm-schema-derive 1.5.7", "schemars", "serde", "serde_json", - "thiserror", + "thiserror 1.0.63", +] + +[[package]] +name = "cosmwasm-schema" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b4d949b6041519c58993a73f4bbfba8083ba14f7001eae704865a09065845" +dependencies = [ + "cosmwasm-schema-derive 2.1.4", + "schemars", + "serde", + "serde_json", + "thiserror 1.0.63", ] [[package]] @@ -212,26 +415,60 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cosmwasm-schema-derive" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ef1b5835a65fcca3ab8b9a02b4f4dacc78e233a5c2f20b270efb9db0666d12" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "cosmwasm-std" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2685c2182624b2e9e17f7596192de49a3f86b7a0c9a5f6b25c1df5e24592e836" dependencies = [ - "base64", + "base64 0.21.7", "bech32 0.9.1", - "bnum", - "cosmwasm-crypto", - "cosmwasm-derive", + "bnum 0.10.0", + "cosmwasm-crypto 1.5.7", + "cosmwasm-derive 1.5.7", "derivative", "forward_ref", "hex", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 0.5.2", "sha2 0.10.8", "static_assertions", - "thiserror", + "thiserror 1.0.63", +] + +[[package]] +name = "cosmwasm-std" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70eb7ab0c1e99dd6207496963ba2a457c4128ac9ad9c72a83f8d9808542b849b" +dependencies = [ + "base64 0.22.1", + "bech32 0.11.0", + "bnum 0.11.0", + "cosmwasm-core", + "cosmwasm-crypto 2.1.4", + "cosmwasm-derive 2.1.4", + "derive_more", + "hex", + "rand_core 0.6.4", + "schemars", + "serde", + "serde-json-wasm 1.0.1", + "sha2 0.10.8", + "static_assertions", + "thiserror 1.0.63", ] [[package]] @@ -243,6 +480,31 @@ dependencies = [ "libc", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + [[package]] name = "crypto-bigint" version = "0.5.5" @@ -278,28 +540,55 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "cw-address-like" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451a4691083a88a3c0630a8a88799e9d4cd6679b7ce8ff22b8da2873ff31d380" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.5.7", ] [[package]] name = "cw-controllers" -version = "1.1.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57de8d3761e46be863e3ac1eba8c8a976362a48c6abf240df1e26c3e421ee9e8" +checksum = "50c1804013d21060b994dea28a080f9eab78a3bcb6b617f05e7634b0600bf7b1" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "schemars", "serde", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -308,51 +597,51 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "422e7f8be5c4b099b5c537b764c2463cc2668741c24237a9d95d8d7483ece4af" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw20", - "thiserror", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", + "cw20 1.1.2", + "thiserror 1.0.63", ] [[package]] name = "cw-multi-test" -version = "0.20.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc392a5cb7e778e3f90adbf7faa43c4db7f35b6623224b08886d796718edb875" +checksum = "1149fe104344cc4f4ca0fc784b7411042fd1626813fe85fd412b05252a0ae9d8" dependencies = [ "anyhow", - "bech32 0.9.1", - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "derivative", - "itertools 0.12.1", - "prost 0.12.6", + "bech32 0.11.0", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", + "itertools 0.13.0", + "prost 0.13.3", "schemars", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 2.0.4", ] [[package]] name = "cw-orch" -version = "0.24.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c81cb500eb2f9be31a0f90c7ce66572ee4a790ffbae1c6b42ff2e3f9faf3479" +checksum = "8970af7113824ab8d82f0a0d12f92b41d85410f3b7651425989ffa55d517708b" dependencies = [ "anyhow", - "cosmwasm-std", + "cosmwasm-std 2.1.4", "cw-orch-contract-derive", "cw-orch-core", "cw-orch-fns-derive", "cw-orch-mock", "cw-orch-traits", - "cw-utils", + "cw-utils 2.0.0", "hex", "log", "schemars", "serde", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -363,51 +652,51 @@ checksum = "5bc8ba75692fc7bd30e91c78fad2dc208a738e4e6ea26b232f9352c320e35543" dependencies = [ "convert_case", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] name = "cw-orch-core" -version = "1.2.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abd640f67f655411542a3c148769270c7a9e63d4097c2dc4a1f6edf23b7a9b4" +checksum = "09c75b59e43cf3ec05bc9fc86748cdd4998bfb53a81e3fa99dda14cf4ded3d4d" dependencies = [ "abstract-cw-multi-test", "anyhow", "cosmos-sdk-proto", - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", + "cosmwasm-std 2.1.4", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "dirs", "log", "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.63", ] [[package]] name = "cw-orch-fns-derive" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e21b23116a0702f540d7fa3f16e8276682d860b589fed56259220ad59d768e" +checksum = "194e944e6bcb51a53f99e2b0a510ecc8919605b9a83d93641748cf1b163315f6" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] name = "cw-orch-mock" -version = "0.23.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57beb30d841bde79df51c9402741ef926ca8ef7ecd3570aa180074f767ac04d3" +checksum = "aa1151a4ed23b986dd197959c5a090a54710512913b033e202625c53ea8ae239" dependencies = [ "abstract-cw-multi-test", - "cosmwasm-std", + "cosmwasm-std 2.1.4", "cw-orch-core", - "cw-utils", + "cw-utils 2.0.0", "log", "serde", "sha2 0.10.8", @@ -415,13 +704,12 @@ dependencies = [ [[package]] name = "cw-orch-traits" -version = "0.23.3" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e6b81dc282724c9c6334a499f4867e575458e69fe5b99034d4f962860f3357" +checksum = "2ccb1670cc49a7a10c425ba1072cb607eb00d8085f97692877b9bdb00d14dd3d" dependencies = [ "cw-orch-core", - "prost 0.12.6", - "prost-types 0.12.6", + "prost-types 0.13.3", ] [[package]] @@ -430,13 +718,13 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "093dfb4520c48b5848274dd88ea99e280a04bc08729603341c7fb0d758c74321" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", "cw-address-like", "cw-ownable-derive", - "cw-storage-plus", - "cw-utils", - "thiserror", + "cw-storage-plus 1.2.0", + "cw-utils 1.0.3", + "thiserror 1.0.63", ] [[package]] @@ -456,8 +744,8 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7595534852566a86a7bb4fe8a1b6c46293d9f85c1d39394370f685a9d07fe53" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", "cw-wormhole", ] @@ -467,7 +755,18 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.5.7", + "schemars", + "serde", +] + +[[package]] +name = "cw-storage-plus" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f13360e9007f51998d42b1bc6b7fa0141f74feae61ed5fd1e5b0a89eec7b5de1" +dependencies = [ + "cosmwasm-std 2.1.4", "schemars", "serde", ] @@ -478,13 +777,26 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw2", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", + "cw2 1.1.2", "schemars", "semver", "serde", - "thiserror", + "thiserror 1.0.63", +] + +[[package]] +name = "cw-utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07dfee7f12f802431a856984a32bce1cb7da1e6c006b5409e3981035ce562dec" +dependencies = [ + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "schemars", + "serde", + "thiserror 1.0.63", ] [[package]] @@ -493,18 +805,18 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da4652f6ea1a7d574d75bcbab3a79cf5a9a980c774b7b939a11b46ebd771c6a7" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", "cw-denom", "cw-ownable", "cw-stake-tracker", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 1.2.0", + "cw-utils 1.0.3", "cw-wormhole", - "cw2", - "cw20", + "cw2 1.1.2", + "cw20 1.1.2", "serde", - "thiserror", + "thiserror 1.0.63", "wynd-utils", ] @@ -514,9 +826,9 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21ff1c164c931f998fc647364d18896a10243db6a916a05159cd3ad9771f7704" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", + "cw-storage-plus 1.2.0", "serde", ] @@ -526,13 +838,28 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", + "cw-storage-plus 1.2.0", "schemars", "semver", "serde", - "thiserror", + "thiserror 1.0.63", +] + +[[package]] +name = "cw2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b04852cd38f044c0751259d5f78255d07590d136b8a86d4e09efdd7666bd6d27" +dependencies = [ + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "cw-storage-plus 2.0.0", + "schemars", + "semver", + "serde", + "thiserror 1.0.63", ] [[package]] @@ -541,30 +868,43 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "526e39bb20534e25a1cd0386727f0038f4da294e5e535729ba3ef54055246abd" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils", + "cosmwasm-schema 1.5.7", + "cosmwasm-std 1.5.7", + "cw-utils 1.0.3", + "schemars", + "serde", +] + +[[package]] +name = "cw20" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42212b6bf29bbdda693743697c621894723f35d3db0d5df930be22903d0e27c" +dependencies = [ + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "cw-utils 2.0.0", "schemars", "serde", ] [[package]] name = "cw20-ics20" -version = "1.1.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76221201da08fed611c857ea3aa21c031a4a7dc771a8b1750559ca987335dc02" +checksum = "80a9e377dbbd1ffb3b6a8a2dbf9128609a6458a3292f88f99e0b6840a7e9762e" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", "cw-controllers", - "cw-storage-plus", - "cw-utils", - "cw2", - "cw20", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", + "cw2 2.0.0", + "cw20 2.0.0", "schemars", "semver", "serde", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -597,6 +937,27 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -659,14 +1020,23 @@ dependencies = [ "spki", ] +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "signature", +] + [[package]] name = "ed25519-zebra" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ - "curve25519-dalek", - "hashbrown", + "curve25519-dalek 3.2.0", + "hashbrown 0.12.3", "hex", "rand_core 0.6.4", "serde", @@ -674,6 +1044,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" +dependencies = [ + "curve25519-dalek 4.1.3", + "ed25519", + "hashbrown 0.14.5", + "hex", + "rand_core 0.6.4", + "sha2 0.10.8", + "zeroize", +] + [[package]] name = "either" version = "1.13.0" @@ -709,6 +1094,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "flex-error" version = "0.4.4" @@ -763,7 +1154,26 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.11", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", ] [[package]] @@ -790,15 +1200,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -856,6 +1257,16 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -863,14 +1274,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] -name = "num-derive" -version = "0.4.2" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", + "num-traits", ] [[package]] @@ -902,15 +1311,15 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "osmosis-std" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca66dca7e8c9b11b995cd41a44c038134ccca4469894d663d8a9452d6e716241" +checksum = "cd621cc2f26474c6fb689ccc114dc0d8b53369a322f1fa5f24802f3de3d3def3" dependencies = [ "chrono", - "cosmwasm-std", + "cosmwasm-std 2.1.4", "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost 0.13.3", + "prost-types 0.13.3", "schemars", "serde", "serde-cw-value", @@ -918,9 +1327,9 @@ dependencies = [ [[package]] name = "osmosis-std-derive" -version = "0.20.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ebdfd1bc8ed04db596e110c6baa9b174b04f6ed1ec22c666ddc5cb3fa91bd7" +checksum = "8b0240fd030a4bbc79fa6cbea0b3eb0260a4b79075ebc039b93e2652bff8655b" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -929,6 +1338,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2 0.10.8", +] + [[package]] name = "paste" version = "1.0.15" @@ -952,42 +1373,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "proc-macro2" -version = "1.0.86" +name = "ppv-lite86" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "unicode-ident", + "zerocopy", ] [[package]] -name = "prost" -version = "0.11.9" +name = "primeorder" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "bytes", - "prost-derive 0.11.9", + "elliptic-curve", +] + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", ] [[package]] name = "prost" -version = "0.12.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.12.6", + "prost-derive 0.11.9", ] [[package]] name = "prost" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", - "prost-derive 0.13.1", + "prost-derive 0.13.3", ] [[package]] @@ -1005,28 +1434,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "prost-derive" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1040,11 +1456,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.12.6", + "prost 0.13.3", ] [[package]] @@ -1056,6 +1472,26 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_chacha", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -1071,6 +1507,26 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_users" version = "0.4.6" @@ -1079,7 +1535,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -1092,6 +1548,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "ryu" version = "1.0.18" @@ -1119,7 +1584,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1144,9 +1609,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -1169,6 +1634,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde-json-wasm" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.15" @@ -1180,13 +1654,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1197,7 +1671,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1266,22 +1740,22 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "streamswap-controller" version = "0.2.0-beta2" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", "cw-controllers", "cw-denom", "cw-multi-test", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "cw-vesting", - "cw2", + "cw2 2.0.0", "osmosis-std", "schemars", "semver", "serde", "streamswap-types", "streamswap-utils", - "thiserror", + "thiserror 2.0.4", ] [[package]] @@ -1297,37 +1771,37 @@ dependencies = [ name = "streamswap-stream" version = "0.2.0-beta2" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", "cw-controllers", "cw-multi-test", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "cw-vesting", - "cw2", + "cw2 2.0.0", "osmosis-std", "schemars", "semver", "serde", "streamswap-types", "streamswap-utils", - "thiserror", + "thiserror 2.0.4", ] [[package]] name = "streamswap-tests" version = "0.2.0-beta2" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", "cw-controllers", "cw-multi-test", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "cw-vesting", - "cw2", + "cw2 2.0.0", "osmosis-std", - "prost 0.13.1", + "prost 0.13.3", "schemars", "streamswap-controller", "streamswap-stream", @@ -1339,26 +1813,26 @@ dependencies = [ name = "streamswap-types" version = "0.2.0-beta2" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", "cw-denom", "cw-orch", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", "cw-vesting", "osmosis-std", "streamswap-utils", - "thiserror", + "thiserror 2.0.4", ] [[package]] name = "streamswap-utils" version = "0.2.0-beta2" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils", - "thiserror", + "cosmwasm-schema 2.1.4", + "cosmwasm-std 2.1.4", + "cw-utils 2.0.0", + "thiserror 2.0.4", ] [[package]] @@ -1389,9 +1863,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -1400,16 +1874,13 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.35.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" +checksum = "bf3abf34ecf33125621519e9952688e7a59a98232d51538037ba21fbe526a802" dependencies = [ "bytes", "flex-error", - "num-derive", - "num-traits", - "prost 0.12.6", - "prost-types 0.12.6", + "prost 0.13.3", "serde", "serde_bytes", "subtle-encoding", @@ -1422,7 +1893,16 @@ version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.63", +] + +[[package]] +name = "thiserror" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" +dependencies = [ + "thiserror-impl 2.0.4", ] [[package]] @@ -1433,7 +1913,18 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -1483,6 +1974,12 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "version_check" version = "0.9.5" @@ -1567,10 +2064,31 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa37b3fba808df599acc6f0d7523b465baf47a0b0361867c4f1635eb53f72aa" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.5.7", "schemars", "serde", - "thiserror", + "thiserror 1.0.63", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -1578,3 +2096,17 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] diff --git a/Cargo.toml b/Cargo.toml index f21e9912..97365955 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,22 +20,22 @@ too_many_arguments = "allow" module_inception = "allow" [workspace.dependencies] -cosmwasm-schema = "1.5.7" -cosmwasm-std = { version = "1.5.7", features = ["iterator", "staking", "stargate", "cosmwasm_1_2"] } -cw-controllers = "1.1.2" +cosmwasm-schema = "2.1.4" +cosmwasm-std = { version = "2.1.4", features = ["iterator", "staking", "stargate", "cosmwasm_1_2"] } +cw-controllers = "2.0.0" cw-denom = "2.3.0" -cw-multi-test = { version = "0.20.1", features = ["cosmwasm_1_2"] } -cw-storage-plus = "1.2.0" -cw-utils = "1.0.3" +cw-multi-test = { version = "2.2.0", features = ["cosmwasm_1_2"] } +cw-storage-plus = "2.0.0" +cw-utils = "2.0.0" cw-vesting = { version = "2.3.0", features = ["library"] } -cw-orch = { version = "0.24.1" } -cw2 = "1.1.2" -osmosis-std = "0.25.0" +cw-orch = { version = "0.27.0" } +cw2 = "2.0.0" +osmosis-std = "0.26.0" osmosis_prost = { version = "0.13.1", package = "prost" } schemars = "0.8.11" semver = "1.0.16" serde = { version = "1.0.152", default-features = false, features = ["derive"] } -thiserror = { version = "1.0.38" } +thiserror = { version = "2.0.4" } # contracts streamswap-controller = { path = "./contracts/controller" } @@ -55,5 +55,5 @@ streamswap-tests = { path = "./tests" } optimize = """docker run --rm -v "$(pwd)":/code \ --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \ --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ - cosmwasm/workspace-optimizer:0.16.0 + cosmwasm/optimizer:0.16.1 """ diff --git a/.cargo/config b/config.toml similarity index 100% rename from .cargo/config rename to config.toml diff --git a/contracts/controller/Cargo.toml b/contracts/controller/Cargo.toml index 5e2a9f95..10690f24 100644 --- a/contracts/controller/Cargo.toml +++ b/contracts/controller/Cargo.toml @@ -12,8 +12,6 @@ workspace = true crate-type = ["cdylib", "rlib"] [features] -# for more explicit tests, cargo test --features=backtraces -backtraces = ["cosmwasm-std/backtraces"] # use library feature to disable all instantiate/execute/query exports library = [] diff --git a/contracts/controller/src/error.rs b/contracts/controller/src/error.rs index 1d619cc2..79a6f74b 100644 --- a/contracts/controller/src/error.rs +++ b/contracts/controller/src/error.rs @@ -47,7 +47,7 @@ pub enum ContractError { #[error("Required denom not found in funds")] NoFundsSent {}, - #[error("In_denom does not match config")] + #[error("In_denom does not match config.toml")] InDenomIsNotAccepted {}, #[error("Out_denom can not be the same as in_denom")] diff --git a/contracts/stream/Cargo.toml b/contracts/stream/Cargo.toml index ce02f8f8..e9fb88c0 100644 --- a/contracts/stream/Cargo.toml +++ b/contracts/stream/Cargo.toml @@ -11,8 +11,6 @@ crate-type = ["cdylib", "rlib"] workspace = true [features] -# for more explicit tests, cargo test --features=backtraces -backtraces = ["cosmwasm-std/backtraces"] # use library feature to disable all instantiate/execute/query exports library = [] diff --git a/contracts/stream/src/contract.rs b/contracts/stream/src/contract.rs index 3ddaabb6..95af1777 100644 --- a/contracts/stream/src/contract.rs +++ b/contracts/stream/src/contract.rs @@ -121,7 +121,7 @@ pub fn instantiate( bootstraping_start_time.to_string(), ), ]; - // if pool config is set, add attributes + // if pool config.toml is set, add attributes if let Some(pool_config) = pool_config { match pool_config { PoolConfig::ConcentratedLiquidity { out_amount_clp } => { @@ -282,7 +282,8 @@ pub fn sync_position( position.pending_purchase = decimals; // floors the decimal points - uint256_purchased = purchased * Uint256::one(); + uint256_purchased = purchased.to_uint_floor(); + position.purchased = position.purchased.checked_add(uint256_purchased)?; } @@ -482,8 +483,7 @@ pub fn execute_finalize_stream( // Stream's swap fee collected at fixed rate from accumulated spent_in of positions(ie stream.spent_in) let swap_fee = Decimal256::from_ratio(stream_state.spent_in, Uint128::one()) - .checked_mul(controller_params.exit_fee_percent)? - * Uint256::one(); + .checked_mul(controller_params.exit_fee_percent)?.to_uint_floor(); // extract swap_fee from last amount creator_revenue = creator_revenue.checked_sub(swap_fee)?; @@ -514,7 +514,7 @@ pub fn execute_finalize_stream( // execute post stream actions let post_stream_actions = POST_STREAM.may_load(deps.storage)?; if let Some(post_stream_actions) = post_stream_actions { - // if pool config and create pool is set, create a pool for the stream + // if pool config.toml and create pool is set, create a pool for the stream creator_revenue = match (post_stream_actions.pool_config, create_pool) { (Some(pool_config), Some(create_pool)) => { let (msgs, attrs, creator_revenue) = pool_operations( @@ -650,8 +650,7 @@ pub fn execute_exit_stream( // Swap fee = fixed_rate*position.spent_in this calculation is only for execution reply attributes let swap_fee = Decimal256::from_ratio(position.spent, Uint128::one()) - .checked_mul(controller_params.exit_fee_percent)? - * Uint256::one(); + .checked_mul(controller_params.exit_fee_percent)?.to_uint_floor(); let mut messages: Vec = vec![]; let mut attributes: Vec = vec![]; diff --git a/contracts/stream/src/error.rs b/contracts/stream/src/error.rs index 978a3a0e..5ed2b99b 100644 --- a/contracts/stream/src/error.rs +++ b/contracts/stream/src/error.rs @@ -52,7 +52,7 @@ pub enum ContractError { #[error("Required denom not found in funds")] NoFundsSent {}, - #[error("In_denom does not match config")] + #[error("In_denom does not match config.toml")] InDenomIsNotAccepted {}, #[error("Out_denom can not be the same as in_denom")] @@ -148,12 +148,12 @@ pub enum ContractError { #[error("Operation not allowed in ths current state {current_status}")] OperationNotAllowed { current_status: String }, - #[error("Pool config not provided")] + #[error("Pool config.toml not provided")] PoolConfigNotProvided {}, #[error("Create pool not provided")] CreatePoolNotProvided {}, - #[error("Invalid pool config")] + #[error("Invalid pool config.toml")] InvalidPoolConfig {}, } diff --git a/contracts/stream/src/pool.rs b/contracts/stream/src/pool.rs index 16918353..859295ba 100644 --- a/contracts/stream/src/pool.rs +++ b/contracts/stream/src/pool.rs @@ -82,7 +82,7 @@ pub fn calculate_in_amount_clp( let ratio = Decimal256::from_ratio(pool_out_amount, out_amount); let dec_creators_revenue = Decimal256::from_ratio(creators_revenue, Uint256::from(1u64)); let dec_clp_amount = ratio * dec_creators_revenue; - dec_clp_amount * Uint256::from(1u64) + dec_clp_amount.to_uint_floor() } /// This function is used to build the MsgCreatePosition for the initial pool position diff --git a/contracts/stream/src/vesting.rs b/contracts/stream/src/vesting.rs index 89b4cd0b..fc55ee8b 100644 --- a/contracts/stream/src/vesting.rs +++ b/contracts/stream/src/vesting.rs @@ -1,8 +1,5 @@ use crate::ContractError; -use cosmwasm_std::{ - attr, coin, to_json_binary, Addr, Attribute, Binary, CosmosMsg, DepsMut, HexBinary, Timestamp, - Uint128, WasmMsg, -}; +use cosmwasm_std::{attr, coin, to_json_binary, Addr, Attribute, Binary, Checksum, CosmosMsg, DepsMut, Timestamp, WasmMsg}; use cw_vesting::msg::InstantiateMsg as VestingInstantiateMsg; use cw_vesting::UncheckedDenom; use streamswap_types::controller::VestingConfig; @@ -10,12 +7,12 @@ use streamswap_types::controller::VestingConfig; pub fn vesting_operations( deps: &DepsMut, stream_addr: Addr, - vesting_checksum: HexBinary, + vesting_checksum: Checksum, recipient: Addr, salt: Option, start_time: Timestamp, vesting_code_id: u64, - amount: Uint128, + amount: cosmwasm_std::Uint128, denom: String, vesting_config: VestingConfig, ) -> Result<(Vec, Vec, Addr), ContractError> { diff --git a/packages/types/Cargo.toml b/packages/types/Cargo.toml index efce613b..a4696f25 100644 --- a/packages/types/Cargo.toml +++ b/packages/types/Cargo.toml @@ -11,7 +11,6 @@ homepage = { workspace = true } [features] # for quicker tests, cargo test --lib # for more explicit tests, cargo test --features=backtraces -backtraces = ["cosmwasm-std/backtraces"] interface = ["dep:cw-orch"] [lints] diff --git a/packages/types/src/stream/threshold.rs b/packages/types/src/stream/threshold.rs index 7e3a63e1..64353178 100644 --- a/packages/types/src/stream/threshold.rs +++ b/packages/types/src/stream/threshold.rs @@ -6,9 +6,9 @@ pub type Threshold = Uint256; pub const THRESHOLDS_STATE_KEY: &str = "thresholds"; -pub struct ThresholdState<'a>(Item<'a, Threshold>); +pub struct ThresholdState(Item); -impl<'a> ThresholdState<'a> { +impl ThresholdState { pub fn new() -> Self { ThresholdState(Item::new(THRESHOLDS_STATE_KEY)) } @@ -74,7 +74,7 @@ impl<'a> ThresholdState<'a> { } } -impl<'a> Default for ThresholdState<'a> { +impl Default for ThresholdState { fn default() -> Self { ThresholdState::new() } diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index 28b2e350..94587ab6 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -10,8 +10,6 @@ homepage = { workspace = true } [features] # for quicker tests, cargo test --lib -# for more explicit tests, cargo test --features=backtraces -backtraces = ["cosmwasm-std/backtraces"] [lints] workspace = true diff --git a/tests/Cargo.toml b/tests/Cargo.toml index f2baddd1..af854ab2 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -9,8 +9,6 @@ license = { workspace = true } [lib] doctest = false [features] -# for more explicit tests, cargo test --features=backtraces -backtraces = ["cosmwasm-std/backtraces"] [lints] workspace = true