diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/.github/workflows/Basic.yml b/.github/workflows/Basic.yml index 97bbec7e..28d6d42f 100644 --- a/.github/workflows/Basic.yml +++ b/.github/workflows/Basic.yml @@ -24,7 +24,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.73.0 + toolchain: 1.78.0 target: wasm32-unknown-unknown override: true @@ -41,7 +41,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: unit-test - toolchain: 1.73.0 + toolchain: 1.78.0 args: --locked env: RUST_BACKTRACE: 1 @@ -65,7 +65,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.73.0 + toolchain: 1.78.0 override: true components: rustfmt, clippy @@ -73,12 +73,12 @@ jobs: uses: actions-rs/cargo@v1 with: command: fmt - toolchain: 1.73.0 + toolchain: 1.78.0 args: --all -- --check - name: Run cargo clippy uses: actions-rs/cargo@v1 with: command: clippy - toolchain: 1.73.0 + toolchain: 1.78.0 args: -- -D warnings diff --git a/Cargo.lock b/Cargo.lock index d20fd316..35e76fe9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -55,26 +55,11 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "ark-bls12-381" @@ -119,7 +104,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits", "paste", "rayon", @@ -143,7 +128,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -172,7 +157,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint 0.4.5", + "num-bigint 0.4.6", ] [[package]] @@ -209,32 +194,32 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] name = "atomic-order-example" version = "0.2.0" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std 1.5.2", + "cosmwasm-schema 1.5.5", + "cosmwasm-std 2.1.1", "cosmwasm-storage", - "cw-multi-test", - "cw-storage-plus 1.2.0", - "cw-utils 0.16.0", - "cw2 0.16.0", - "injective-cosmwasm 0.2.24", - "injective-math 0.2.4", - "injective-protobuf", - "protobuf 2.28.0", + "cw-multi-test 0.16.5", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", + "cw2 2.0.0", + "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-std 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "prost 0.12.6", "schemars", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] @@ -257,9 +242,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -343,9 +328,9 @@ dependencies = [ [[package]] name = "bip32" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164" +checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b" dependencies = [ "bs58", "hmac", @@ -365,9 +350,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -422,18 +407,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "cc" -version = "1.0.97" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cexpr" @@ -456,19 +441,14 @@ version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", "num-traits", - "wasm-bindgen", - "windows-targets 0.52.5", ] [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -536,8 +516,8 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32560304ab4c365791fd307282f76637213d8083c1a98490c35159cd67852237" dependencies = [ - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "tendermint-proto 0.34.1", ] @@ -553,8 +533,8 @@ dependencies = [ "eyre", "k256 0.13.3", "rand_core 0.6.4", - "serde 1.0.202", - "serde_json 1.0.117", + "serde 1.0.204", + "serde_json 1.0.122", "signature 2.2.0", "subtle-encoding", "tendermint", @@ -622,7 +602,7 @@ checksum = "c10510e8eb66cf7e109741b1e2c76ad18f30b5a1daa064f5f7115c1f733aaea0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -631,10 +611,23 @@ version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7879036156092ad1c22fe0d7316efc5a5eceec2bc3906462a2560215f2a2f929" dependencies = [ - "cosmwasm-schema-derive", + "cosmwasm-schema-derive 1.5.5", "schemars", - "serde 1.0.202", - "serde_json 1.0.117", + "serde 1.0.204", + "serde_json 1.0.122", + "thiserror", +] + +[[package]] +name = "cosmwasm-schema" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79879b6b7ef6a331b05030ce91ce46a7c4b0baf1ed6b382cce2e9a168109380" +dependencies = [ + "cosmwasm-schema-derive 2.1.1", + "schemars", + "serde 1.0.204", + "serde_json 1.0.122", "thiserror", ] @@ -649,6 +642,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cosmwasm-schema-derive" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b53e33c0e97170c7ac9cb440f4bc599a07f9cbb9b7e87916cca37b1239d57b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "cosmwasm-std" version = "1.5.2" @@ -664,7 +668,7 @@ dependencies = [ "forward_ref", "hex", "schemars", - "serde 1.0.202", + "serde 1.0.204", "serde-json-wasm 0.5.2", "sha2 0.10.8", "static_assertions 1.1.0", @@ -687,7 +691,7 @@ dependencies = [ "hex", "rand_core 0.6.4", "schemars", - "serde 1.0.202", + "serde 1.0.204", "serde-json-wasm 1.0.1", "sha2 0.10.8", "static_assertions 1.1.0", @@ -701,7 +705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66de2ab9db04757bcedef2b5984fbe536903ada4a8a9766717a4a71197ef34f6" dependencies = [ "cosmwasm-std 1.5.2", - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -815,7 +819,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -846,19 +850,28 @@ dependencies = [ "k256 0.11.6", "prost 0.9.0", "schemars", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] [[package]] -name = "cw-storage-plus" -version = "0.16.0" +name = "cw-multi-test" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b6f91c0b94481a3e9ef1ceb183c37d00764f8751e39b45fc09f4d9b970d469" +checksum = "e0034bfb4c06dfc8b50f0b1a06c3fc0f2312a1bae568a97db65930de071288ba" dependencies = [ - "cosmwasm-std 1.5.2", + "anyhow", + "bech32 0.11.0", + "cosmwasm-std 2.1.1", + "cw-storage-plus 2.0.0", + "cw-utils 2.0.0", + "derivative", + "itertools 0.13.0", + "prost 0.12.6", "schemars", - "serde 1.0.202", + "serde 1.0.204", + "sha2 0.10.8", + "thiserror", ] [[package]] @@ -869,7 +882,7 @@ checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c" dependencies = [ "cosmwasm-std 1.5.2", "schemars", - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -880,72 +893,72 @@ checksum = "f13360e9007f51998d42b1bc6b7fa0141f74feae61ed5fd1e5b0a89eec7b5de1" dependencies = [ "cosmwasm-std 2.1.1", "schemars", - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "cw-utils" -version = "0.16.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a84c6c1c0acc3616398eba50783934bd6c964bad6974241eaee3460c8f5b26" +checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c" dependencies = [ - "cosmwasm-schema", + "cosmwasm-schema 1.5.5", "cosmwasm-std 1.5.2", - "cw2 0.16.0", + "cw2 1.1.2", "schemars", "semver", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] [[package]] name = "cw-utils" -version = "1.0.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c" +checksum = "07dfee7f12f802431a856984a32bce1cb7da1e6c006b5409e3981035ce562dec" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std 1.5.2", - "cw2 1.1.2", + "cosmwasm-schema 2.1.1", + "cosmwasm-std 2.1.1", "schemars", - "semver", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] [[package]] name = "cw2" -version = "0.16.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91398113b806f4d2a8d5f8d05684704a20ffd5968bf87e3473e1973710b884ad" +checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa" dependencies = [ - "cosmwasm-schema", + "cosmwasm-schema 1.5.5", "cosmwasm-std 1.5.2", - "cw-storage-plus 0.16.0", + "cw-storage-plus 1.2.0", "schemars", - "serde 1.0.202", + "semver", + "serde 1.0.204", + "thiserror", ] [[package]] name = "cw2" -version = "1.1.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa" +checksum = "b04852cd38f044c0751259d5f78255d07590d136b8a86d4e09efdd7666bd6d27" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std 1.5.2", - "cw-storage-plus 1.2.0", + "cosmwasm-schema 2.1.1", + "cosmwasm-std 2.1.1", + "cw-storage-plus 2.0.0", "schemars", "semver", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -953,26 +966,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -1017,22 +1030,22 @@ dependencies = [ [[package]] name = "derive_more" -version = "1.0.0-beta.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "1.0.0-beta.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", "unicode-xid", ] @@ -1067,12 +1080,12 @@ checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d" name = "dummy" version = "1.1.0" dependencies = [ - "cosmwasm-std 1.5.2", - "cw-storage-plus 1.2.0", - "cw2 0.16.0", - "injective-cosmwasm 0.2.24", + "cosmwasm-std 2.1.1", + "cw-storage-plus 2.0.0", + "cw2 2.0.0", + "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "schemars", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] @@ -1141,7 +1154,7 @@ dependencies = [ "hashbrown 0.12.3", "hex", "rand_core 0.6.4", - "serde 1.0.202", + "serde 1.0.204", "sha2 0.9.9", "zeroize", ] @@ -1163,9 +1176,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1217,23 +1230,23 @@ dependencies = [ [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -1288,7 +1301,7 @@ dependencies = [ "ethbloom", "ethereum-types-serialize", "fixed-hash 0.3.2", - "serde 1.0.202", + "serde 1.0.204", "uint 0.5.0", ] @@ -1298,7 +1311,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1873d77b32bc1891a79dad925f2acbc318ee942b38b9110f9dbc5fbeffcea350" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -1476,9 +1489,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1489,9 +1502,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1533,7 +1546,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -1598,7 +1611,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -1643,9 +1656,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1661,9 +1674,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1697,29 +1710,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1751,7 +1741,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -1772,9 +1762,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1782,37 +1772,37 @@ dependencies = [ [[package]] name = "injective-cosmwasm" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f85e8f06d04d0e20d59d673ae242c5cffb6a13f3b5189fd2e95ea153f3066f52" +version = "0.3.0" dependencies = [ - "cosmwasm-std 1.5.2", - "cw-storage-plus 1.2.0", + "cosmwasm-schema 1.5.5", + "cosmwasm-std 2.1.1", + "cw-storage-plus 2.0.0", "ethereum-types", "hex", - "injective-math 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "schemars", - "serde 1.0.202", + "serde 1.0.204", + "serde-json-wasm 1.0.1", "serde_repr", + "serde_test", "subtle-encoding", "tiny-keccak", ] [[package]] name = "injective-cosmwasm" -version = "0.2.24" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e93e9438844b10add3eb40ed1e8c92689824ac080d207f856412a73551c221" dependencies = [ - "cosmwasm-schema", "cosmwasm-std 2.1.1", "cw-storage-plus 2.0.0", "ethereum-types", "hex", - "injective-math 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "schemars", - "serde 1.0.202", - "serde-json-wasm 1.0.1", + "serde 1.0.204", "serde_repr", - "serde_test", "subtle-encoding", "tiny-keccak", ] @@ -1822,92 +1812,90 @@ name = "injective-cosmwasm-mock" version = "1.0.0" dependencies = [ "cosmos-sdk-proto", - "cosmwasm-schema", - "cosmwasm-std 1.5.2", - "cw-storage-plus 1.2.0", - "cw2 0.16.0", - "injective-cosmwasm 0.2.24", - "injective-math 0.2.4", - "injective-protobuf", - "injective-std 0.1.7", + "cosmwasm-schema 1.5.5", + "cosmwasm-std 2.1.1", + "cw-storage-plus 2.0.0", + "cw2 2.0.0", + "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-std 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "injective-test-tube", - "injective-testing 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "prost 0.12.4", - "protobuf 3.4.0", + "injective-testing 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "prost 0.12.6", "schemars", - "serde 1.0.202", + "serde 1.0.204", "thiserror", ] [[package]] name = "injective-math" -version = "0.2.4" +version = "0.3.0" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std 1.5.2", + "cosmwasm-schema 1.5.5", + "cosmwasm-std 2.1.1", "ethereum-types", "primitive-types", "schemars", - "serde 1.0.202", + "serde 1.0.204", "subtle-encoding", ] [[package]] name = "injective-math" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4e31ffb7dff274e0be1117bc8f1240f6572d6157be2c4daf13ff82eaaddd85" +checksum = "194fb5cb49537b0b9137d02a563b7019003220fb4affff05ad6cdc6fee3509c9" dependencies = [ - "cosmwasm-std 1.5.2", + "cosmwasm-std 2.1.1", "ethereum-types", "primitive-types", "schemars", - "serde 1.0.202", + "serde 1.0.204", "subtle-encoding", ] [[package]] name = "injective-protobuf" -version = "0.2.2" +version = "0.3.0" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std 1.5.2", + "cosmwasm-schema 1.5.5", + "cosmwasm-std 2.1.1", "ethereum-types", "num 0.4.3", - "protobuf 2.28.0", + "protobuf", "protobuf-codegen-pure", "schemars", - "serde 1.0.202", + "serde 1.0.204", "subtle-encoding", ] [[package]] name = "injective-std" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d7b7114796e44b034355983cb1ee2a1c9d1843df17c9552126e4404d463c06" +version = "1.13.0" dependencies = [ "chrono", - "cosmwasm-std 1.5.2", - "osmosis-std-derive", - "prost 0.12.4", - "prost-types 0.12.4", + "cosmwasm-std 2.1.1", + "injective-std-derive 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "prost 0.12.6", + "prost-types 0.12.6", "schemars", - "serde 1.0.202", + "serde 1.0.204", "serde-cw-value", ] [[package]] name = "injective-std" version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0e5193cb9520754f60b9e9af08a662ddf298d2e1a579200b9a447064b64db8b" dependencies = [ "chrono", "cosmwasm-std 2.1.1", "injective-std-derive 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "schemars", - "serde 1.0.202", + "serde 1.0.204", "serde-cw-value", ] @@ -1918,9 +1906,9 @@ dependencies = [ "cosmwasm-std 2.1.1", "itertools 0.10.5", "proc-macro2", - "prost 0.12.4", + "prost 0.12.6", "quote", - "serde 1.0.202", + "serde 1.0.204", "syn 1.0.109", "trybuild", ] @@ -1940,55 +1928,55 @@ dependencies = [ [[package]] name = "injective-test-tube" -version = "1.1.8" +version = "1.13.0-1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9204a77e307f25334dbb02b0798fb4efd1249bcbaac9a497fe5de3a00bdd4acd" +checksum = "c4c7836812f2797d1ddba6c83d56a9c1b7c2eeef9b1771767556941af9959f34" dependencies = [ "base64 0.21.7", "bindgen", "cosmrs", - "cosmwasm-std 1.5.2", + "cosmwasm-std 2.1.1", "hex", - "injective-cosmwasm 0.2.22", - "injective-std 0.1.7", - "prost 0.12.4", - "serde 1.0.202", - "serde_json 1.0.117", + "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-std 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "prost 0.12.6", + "serde 1.0.204", + "serde_json 1.0.122", "test-tube-inj", "thiserror", ] [[package]] name = "injective-testing" -version = "0.1.6" +version = "0.2.1" dependencies = [ "anyhow", "base64 0.13.1", - "cosmwasm-std 1.5.2", - "cw-multi-test", - "injective-cosmwasm 0.2.24", - "injective-math 0.2.4", + "cosmwasm-std 2.1.1", + "cw-multi-test 2.1.0", + "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6", "secp256k1", - "serde 1.0.202", + "serde 1.0.204", "tiny-keccak", ] [[package]] name = "injective-testing" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49dc1d881d0b7726745ed776a87d1e6f93e877d2d5ebd0fe8be759f5424a091a" +checksum = "cc7fac0e025e0755fad2a3e9f6fbbb052fc0cbff9517b74c7d9cd2076d0aee2e" dependencies = [ "anyhow", "base64 0.13.1", - "cosmwasm-std 1.5.2", - "cw-multi-test", - "injective-cosmwasm 0.2.22", - "injective-math 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cosmwasm-std 2.1.1", + "cw-multi-test 2.1.0", + "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6", "secp256k1", - "serde 1.0.202", + "serde 1.0.204", "tiny-keccak", ] @@ -2016,6 +2004,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2059,9 +2056,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2071,18 +2068,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2093,15 +2090,15 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -2117,22 +2114,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2171,7 +2169,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-complex 0.4.6", "num-integer", "num-iter", @@ -2193,9 +2191,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -2275,7 +2273,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits", ] @@ -2289,21 +2287,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -2338,19 +2326,6 @@ version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ebdfd1bc8ed04db596e110c6baa9b174b04f6ed1ec22c666ddc5cb3fa91bd7" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -2377,9 +2352,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "peg" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a625d12ad770914cbf7eff6f9314c3ef803bfe364a1b20bc36ddf56673e71e5" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" dependencies = [ "peg-macros", "peg-runtime", @@ -2387,9 +2362,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" dependencies = [ "peg-runtime", "proc-macro2", @@ -2425,7 +2400,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -2468,9 +2443,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "primeorder" @@ -2493,9 +2471,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2522,12 +2500,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -2558,15 +2536,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -2580,11 +2558,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -2596,24 +2574,13 @@ dependencies = [ "bytes", ] -[[package]] -name = "protobuf" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" -dependencies = [ - "once_cell", - "protobuf-support", - "thiserror", -] - [[package]] name = "protobuf-codegen" version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" dependencies = [ - "protobuf 2.28.0", + "protobuf", ] [[package]] @@ -2622,19 +2589,10 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865" dependencies = [ - "protobuf 2.28.0", + "protobuf", "protobuf-codegen", ] -[[package]] -name = "protobuf-support" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" -dependencies = [ - "thiserror", -] - [[package]] name = "quote" version = "1.0.36" @@ -2762,9 +2720,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2774,9 +2732,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2785,9 +2743,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -2815,8 +2773,8 @@ dependencies = [ "rustls", "rustls-native-certs", "rustls-pemfile", - "serde 1.0.202", - "serde_json 1.0.117", + "serde 1.0.204", + "serde_json 1.0.122", "serde_urlencoded", "sync_wrapper", "system-configuration", @@ -2923,7 +2881,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2999,27 +2957,27 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "enumset", "schemars_derive", - "serde 1.0.202", - "serde_json 1.0.117", + "serde 1.0.204", + "serde_json 1.0.122", ] [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -3077,11 +3035,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3090,9 +3048,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3115,9 +3073,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -3128,7 +3086,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -3137,7 +3095,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -3146,27 +3104,27 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -3177,7 +3135,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -3192,13 +3150,14 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -3209,7 +3168,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -3218,16 +3177,16 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "serde_test" -version = "1.0.176" +version = "1.0.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" +checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -3239,7 +3198,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.202", + "serde 1.0.204", ] [[package]] @@ -3357,9 +3316,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subtle-encoding" @@ -3389,9 +3348,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.64" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3440,12 +3399,12 @@ dependencies = [ "k256 0.13.3", "num-traits", "once_cell", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "ripemd", - "serde 1.0.202", + "serde 1.0.204", "serde_bytes", - "serde_json 1.0.117", + "serde_json 1.0.122", "serde_repr", "sha2 0.10.8", "signature 2.2.0", @@ -3463,8 +3422,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1a02da769166e2052cd537b1a97c78017632c2d9e19266367b27e73910434fc" dependencies = [ "flex-error", - "serde 1.0.202", - "serde_json 1.0.117", + "serde 1.0.204", + "serde_json 1.0.122", "tendermint", "toml 0.5.11", "url", @@ -3482,7 +3441,7 @@ dependencies = [ "num-traits", "prost 0.11.9", "prost-types 0.11.9", - "serde 1.0.202", + "serde 1.0.204", "serde_bytes", "subtle-encoding", "time", @@ -3498,9 +3457,9 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.12.4", - "prost-types 0.12.4", - "serde 1.0.202", + "prost 0.12.6", + "prost-types 0.12.6", + "serde 1.0.204", "serde_bytes", "subtle-encoding", "time", @@ -3522,9 +3481,9 @@ dependencies = [ "rand 0.8.5", "reqwest", "semver", - "serde 1.0.202", + "serde 1.0.204", "serde_bytes", - "serde_json 1.0.117", + "serde_json 1.0.122", "subtle", "subtle-encoding", "tendermint", @@ -3550,16 +3509,16 @@ dependencies = [ [[package]] name = "test-tube-inj" -version = "1.1.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751b40929081e03c825df424a5a81645f2cea444654d96f0aad962f7be4e541e" +checksum = "3c3a4e34619e6417613fab682de9a196848f4a56653ac71b95b5860b6d87c7cd" dependencies = [ "base64 0.21.7", "cosmrs", - "cosmwasm-std 1.5.2", - "prost 0.12.4", - "serde 1.0.202", - "serde_json 1.0.117", + "cosmwasm-std 2.1.1", + "prost 0.12.6", + "serde 1.0.204", + "serde_json 1.0.122", "tendermint-proto 0.32.2", "thiserror", ] @@ -3572,22 +3531,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -3599,7 +3558,7 @@ dependencies = [ "deranged", "num-conv", "powerfmt", - "serde 1.0.202", + "serde 1.0.204", "time-core", "time-macros", ] @@ -3631,9 +3590,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -3646,30 +3605,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] @@ -3701,16 +3659,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "toml" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a44eede9b727419af8095cb2d72fab15487a541f54647ad4414b34096ee4631" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", "serde_spanned", "toml_datetime", "toml_edit", @@ -3722,17 +3680,17 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ - "serde 1.0.202", + "serde 1.0.204", ] [[package]] name = "toml_edit" -version = "0.22.18" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1490595c74d930da779e944f5ba2ecdf538af67df1a9848cbd156af43c1b7cf0" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", - "serde 1.0.202", + "indexmap 2.3.0", + "serde 1.0.204", "serde_spanned", "toml_datetime", "winnow", @@ -3771,17 +3729,17 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55265878356bdd85c9baa15859c87de93b2bf1f33acf752040a561e4a228f62" +checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8" dependencies = [ "dissimilar", "glob", - "serde 1.0.202", + "serde 1.0.204", "serde_derive", - "serde_json 1.0.117", + "serde_json 1.0.122", "termcolor", - "toml 0.8.17", + "toml 0.8.19", ] [[package]] @@ -3849,9 +3807,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3860,15 +3818,15 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3916,7 +3874,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -3950,7 +3908,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4001,11 +3959,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4014,15 +3972,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.5", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -4038,7 +3987,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4058,18 +4016,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4080,9 +4038,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4092,9 +4050,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4104,15 +4062,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4122,9 +4080,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4134,9 +4092,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4146,9 +4104,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4158,15 +4116,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.16" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -4187,6 +4145,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -4198,14 +4157,14 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -4218,5 +4177,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.64", + "syn 2.0.72", ] diff --git a/contracts/atomic-order-example/.cargo/config b/contracts/atomic-order-example/.cargo/config.toml similarity index 100% rename from contracts/atomic-order-example/.cargo/config rename to contracts/atomic-order-example/.cargo/config.toml diff --git a/contracts/atomic-order-example/Cargo.toml b/contracts/atomic-order-example/Cargo.toml index 4a2ab553..4e19206f 100644 --- a/contracts/atomic-order-example/Cargo.toml +++ b/contracts/atomic-order-example/Cargo.toml @@ -16,8 +16,6 @@ exclude = [ 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 = [ ] @@ -29,15 +27,15 @@ optimize = """docker run --rm -v "$(pwd)":/code \ """ [dependencies] -cosmwasm-std = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] } -cosmwasm-storage = { version = "1.5.0", features = [ "iterator" ] } -cw-storage-plus = { version = "1.2.0" } -cw-utils = { version = "0.16.0" } -cw2 = { version = "0.16.0" } -injective-cosmwasm = { version = "0.2.23-rc1", path = "../../packages/injective-cosmwasm" } -injective-math = { version = "0.2.4", path = "../../packages/injective-math" } -injective-protobuf = { version = "0.2.2", path = "../../packages/injective-protobuf" } -protobuf = { version = "2.28.0", features = [ "with-bytes" ] } +cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } +cosmwasm-storage = { version = "1.5.2", features = [ "iterator" ] } +cw-storage-plus = { version = "2.0.0" } +cw-utils = { version = "2.0.0" } +cw2 = { version = "2.0.0" } +injective-cosmwasm = { version = "0.3.0" } +injective-math = { version = "0.3.0" } +injective-std = { version = "1.13.0" } +prost = { version = "0.12.6" } schemars = { version = "0.8.8", features = [ "enumset" ] } serde = { version = "1.0.137", default-features = false, features = [ "derive" ] } thiserror = { version = "1.0.31" } diff --git a/contracts/atomic-order-example/src/contract.rs b/contracts/atomic-order-example/src/contract.rs index 512f8f61..841094b4 100644 --- a/contracts/atomic-order-example/src/contract.rs +++ b/contracts/atomic-order-example/src/contract.rs @@ -2,17 +2,15 @@ use cosmwasm_std::entry_point; use cosmwasm_std::{BankMsg, Coin, DepsMut, Env, MessageInfo, Reply, Response, SubMsg, Uint128}; use cw2::set_contract_version; -use protobuf::Message; -use std::str::FromStr; - -use serde::{Deserialize, Serialize}; - use injective_cosmwasm::{ create_spot_market_order_msg, get_default_subaccount_id_for_checked_address, InjectiveMsgWrapper, InjectiveQuerier, InjectiveQueryWrapper, OrderType, SpotOrder, }; use injective_math::FPDecimal; -use injective_protobuf::proto::tx; +use injective_std::types::injective::exchange::v1beta1 as Exchange; +use prost::Message; +use serde::{Deserialize, Serialize}; +use std::str::FromStr; use crate::error::ContractError; use crate::msg::{ExecuteMsg, InstantiateMsg}; @@ -149,29 +147,30 @@ fn handle_atomic_order_reply( ) -> Result, ContractError> { let dec_scale_factor: FPDecimal = FPDecimal::from(1000000000000000000_i128); let id = msg.id; - let order_response: tx::MsgCreateSpotMarketOrderResponse = Message::parse_from_bytes( - msg.result - .into_result() - .map_err(ContractError::SubMsgFailure)? - .data - .ok_or_else(|| ContractError::ReplyParseFailure { - id, - err: "Missing reply data".to_owned(), - })? - .as_slice(), + + let binding = msg + .result + .into_result() + .map_err(ContractError::SubMsgFailure) + .unwrap(); + + deps.api.debug(">>>>>>>>>>"); + let first_messsage = binding.msg_responses.first(); + + let order_response = Exchange::MsgCreateSpotMarketOrderResponse::decode( + first_messsage.unwrap().value.as_slice(), ) .map_err(|err| ContractError::ReplyParseFailure { id, err: err.to_string(), - })?; - - // unwrap results into trade_data - let trade_data = match order_response.results.into_option() { - Some(trade_data) => Ok(trade_data), - None => Err(ContractError::CustomError { - val: "No trade data in order response".to_string(), - }), - }?; + }) + .unwrap(); + + let trade_data = order_response + .results + .ok_or_else(|| ContractError::SubMsgFailure("No trade data".to_owned())) + .unwrap(); + let quantity = FPDecimal::from_str(&trade_data.quantity)? / dec_scale_factor; let price = FPDecimal::from_str(&trade_data.price)? / dec_scale_factor; let fee = FPDecimal::from_str(&trade_data.fee)? / dec_scale_factor; diff --git a/contracts/atomic-order-example/src/tests.rs b/contracts/atomic-order-example/src/tests.rs index 7dc618c7..5c91e1a7 100644 --- a/contracts/atomic-order-example/src/tests.rs +++ b/contracts/atomic-order-example/src/tests.rs @@ -1,9 +1,9 @@ use std::str::FromStr; -use cosmwasm_std::testing::{mock_info, MockApi, MockStorage}; +use cosmwasm_std::testing::{message_info, MockApi, MockStorage}; use cosmwasm_std::{ - coins, to_json_binary, BankMsg, Binary, ContractResult, CosmosMsg, OwnedDeps, QuerierResult, - Reply, SubMsgResponse, SubMsgResult, SystemResult, Uint128, + coins, to_json_binary, Addr, BankMsg, Binary, ContractResult, CosmosMsg, MsgResponse, + OwnedDeps, QuerierResult, Reply, SubMsgResponse, SubMsgResult, SystemResult, Uint128, }; use injective_cosmwasm::InjectiveMsg::CreateSpotMarketOrder; @@ -33,7 +33,7 @@ fn proper_initialization() { ) .expect("failed to create market_id"), }; - let info = mock_info(sender_addr, &coins(1000, "earth")); + let info = message_info(&Addr::unchecked(sender_addr), &coins(1000, "earth")); // we can just call .unwrap() to assert this was a success let res = instantiate(test_deps().as_mut_deps(), inj_mock_env(), info, msg).unwrap(); @@ -52,12 +52,12 @@ fn test_swap() { let msg = InstantiateMsg { market_id: market_id.clone(), }; - let info = mock_info(contract_addr, &coins(1000, "earth")); + let info = message_info(&Addr::unchecked(contract_addr), &coins(1000, "earth")); let mut deps = test_deps(); let env = inj_mock_env(); let _ = instantiate(deps.as_mut_deps(), env.clone(), info, msg); - let info = mock_info(sender_addr, &coins(9000, "usdt")); + let info = message_info(&Addr::unchecked(sender_addr), &coins(9000, "usdt")); let msg = ExecuteMsg::SwapSpot { quantity: i32_to_dec(8), price: i32_to_dec(1000), @@ -96,12 +96,20 @@ fn test_swap() { ); let binary_response = Binary::from_base64("CkIweGRkNzI5MmY2ODcwMzIwOTc2YTUxYTUwODBiMGQ2NDU5M2NhZjE3OWViM2YxOTNjZWVlZGFiNGVhNWUxNDljZWISQwoTODAwMDAwMDAwMDAwMDAwMDAwMBIWMTAwMDAwMDAwMDAwMDAwMDAwMDAwMBoUMzYwMDAwMDAwMDAwMDAwMDAwMDA=").unwrap(); + #[allow(deprecated)] let reply_msg = Reply { id: ATOMIC_ORDER_REPLY_ID, result: SubMsgResult::Ok(SubMsgResponse { events: vec![], - data: Some(binary_response), + data: None, + msg_responses: vec![MsgResponse { + type_url: "/injective.exchange.v1beta1.MsgCreateSpotMarketOrderResponse" + .to_string(), + value: binary_response, + }], }), + payload: Binary::default(), + gas_used: 0, }; let transfers_response = reply(deps.as_mut_deps(), inj_mock_env(), reply_msg); diff --git a/contracts/dummy/Cargo.toml b/contracts/dummy/Cargo.toml index 53f58500..cdd2cc14 100644 --- a/contracts/dummy/Cargo.toml +++ b/contracts/dummy/Cargo.toml @@ -16,8 +16,6 @@ exclude = [ 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 = [ ] @@ -29,10 +27,10 @@ optimize = """docker run --rm -v "$(pwd)":/code \ """ [dependencies] -cosmwasm-std = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] } -cw-storage-plus = { version = "1.2.0" } -cw2 = { version = "0.16.0" } -injective-cosmwasm = { version = "0.2.23-rc1", path = "../../packages/injective-cosmwasm" } +cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } +cw-storage-plus = { version = "2.0.0" } +cw2 = { version = "2.0.0" } +injective-cosmwasm = { version = "0.3.0" } schemars = "0.8.8" serde = { version = "1.0.136", default-features = false, features = [ "derive" ] } thiserror = { version = "1.0.30" } diff --git a/contracts/dummy/src/mock_pyth_attestation.rs b/contracts/dummy/src/mock_pyth_attestation.rs index 1359b7d6..b1246ad1 100644 --- a/contracts/dummy/src/mock_pyth_attestation.rs +++ b/contracts/dummy/src/mock_pyth_attestation.rs @@ -45,8 +45,10 @@ pub fn execute_trigger_pyth_update( mod tests { use std::marker::PhantomData; - use cosmwasm_std::testing::{mock_env, mock_info, MockApi, MockStorage}; - use cosmwasm_std::{Api, CustomQuery, DepsMut, OwnedDeps, Querier, QuerierWrapper, Storage}; + use cosmwasm_std::testing::{message_info, mock_env, MockApi, MockStorage}; + use cosmwasm_std::{ + Addr, Api, CustomQuery, DepsMut, OwnedDeps, Querier, QuerierWrapper, Storage, + }; use injective_cosmwasm::{InjectiveQueryWrapper, WasmMockQuerier}; @@ -58,7 +60,7 @@ mod tests { let sender_addr = "inj1x2ck0ql2ngyxqtw8jteyc0tchwnwxv7npaungt"; let msg = ExecuteMsg::TriggerPythUpdate { price: 10000 }; - let info = mock_info(sender_addr, &[]); + let info = message_info(&Addr::unchecked(sender_addr), &[]); let env = mock_env(); let res = execute(inj_mock_deps().as_mut_deps(), env, info, msg); assert!(res.is_ok()) diff --git a/contracts/injective-cosmwasm-mock/.cargo/config b/contracts/injective-cosmwasm-mock/.cargo/config.toml similarity index 100% rename from contracts/injective-cosmwasm-mock/.cargo/config rename to contracts/injective-cosmwasm-mock/.cargo/config.toml diff --git a/contracts/injective-cosmwasm-mock/Cargo.lock b/contracts/injective-cosmwasm-mock/Cargo.lock deleted file mode 100644 index c9737778..00000000 --- a/contracts/injective-cosmwasm-mock/Cargo.lock +++ /dev/null @@ -1,596 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "const-oid" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c32f031ea41b4291d695026c023b95d59db2d8a2c7640800ed56bc8f510f22" - -[[package]] -name = "cosmwasm-crypto" -version = "1.0.0-beta4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f903ebbabc0d4880dbc76148efb8be8fc29fa4bf294c440c3d70da1c8bcafff7" -dependencies = [ - "digest", - "ed25519-zebra", - "k256", - "rand_core 0.5.1", - "thiserror", -] - -[[package]] -name = "cosmwasm-derive" -version = "1.0.0-beta4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832bebef577ecb394603de8e2bf0de429b74aa364e17dec18e15ce37e71b0cae" -dependencies = [ - "syn", -] - -[[package]] -name = "cosmwasm-schema" -version = "1.0.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4b3f6933f94acdd3ddb931af4870c2002e3331a4a8b247a4ef070dd31ccb0" -dependencies = [ - "schemars", - "serde_json", -] - -[[package]] -name = "cosmwasm-std" -version = "1.0.0-beta4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6238c45840cc9de5a39f0f619e3a4f7c38c5d2c6ac9e3e4d72751ee045e6d7da" -dependencies = [ - "base64", - "cosmwasm-crypto", - "cosmwasm-derive", - "schemars", - "serde", - "serde-json-wasm", - "thiserror", - "uint", -] - -[[package]] -name = "cosmwasm-storage" -version = "1.0.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665cf97ad42be46936f6e6739711824a9bf21c440a6c98e185a3404aef0c3b81" -dependencies = [ - "cosmwasm-std", - "serde", -] - -[[package]] -name = "cpufeatures" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" -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.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32a398eb1ccfbe7e4f452bc749c44d38dd732e9a253f19da224c416f00ee7f4" -dependencies = [ - "generic-array", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "cw-storage-plus" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d7ee1963302b0ac2a9d42fe0faec826209c17452bfd36fbfd9d002a88929261" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - -[[package]] -name = "cw2" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d81d7c359d6c1fba3aa83dad7ec6f999e512571380ae62f81257c3db569743" -dependencies = [ - "cosmwasm-std", - "cw-storage-plus", - "schemars", - "serde", -] - -[[package]] -name = "der" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e21d2d0f22cde6e88694108429775c0219760a07779bf96503b434a03d7412" -dependencies = [ - "const-oid", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dyn-clone" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" - -[[package]] -name = "ecdsa" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713c32426287891008edb98f8b5c6abb2130aa043c93a818728fcda78606f274" -dependencies = [ - "der", - "elliptic-curve", - "hmac", - "signature", -] - -[[package]] -name = "ed25519-zebra" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409" -dependencies = [ - "curve25519-dalek", - "hex", - "rand_core 0.5.1", - "serde", - "sha2", - "thiserror", -] - -[[package]] -name = "elliptic-curve" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069397e10739989e400628cbc0556a817a8a64119d7a2315767f4456e1332c23" -dependencies = [ - "crypto-bigint", - "ff", - "generic-array", - "group", - "pkcs8", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - -[[package]] -name = "ff" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63eec06c61e487eecf0f7e6e6372e596a81922c28d33e645d6983ca6493a1af0" -dependencies = [ - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "group" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" -dependencies = [ - "ff", - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "k256" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "sha2", -] - -[[package]] -name = "libc" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "pkcs8" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbee84ed13e44dd82689fa18348a49934fa79cc774a344c42fc9b301c71b140a" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "proc-macro2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "schemars" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6ab463ae35acccb5cba66c0084c985257b797d288b6050cc2f6ac1b266cb78" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "902fdfbcf871ae8f653bddf4b2c05905ddaabc08f69d32a915787e3be0d31356" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn", -] - -[[package]] -name = "serde" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-json-wasm" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042ac496d97e5885149d34139bad1d617192770d7eb8f1866da2317ff4501853" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_derive_internals" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "signature" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" -dependencies = [ - "digest", - "rand_core 0.6.3", -] - -[[package]] -name = "spki" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987637c5ae6b3121aba9d513f869bd2bff11c4cc086c22473befd6649c0bd521" -dependencies = [ - "der", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "testgen-local" -version = "0.1.0" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cosmwasm-storage", - "cw-storage-plus", - "cw2", - "schemars", - "serde", - "thiserror", -] - -[[package]] -name = "thiserror" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "typenum" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" - -[[package]] -name = "uint" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "zeroize" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" diff --git a/contracts/injective-cosmwasm-mock/Cargo.toml b/contracts/injective-cosmwasm-mock/Cargo.toml index b950d9c8..5e42e04b 100644 --- a/contracts/injective-cosmwasm-mock/Cargo.toml +++ b/contracts/injective-cosmwasm-mock/Cargo.toml @@ -16,36 +16,24 @@ exclude = [ 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 integration = [ ] library = [ ] -[package.metadata.scripts] -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-arm64:0.12.11 -""" - [dependencies] cosmos-sdk-proto = { version = "0.20.0", default-features = false } cosmwasm-schema = { version = "1.5.0" } -cosmwasm-std = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] } -cw-storage-plus = { version = "1.2.0" } -cw2 = { version = "0.16.0" } -injective-cosmwasm = { path = "../../packages/injective-cosmwasm" } -injective-math = { path = "../../packages/injective-math" } -injective-protobuf = { path = "../../packages/injective-protobuf" } -injective-std = { version = "0.1.5" } -prost = { version = "0.12.4" } -protobuf = { version = "3.3.0" } +cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } +cw-storage-plus = { version = "2.0.0" } +cw2 = { version = "2.0.0" } +injective-cosmwasm = { version = "0.3.0" } +injective-math = { version = "0.3.0" } +injective-std = { version = "1.13.0" } +prost = { version = "0.12.6" } schemars = { version = "0.8.16" } serde = { version = "1.0.196", default-features = false, features = [ "derive" ] } thiserror = { version = "1.0.56" } [dev-dependencies] -injective-std = { version = "0.1.5" } -injective-test-tube = { version = "1.1.7" } -injective-testing = { version = "0.1.6" } +injective-test-tube = { version = "=1.13.0-1" } +injective-testing = { version = "0.2.1" } diff --git a/contracts/injective-cosmwasm-mock/src/order_management.rs b/contracts/injective-cosmwasm-mock/src/order_management.rs index 158f5bd5..e0a67006 100644 --- a/contracts/injective-cosmwasm-mock/src/order_management.rs +++ b/contracts/injective-cosmwasm-mock/src/order_management.rs @@ -1,14 +1,14 @@ use crate::types; -use cosmwasm_std::{CosmosMsg, StdResult}; +use cosmwasm_std::{AnyMsg, CosmosMsg, StdResult}; use injective_cosmwasm::{FullDerivativeMarket, InjectiveMsgWrapper, OrderType, SpotMarket}; use injective_math::FPDecimal; use prost::Message; pub fn create_stargate_msg(type_url: &str, value: Vec) -> StdResult> { - Ok(CosmosMsg::Stargate { + Ok(CosmosMsg::Any(AnyMsg { type_url: type_url.to_string(), value: value.into(), - }) + })) } pub fn create_spot_limit_order( diff --git a/contracts/injective-cosmwasm-mock/src/testing/test_exchange.rs b/contracts/injective-cosmwasm-mock/src/testing/test_exchange.rs index 9db7b659..091706d9 100644 --- a/contracts/injective-cosmwasm-mock/src/testing/test_exchange.rs +++ b/contracts/injective-cosmwasm-mock/src/testing/test_exchange.rs @@ -15,10 +15,16 @@ use injective_cosmwasm::{ TraderSpotOrdersResponse, TrimmedSpotLimitOrder, }; use injective_math::FPDecimal; -use injective_std::types::injective::exchange::v1beta1::{ - Deposit, MsgDeposit, MsgInstantSpotMarketLaunch, OrderType, QueryAggregateMarketVolumeResponse, QuerySubaccountDepositsRequest, +use injective_test_tube::{ + injective_cosmwasm::get_default_subaccount_id_for_checked_address, + injective_std::types::{ + cosmos::base::v1beta1::Coin as BaseCoin, + injective::exchange::v1beta1::{ + Deposit, MsgDeposit, MsgInstantSpotMarketLaunch, OrderType, QueryAggregateMarketVolumeResponse, QuerySubaccountDepositsRequest, + }, + }, + Account, Exchange, Module, RunnerResult, Wasm, }; -use injective_test_tube::{injective_cosmwasm::get_default_subaccount_id_for_checked_address, Account, Exchange, Module, RunnerResult, Wasm}; #[test] #[cfg_attr(not(feature = "integration"), ignore)] @@ -34,9 +40,9 @@ fn test_msg_deposit() { &env.contract_address, &ExecuteMsg::TestDepositMsg { subaccount_id: subaccount_id.clone(), - amount: Coin::new(100, "usdt"), + amount: Coin::new(100u128, "usdt"), }, - &[Coin::new(100, "usdt")], + &[Coin::new(100u128, "usdt")], &user.account, ); assert!(res.is_ok(), "Execution failed with error: {:?}", res.unwrap_err()); @@ -74,7 +80,7 @@ fn test_query_subaccount_deposit() { MsgDeposit { sender: env.users[0].account.address(), subaccount_id: subaccount_id.to_string(), - amount: Some(injective_std::types::cosmos::base::v1beta1::Coin { + amount: Some(BaseCoin { amount: amount.to_string(), denom: env.denoms[denom_key].clone(), }), @@ -158,6 +164,7 @@ fn test_query_spot_market() { quote_denom: QUOTE_DENOM.to_string(), min_price_tick_size: dec_to_proto(min_price_tick_size), min_quantity_tick_size: dec_to_proto(min_quantity_tick_size), + min_notional: "1".to_string(), }, &env.signer, ) diff --git a/contracts/injective-cosmwasm-mock/src/testing/test_exchange_derivative.rs b/contracts/injective-cosmwasm-mock/src/testing/test_exchange_derivative.rs index f5f42516..92812450 100644 --- a/contracts/injective-cosmwasm-mock/src/testing/test_exchange_derivative.rs +++ b/contracts/injective-cosmwasm-mock/src/testing/test_exchange_derivative.rs @@ -14,8 +14,11 @@ use injective_cosmwasm::{ TrimmedDerivativeLimitOrder, }; use injective_math::FPDecimal; -use injective_std::types::injective::exchange::v1beta1::{MsgInstantPerpetualMarketLaunch, OrderType}; -use injective_test_tube::{injective_cosmwasm::get_default_subaccount_id_for_checked_address, Account, Exchange, Module, Wasm}; +use injective_test_tube::{ + injective_cosmwasm::get_default_subaccount_id_for_checked_address, + injective_std::types::injective::exchange::v1beta1::{MsgInstantPerpetualMarketLaunch, OrderType}, + Account, Exchange, Module, Wasm, +}; #[test] #[cfg_attr(not(feature = "integration"), ignore)] @@ -69,6 +72,7 @@ fn test_query_derivative_market() { maintenance_margin_ratio: dec_to_proto(maintenance_margin_ratio), min_price_tick_size: dec_to_proto(min_price_tick_size), min_quantity_tick_size: dec_to_proto(min_quantity_tick_size), + min_notional: "1".to_string(), }, &env.signer, ) diff --git a/contracts/injective-cosmwasm-mock/src/testing/test_oracle.rs b/contracts/injective-cosmwasm-mock/src/testing/test_oracle.rs index 17175525..7cecf100 100644 --- a/contracts/injective-cosmwasm-mock/src/testing/test_oracle.rs +++ b/contracts/injective-cosmwasm-mock/src/testing/test_oracle.rs @@ -6,8 +6,10 @@ use crate::utils::{ use injective_cosmwasm::{OracleInfo, OraclePriceResponse, OracleType, OracleVolatilityResponse, PythPriceResponse}; use injective_math::scale::Scaled; use injective_math::FPDecimal; -use injective_std::types::injective::oracle::v1beta1::{QueryOraclePriceRequest, QueryPythPriceRequest}; -use injective_test_tube::{Module, Oracle, RunnerResult, Wasm}; +use injective_test_tube::{ + injective_std::types::injective::oracle::v1beta1::{QueryOraclePriceRequest, QueryPythPriceRequest}, + Module, Oracle, RunnerResult, Wasm, +}; #[test] #[cfg_attr(not(feature = "integration"), ignore)] @@ -26,6 +28,7 @@ fn test_query_oracle_price() { oracle_type: 2i32, base: env.denoms["base"].to_owned(), quote: env.denoms["quote"].to_owned(), + scaling_options: None, }; let oracle_response = oracle.query_oracle_price(&query_oracle_price_request); diff --git a/contracts/injective-cosmwasm-mock/src/testing/test_staking.rs b/contracts/injective-cosmwasm-mock/src/testing/test_staking.rs index 6157a539..b6410159 100644 --- a/contracts/injective-cosmwasm-mock/src/testing/test_staking.rs +++ b/contracts/injective-cosmwasm-mock/src/testing/test_staking.rs @@ -2,9 +2,10 @@ use crate::msg::QueryMsg; use crate::utils::{ExchangeType, Setup, BASE_DENOM}; use cosmwasm_std::Uint128; use injective_cosmwasm::exchange::response::StakedAmountResponse; -use injective_std::types::cosmos::base::v1beta1::Coin; -use injective_std::types::cosmos::staking::v1beta1::MsgDelegate; -use injective_test_tube::{Account, Module, Staking, Wasm}; +use injective_test_tube::{ + injective_std::types::cosmos::{base::v1beta1::Coin, staking::v1beta1::MsgDelegate}, + Account, Module, Staking, Wasm, +}; #[test] #[cfg_attr(not(feature = "integration"), ignore)] diff --git a/contracts/injective-cosmwasm-mock/src/testing/test_token_factory.rs b/contracts/injective-cosmwasm-mock/src/testing/test_token_factory.rs index e8c9f51c..2a393111 100644 --- a/contracts/injective-cosmwasm-mock/src/testing/test_token_factory.rs +++ b/contracts/injective-cosmwasm-mock/src/testing/test_token_factory.rs @@ -1,9 +1,11 @@ use crate::msg::QueryMsg; use crate::utils::{str_coin, ExchangeType, Setup, BASE_DECIMALS, BASE_DENOM}; use cosmwasm_std::Uint128; -use injective_cosmwasm::tokenfactory::response::{TokenFactoryCreateDenomFeeResponse, TokenFactoryDenomSupplyResponse}; -use injective_std::types::injective::tokenfactory::v1beta1::MsgCreateDenom; -use injective_test_tube::{Account, Module, TokenFactory, Wasm}; +use injective_test_tube::{ + injective_cosmwasm::tokenfactory::response::{TokenFactoryCreateDenomFeeResponse, TokenFactoryDenomSupplyResponse}, + injective_std::types::injective::tokenfactory::v1beta1::MsgCreateDenom, + Account, Module, TokenFactory, Wasm, +}; #[test] #[cfg_attr(not(feature = "integration"), ignore)] @@ -18,6 +20,7 @@ fn test_query_token_factory_denom_total_supply() { subdenom: "test".to_string(), name: "Test".to_string(), symbol: "TST".to_string(), + decimals: 6, }; factory.create_denom(msg_create_denom, &env.owner).unwrap(); diff --git a/contracts/injective-cosmwasm-mock/src/utils.rs b/contracts/injective-cosmwasm-mock/src/utils.rs index a3ce3efb..56fafa46 100644 --- a/contracts/injective-cosmwasm-mock/src/utils.rs +++ b/contracts/injective-cosmwasm-mock/src/utils.rs @@ -2,33 +2,34 @@ use crate::msg::{InstantiateMsg, MSG_CREATE_DERIVATIVE_LIMIT_ORDER_ENDPOINT, MSG use cosmwasm_std::{coin, Addr, Coin}; use injective_cosmwasm::{checked_address_to_subaccount_id, SubaccountId}; use injective_math::{scale::Scaled, FPDecimal}; -use injective_std::{ - shim::{Any, Timestamp}, - types::{ - cosmos::{ - authz::v1beta1::{GenericAuthorization, Grant, MsgGrant, MsgRevoke, MsgRevokeResponse}, - bank::v1beta1::{MsgSend, SendAuthorization}, - base::v1beta1::Coin as BaseCoin, - gov::{ - v1::{MsgSubmitProposal, MsgVote}, - v1beta1::MsgSubmitProposal as MsgSubmitProposalV1Beta1, - }, - }, - injective::{ - exchange::v1beta1::{ - DerivativeOrder, MsgCreateDerivativeLimitOrder, MsgCreateSpotLimitOrder, MsgInstantPerpetualMarketLaunch, MsgInstantSpotMarketLaunch, - OrderInfo, OrderType, QueryDerivativeMarketsRequest, QuerySpotMarketsRequest, SpotOrder, +use injective_test_tube::{ + injective_cosmwasm::get_default_subaccount_id_for_checked_address, + injective_std::{ + shim::{Any, Timestamp}, + types::{ + cosmos::{ + authz::v1beta1::{GenericAuthorization, Grant, MsgGrant, MsgRevoke, MsgRevokeResponse}, + bank::v1beta1::{MsgSend, SendAuthorization}, + base::v1beta1::Coin as BaseCoin, + gov::{ + v1::{MsgSubmitProposal, MsgVote}, + v1beta1::MsgSubmitProposal as MsgSubmitProposalV1Beta1, + }, }, - insurance::v1beta1::MsgCreateInsuranceFund, - oracle::v1beta1::{ - GrantPriceFeederPrivilegeProposal, MsgRelayPriceFeedPrice, MsgRelayPythPrices, MsgUpdateParams, OracleType, Params, PriceAttestation, + injective::{ + exchange::v1beta1::{ + DerivativeOrder, MsgCreateDerivativeLimitOrder, MsgCreateSpotLimitOrder, MsgInstantPerpetualMarketLaunch, + MsgInstantSpotMarketLaunch, OrderInfo, OrderType, QueryDerivativeMarketsRequest, QuerySpotMarketsRequest, SpotOrder, + }, + insurance::v1beta1::MsgCreateInsuranceFund, + oracle::v1beta1::{ + GrantPriceFeederPrivilegeProposal, MsgRelayPriceFeedPrice, MsgRelayPythPrices, MsgUpdateParams, OracleType, Params, + PriceAttestation, + }, }, }, }, -}; -use injective_test_tube::{ - injective_cosmwasm::get_default_subaccount_id_for_checked_address, Account, Authz, Bank, Exchange, ExecuteResponse, Gov, InjectiveTestApp, - Insurance, Module, Oracle, Runner, SigningAccount, Wasm, + Account, Authz, Bank, Exchange, ExecuteResponse, Gov, InjectiveTestApp, Insurance, Module, Oracle, Runner, SigningAccount, Wasm, }; use injective_testing::human_to_i64; use prost::Message; @@ -326,6 +327,7 @@ pub fn launch_spot_market(exchange: &Exchange, signer: &Signin quote_denom: QUOTE_DENOM.to_string(), min_price_tick_size: dec_to_proto(FPDecimal::must_from_str("0.000000000000001")), min_quantity_tick_size: dec_to_proto(FPDecimal::must_from_str("1")), + min_notional: dec_to_proto(FPDecimal::must_from_str("1")), }, signer, ) @@ -364,6 +366,7 @@ pub fn launch_perp_market(exchange: &Exchange, signer: &Signin maintenance_margin_ratio: "50000000000000000".to_owned(), min_price_tick_size: "1000000000000000000000".to_owned(), min_quantity_tick_size: "1000000000000000".to_owned(), + min_notional: dec_to_proto(FPDecimal::must_from_str("1")), }, signer, ) @@ -755,6 +758,7 @@ pub fn set_address_of_pyth_contract(app: &InjectiveTestApp, validator: &SigningA metadata: "".to_string(), title: "Set Pyth contract address".to_string(), summary: "Set Pyth contract address".to_string(), + expedited: false, }, validator, ) diff --git a/packages/injective-cosmwasm/Cargo.toml b/packages/injective-cosmwasm/Cargo.toml index 53148c87..98817a84 100644 --- a/packages/injective-cosmwasm/Cargo.toml +++ b/packages/injective-cosmwasm/Cargo.toml @@ -6,7 +6,7 @@ license = "Apache-2.0" name = "injective-cosmwasm" readme = "README.md" repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-cosmwasm" -version = "0.2.24" +version = "0.3.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -14,7 +14,7 @@ cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "co cw-storage-plus = { version = "2.0.0" } ethereum-types = { version = "0.5.2" } hex = { version = "0.4.3", features = [ "serde" ] } -injective-math = { version = "0.2.4" } +injective-math = { version = "0.3.0" } schemars = "0.8.16" serde = { version = "1.0.193", default-features = false, features = [ "derive" ] } serde_repr = "0.1.17" diff --git a/packages/injective-math/.cargo/config b/packages/injective-math/.cargo/config.toml similarity index 100% rename from packages/injective-math/.cargo/config rename to packages/injective-math/.cargo/config.toml diff --git a/packages/injective-math/Cargo.toml b/packages/injective-math/Cargo.toml index 15123d31..058bd6a5 100644 --- a/packages/injective-math/Cargo.toml +++ b/packages/injective-math/Cargo.toml @@ -6,16 +6,14 @@ license = "Apache-2.0" name = "injective-math" readme = "README.md" repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-math" -version = "0.2.4" +version = "0.3.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -# for more explicit tests, cargo test --features=backtraces -backtraces = [ "cosmwasm-std/backtraces" ] [dependencies] -cosmwasm-std = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] } +cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } ethereum-types = { version = "0.5.2" } primitive-types = { version = "0.12.2", default-features = false } schemars = "0.8.8" diff --git a/packages/injective-math/src/fp_decimal/arithmetic.rs b/packages/injective-math/src/fp_decimal/arithmetic.rs index 9c136a52..a33ee0b6 100644 --- a/packages/injective-math/src/fp_decimal/arithmetic.rs +++ b/packages/injective-math/src/fp_decimal/arithmetic.rs @@ -81,7 +81,7 @@ impl FPDecimal { assert_ne!(y.num, U256::zero()); - let num = FPDecimal::ONE.num.full_mul(x.num) / U512::try_from(y.num).unwrap(); + let num = FPDecimal::ONE.num.full_mul(x.num) / U512::from(y.num); if num.is_zero() { return FPDecimal::ZERO; } diff --git a/packages/injective-protobuf/Cargo.toml b/packages/injective-protobuf/Cargo.toml index 59fdac9b..33a46037 100644 --- a/packages/injective-protobuf/Cargo.toml +++ b/packages/injective-protobuf/Cargo.toml @@ -6,7 +6,7 @@ license = "Apache-2.0" name = "injective-protobuf" readme = "README.md" repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-protobuf" -version = "0.2.2" +version = "0.3.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -14,11 +14,9 @@ version = "0.2.2" protobuf-codegen-pure = "2" [features] -# for more explicit tests, cargo test --features=backtraces -backtraces = [ "cosmwasm-std/backtraces" ] [dependencies] -cosmwasm-std = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] } +cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } ethereum-types = "0.5.2" num = "0.4.0" protobuf = { version = "2", features = [ "with-bytes" ] } diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml index 2c2c2031..0ea10b8d 100644 --- a/packages/injective-testing/Cargo.toml +++ b/packages/injective-testing/Cargo.toml @@ -5,15 +5,15 @@ edition = "2021" license = "Apache-2.0" name = "injective-testing" repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-testing" -version = "0.1.6" +version = "0.2.1" [dependencies] anyhow = { version = "1.0.66" } base64 = { version = "0.13.1" } -cosmwasm-std = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] } -cw-multi-test = { version = "0.16.2" } -injective-cosmwasm = { version = "0.2.23-rc1", path = "../injective-cosmwasm" } -injective-math = { version = "0.2.4", path = "../injective-math" } +cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } +cw-multi-test = { version = "2.1.0" } +injective-cosmwasm = { version = "0.3.0" } +injective-math = { version = "0.3.0" } rand = { version = "0.4.6" } secp256k1 = { version = "0.6.2" } serde = { version = "1.0.137", default-features = false, features = [ "derive" ] } diff --git a/packages/injective-testing/src/address_generator.rs b/packages/injective-testing/src/address_generator.rs index ef680cd6..50bebcc0 100644 --- a/packages/injective-testing/src/address_generator.rs +++ b/packages/injective-testing/src/address_generator.rs @@ -15,8 +15,22 @@ const ADDRESS_BYTE_INDEX: usize = KECCAK_OUTPUT_BYTES - ADDRESS_BYTES; pub struct InjectiveAddressGenerator(); impl AddressGenerator for InjectiveAddressGenerator { - fn next_address(&self, _: &mut dyn Storage) -> Addr { - generate_inj_address() + fn contract_address(&self, _api: &dyn cosmwasm_std::Api, _storage: &mut dyn Storage, _code_id: u64, _instance_id: u64) -> anyhow::Result { + Ok(generate_inj_address()) + } + + fn predictable_contract_address( + &self, + api: &dyn cosmwasm_std::Api, + _storage: &mut dyn Storage, + _code_id: u64, + _instance_id: u64, + checksum: &[u8], + creator: &cosmwasm_std::CanonicalAddr, + salt: &[u8], + ) -> anyhow::Result { + let canonical_addr = cosmwasm_std::instantiate2_address(checksum, creator, salt)?; + Ok(api.addr_humanize(&canonical_addr)?) } } @@ -33,7 +47,7 @@ impl Default for StorageAwareInjectiveAddressGenerator { } impl AddressGenerator for StorageAwareInjectiveAddressGenerator { - fn next_address(&self, storage: &mut dyn Storage) -> Addr { + fn contract_address(&self, _api: &dyn cosmwasm_std::Api, storage: &mut dyn Storage, _code_id: u64, _instance_id: u64) -> anyhow::Result { let generated_address = generate_inj_address(); let key = self.key.as_bytes(); let stored = storage.get(key); @@ -52,7 +66,7 @@ impl AddressGenerator for StorageAwareInjectiveAddressGenerator { } } - generated_address + Ok(generated_address) } } diff --git a/packages/injective-testing/src/chain_mock.rs b/packages/injective-testing/src/chain_mock.rs index c66bfc9d..8eff8bfd 100644 --- a/packages/injective-testing/src/chain_mock.rs +++ b/packages/injective-testing/src/chain_mock.rs @@ -1,10 +1,12 @@ +use crate::InjectiveAddressGenerator; + use anyhow::{bail, Result as AnyResult}; use cosmwasm_std::{testing::MockApi, Addr, Api, Binary, BlockInfo, Coin, CustomQuery, Empty, MemoryStorage, Querier, Storage}; use cosmwasm_std::{to_json_binary, StdError}; -use cw_multi_test::{AddressGenerator, App}; -use cw_multi_test::{AppResponse, BankKeeper, BasicAppBuilder, CosmosRouter, DistributionKeeper, Module, Router, StakeKeeper, WasmKeeper}; +use cw_multi_test::{ + no_init, AddressGenerator, App, AppResponse, BankKeeper, BasicAppBuilder, CosmosRouter, Module, StargateAccepting, StargateFailing, WasmKeeper, +}; use injective_cosmwasm::{InjectiveMsgWrapper, InjectiveQueryWrapper}; - use std::{ cell::{Ref, RefCell}, marker::PhantomData, @@ -13,24 +15,12 @@ use std::{ u8, }; -use crate::InjectiveAddressGenerator; - -fn no_init( - _: &mut Router, - _: &dyn Api, - _: &mut dyn Storage, -) { +pub enum StargateT { + Accepting(StargateAccepting), + Failing(StargateFailing), } -pub type MockedInjectiveApp = App< - BankKeeper, - MockApi, - MemoryStorage, - CustomInjectiveHandler, - WasmKeeper, - StakeKeeper, - DistributionKeeper, ->; +pub type MockedInjectiveApp = App>; #[derive(Clone)] pub struct InitialBalance { @@ -314,13 +304,13 @@ pub fn mock_custom_injective_chain_app( }; let inj_wasm_keeper = match address_generator { - Some(generator) => WasmKeeper::::new_with_custom_address_generator(generator), - None => WasmKeeper::::new_with_custom_address_generator(InjectiveAddressGenerator()), + Some(generator) => WasmKeeper::::new().with_address_generator(generator), + None => WasmKeeper::::new().with_address_generator(InjectiveAddressGenerator()), }; - BasicAppBuilder::new() + BasicAppBuilder::new_custom() .with_custom(inj_handler) - .with_wasm::>(inj_wasm_keeper) + .with_wasm::>(inj_wasm_keeper) .build(|router, _, storage| { initial_balances.into_iter().for_each(|balance| { router @@ -332,18 +322,18 @@ pub fn mock_custom_injective_chain_app( } pub fn mock_default_injective_chain_app() -> MockedInjectiveApp { - let inj_wasm_keeper = WasmKeeper::::new_with_custom_address_generator(InjectiveAddressGenerator()); + let inj_wasm_keeper = WasmKeeper::::new().with_address_generator(InjectiveAddressGenerator()); let inj_handler = CustomInjectiveHandler::default(); - BasicAppBuilder::new() + BasicAppBuilder::new_custom() .with_custom(inj_handler) - .with_wasm::>(inj_wasm_keeper) + .with_wasm::>(inj_wasm_keeper) .build(no_init) } fn copy_binary(binary: &Binary) -> Binary { - let mut c: Vec = vec![0; binary.0.len()]; - c.clone_from_slice(&binary.0); - Binary(c) + let mut c: Vec = vec![0; binary.to_vec().len()]; + c.clone_from_slice(binary); + Binary::new(c) }