From 88ac9ecbdba3efe3775cb5c72b45b6af564e430c Mon Sep 17 00:00:00 2001 From: maxrobot Date: Thu, 8 Aug 2024 10:46:11 +0100 Subject: [PATCH] feat: created workspace cargo --- Cargo.lock | 395 +++--------------- Cargo.toml | 40 ++ contracts/atomic-order-example/Cargo.toml | 28 +- contracts/dummy/Cargo.toml | 14 +- contracts/injective-cosmwasm-mock/Cargo.toml | 28 +- packages/injective-cosmwasm/Cargo.toml | 26 +- .../src/exchange/subaccount.rs | 8 - packages/injective-math/Cargo.toml | 14 +- packages/injective-std-derive/Cargo.toml | 18 +- packages/injective-std/Cargo.toml | 16 +- packages/injective-testing/Cargo.toml | 20 +- 11 files changed, 173 insertions(+), 434 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f2321ba..19311b58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -210,10 +210,10 @@ dependencies = [ "cosmwasm-schema 1.5.5", "cosmwasm-std 2.1.1", "cosmwasm-storage", - "cw-multi-test 0.16.5", - "cw-storage-plus 2.0.0", - "cw-utils 2.0.0", - "cw2 2.0.0", + "cw-multi-test", + "cw-storage-plus", + "cw-utils", + "cw2", "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)", @@ -255,12 +255,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" @@ -334,7 +328,7 @@ checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b" dependencies = [ "bs58", "hmac", - "k256 0.13.3", + "k256", "rand_core 0.6.4", "ripemd", "sha2 0.10.8", @@ -529,13 +523,13 @@ checksum = "47126f5364df9387b9d8559dcef62e99010e1d4098f39eb3f7ee4b5c254e40ea" dependencies = [ "bip32", "cosmos-sdk-proto", - "ecdsa 0.16.9", + "ecdsa", "eyre", - "k256 0.13.3", + "k256", "rand_core 0.6.4", "serde 1.0.204", "serde_json 1.0.122", - "signature 2.2.0", + "signature", "subtle-encoding", "tendermint", "tendermint-rpc", @@ -555,9 +549,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ed6aa9f904de106fa16443ad14ec2abe75e94ba003bb61c681c0e43d4c58d2a" dependencies = [ "digest 0.10.7", - "ecdsa 0.16.9", + "ecdsa", "ed25519-zebra 3.1.0", - "k256 0.13.3", + "k256", "rand_core 0.6.4", "thiserror", ] @@ -574,9 +568,9 @@ dependencies = [ "ark-serialize", "cosmwasm-core", "digest 0.10.7", - "ecdsa 0.16.9", + "ecdsa", "ed25519-zebra 4.0.3", - "k256 0.13.3", + "k256", "num-traits", "p256", "rand_core 0.6.4", @@ -748,18 +742,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.5.5" @@ -835,25 +817,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cw-multi-test" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127c7bb95853b8e828bdab97065c81cb5ddc20f7339180b61b2300565aaa99d1" -dependencies = [ - "anyhow", - "cosmwasm-std 1.5.2", - "cw-storage-plus 1.2.0", - "cw-utils 1.0.3", - "derivative", - "itertools 0.10.5", - "k256 0.11.6", - "prost 0.9.0", - "schemars", - "serde 1.0.204", - "thiserror", -] - [[package]] name = "cw-multi-test" version = "2.1.0" @@ -863,8 +826,8 @@ dependencies = [ "anyhow", "bech32 0.11.0", "cosmwasm-std 2.1.1", - "cw-storage-plus 2.0.0", - "cw-utils 2.0.0", + "cw-storage-plus", + "cw-utils", "derivative", "itertools 0.13.0", "prost 0.12.6", @@ -874,17 +837,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw-storage-plus" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c" -dependencies = [ - "cosmwasm-std 1.5.2", - "schemars", - "serde 1.0.204", -] - [[package]] name = "cw-storage-plus" version = "2.0.0" @@ -896,21 +848,6 @@ dependencies = [ "serde 1.0.204", ] -[[package]] -name = "cw-utils" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c" -dependencies = [ - "cosmwasm-schema 1.5.5", - "cosmwasm-std 1.5.2", - "cw2 1.1.2", - "schemars", - "semver", - "serde 1.0.204", - "thiserror", -] - [[package]] name = "cw-utils" version = "2.0.0" @@ -924,21 +861,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw2" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa" -dependencies = [ - "cosmwasm-schema 1.5.5", - "cosmwasm-std 1.5.2", - "cw-storage-plus 1.2.0", - "schemars", - "semver", - "serde 1.0.204", - "thiserror", -] - [[package]] name = "cw2" version = "2.0.0" @@ -947,57 +869,13 @@ checksum = "b04852cd38f044c0751259d5f78255d07590d136b8a86d4e09efdd7666bd6d27" dependencies = [ "cosmwasm-schema 2.1.1", "cosmwasm-std 2.1.1", - "cw-storage-plus 2.0.0", + "cw-storage-plus", "schemars", "semver", "serde 1.0.204", "thiserror", ] -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "der" version = "0.7.9" @@ -1081,8 +959,8 @@ name = "dummy" version = "1.1.0" dependencies = [ "cosmwasm-std 2.1.1", - "cw-storage-plus 2.0.0", - "cw2 2.0.0", + "cw-storage-plus", + "cw2", "injective-cosmwasm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "schemars", "serde 1.0.204", @@ -1095,30 +973,18 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - [[package]] name = "ecdsa" version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.9", + "der", "digest 0.10.7", - "elliptic-curve 0.13.8", - "rfc6979 0.4.0", - "signature 2.2.0", - "spki 0.7.3", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -1127,8 +993,8 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", + "pkcs8", + "signature", ] [[package]] @@ -1180,41 +1046,21 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.7", - "ff 0.12.1", - "generic-array", - "group 0.12.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", + "base16ct", + "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", + "ff", "generic-array", - "group 0.13.0", - "pkcs8 0.10.2", + "group", + "pkcs8", "rand_core 0.6.4", - "sec1 0.7.3", + "sec1", "subtle", "zeroize", ] @@ -1228,27 +1074,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enumset" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "env_logger" version = "0.9.3" @@ -1324,16 +1149,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "ff" version = "0.13.0" @@ -1512,24 +1327,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand_core 0.6.4", "subtle", ] @@ -1710,12 +1514,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -1776,7 +1574,7 @@ version = "0.3.0" dependencies = [ "cosmwasm-schema 1.5.5", "cosmwasm-std 2.1.1", - "cw-storage-plus 2.0.0", + "cw-storage-plus", "ethereum-types", "hex", "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1796,7 +1594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23e93e9438844b10add3eb40ed1e8c92689824ac080d207f856412a73551c221" dependencies = [ "cosmwasm-std 2.1.1", - "cw-storage-plus 2.0.0", + "cw-storage-plus", "ethereum-types", "hex", "injective-math 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1814,8 +1612,8 @@ dependencies = [ "cosmos-sdk-proto", "cosmwasm-schema 1.5.5", "cosmwasm-std 2.1.1", - "cw-storage-plus 2.0.0", - "cw2 2.0.0", + "cw-storage-plus", + "cw2", "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)", @@ -1938,7 +1736,7 @@ dependencies = [ "anyhow", "base64 0.13.1", "cosmwasm-std 2.1.1", - "cw-multi-test 2.1.0", + "cw-multi-test", "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", @@ -1956,7 +1754,7 @@ dependencies = [ "anyhow", "base64 0.13.1", "cosmwasm-std 2.1.1", - "cw-multi-test 2.1.0", + "cw-multi-test", "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", @@ -2013,18 +1811,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "k256" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" -dependencies = [ - "cfg-if", - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.8", -] - [[package]] name = "k256" version = "0.13.3" @@ -2032,11 +1818,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.8", - "signature 2.2.0", + "signature", ] [[package]] @@ -2283,8 +2069,8 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "primeorder", "sha2 0.10.8", ] @@ -2366,24 +2152,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - [[package]] name = "pkcs8" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.9", - "spki 0.7.3", + "der", + "spki", ] [[package]] @@ -2407,7 +2183,7 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.8", + "elliptic-curve", ] [[package]] @@ -2429,16 +2205,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - [[package]] name = "prost" version = "0.11.9" @@ -2459,19 +2225,6 @@ dependencies = [ "prost-derive 0.12.6", ] -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -2711,17 +2464,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -2885,7 +2627,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", - "enumset", "schemars_derive", "serde 1.0.204", "serde_json 1.0.122", @@ -2913,30 +2654,16 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct 0.2.0", - "der 0.7.9", + "base16ct", + "der", "generic-array", - "pkcs8 0.10.2", + "pkcs8", "subtle", "zeroize", ] @@ -3154,16 +2881,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - [[package]] name = "signature" version = "2.2.0" @@ -3199,16 +2916,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - [[package]] name = "spki" version = "0.7.3" @@ -3216,7 +2923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.9", + "der", ] [[package]] @@ -3319,7 +3026,7 @@ dependencies = [ "ed25519-consensus", "flex-error", "futures", - "k256 0.13.3", + "k256", "num-traits", "once_cell", "prost 0.12.6", @@ -3330,7 +3037,7 @@ dependencies = [ "serde_json 1.0.122", "serde_repr", "sha2 0.10.8", - "signature 2.2.0", + "signature", "subtle", "subtle-encoding", "tendermint-proto 0.34.1", diff --git a/Cargo.toml b/Cargo.toml index a3df4fb8..8b63dbb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,46 @@ resolver = "2" codegen-units = 1 incremental = false +[workspace.dependencies] +anyhow = { version = "1.0.66" } +base64 = { version = "0.13.1" } +chrono = { version = "0.4.27", default-features = false } +cosmos-sdk-proto = { version = "0.20.0", default-features = false } +cosmwasm-schema = { version = "1.5.0" } +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-multi-test = { version = "2.1.0" } +cw-storage-plus = { version = "2.0.0" } +cw-utils = { version = "2.0.0" } +cw2 = { version = "2.0.0" } +ethereum-types = { version = "0.5.2" } +hex = { version = "0.4.3", features = [ "serde" ] } +injective-cosmwasm = { version = "0.3.0" } +injective-math = { version = "0.3.0" } +injective-std = { version = "1.13.0" } +injective-std-derive = { version = "1.13.0" } +injective-test-tube = { version = "=1.13.0-1" } +injective-testing = { version = "0.2.1" } +itertools = "0.10.3" +primitive-types = { version = "0.12.2", default-features = false } +proc-macro2 = "1.0.40" +prost = { version = "0.12.6" } +prost-types = { version = "0.12.6", default-features = false } +quote = "1.0.20" +rand = { version = "0.4.6" } +schemars = { version = "0.8.16" } +secp256k1 = { version = "0.6.2" } +serde = { version = "1.0.196", default-features = false, features = [ "derive" ] } +serde-cw-value = { version = "0.7.0" } +serde-json-wasm = { version = "1.0.0" } +serde_repr = "0.1.17" +serde_test = { version = "1.0.176" } +subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] } +syn = "1.0.98" +thiserror = { version = "1.0.56" } +tiny-keccak = { version = "1.2.1" } +trybuild = { version = "1.0.63", features = [ "diff" ] } + [profile.release] codegen-units = 1 debug = false diff --git a/contracts/atomic-order-example/Cargo.toml b/contracts/atomic-order-example/Cargo.toml index 4e19206f..97e8441c 100644 --- a/contracts/atomic-order-example/Cargo.toml +++ b/contracts/atomic-order-example/Cargo.toml @@ -27,19 +27,19 @@ optimize = """docker run --rm -v "$(pwd)":/code \ """ [dependencies] -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" } +cosmwasm-std = { workspace = true } +cosmwasm-storage = { workspace = true } +cw-storage-plus = { workspace = true } +cw-utils = { workspace = true } +cw2 = { workspace = true } +injective-cosmwasm = { workspace = true } +injective-math = { workspace = true } +injective-std = { workspace = true } +prost = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true } +thiserror = { workspace = true } [dev-dependencies] -cosmwasm-schema = { version = "1.5.0" } -cw-multi-test = { version = "0.16.2" } +cosmwasm-schema = { workspace = true } +cw-multi-test = { workspace = true } diff --git a/contracts/dummy/Cargo.toml b/contracts/dummy/Cargo.toml index cdd2cc14..31f336b2 100644 --- a/contracts/dummy/Cargo.toml +++ b/contracts/dummy/Cargo.toml @@ -27,10 +27,10 @@ optimize = """docker run --rm -v "$(pwd)":/code \ """ [dependencies] -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" } +cosmwasm-std = { workspace = true } +cw-storage-plus = { workspace = true } +cw2 = { workspace = true } +injective-cosmwasm = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true } +thiserror = { workspace = true } diff --git a/contracts/injective-cosmwasm-mock/Cargo.toml b/contracts/injective-cosmwasm-mock/Cargo.toml index 5e42e04b..cede0677 100644 --- a/contracts/injective-cosmwasm-mock/Cargo.toml +++ b/contracts/injective-cosmwasm-mock/Cargo.toml @@ -21,19 +21,19 @@ integration = [ ] library = [ ] [dependencies] -cosmos-sdk-proto = { version = "0.20.0", default-features = false } -cosmwasm-schema = { version = "1.5.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" } +cosmos-sdk-proto = { workspace = true } +cosmwasm-schema = { workspace = true } +cosmwasm-std = { workspace = true } +cw-storage-plus = { workspace = true } +cw2 = { workspace = true } +injective-cosmwasm = { workspace = true } +injective-math = { workspace = true } +injective-std = { workspace = true } +prost = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true } +thiserror = { workspace = true } [dev-dependencies] -injective-test-tube = { version = "=1.13.0-1" } -injective-testing = { version = "0.2.1" } +injective-test-tube = { workspace = true } +injective-testing = { workspace = true } diff --git a/packages/injective-cosmwasm/Cargo.toml b/packages/injective-cosmwasm/Cargo.toml index 98817a84..0e53caa7 100644 --- a/packages/injective-cosmwasm/Cargo.toml +++ b/packages/injective-cosmwasm/Cargo.toml @@ -10,18 +10,18 @@ version = "0.3.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -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" } -ethereum-types = { version = "0.5.2" } -hex = { version = "0.4.3", features = [ "serde" ] } -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" -subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] } -tiny-keccak = "1.2.1" +cosmwasm-std = { workspace = true } +cw-storage-plus = { workspace = true } +ethereum-types = { workspace = true } +hex = { workspace = true } +injective-math = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true } +serde_repr = { workspace = true } +subtle-encoding = { workspace = true } +tiny-keccak = { workspace = true } [dev-dependencies] -cosmwasm-schema = { version = "1.5.0" } -serde-json-wasm = { version = "1.0.0" } -serde_test = { version = "1.0.176" } +cosmwasm-schema = { workspace = true } +serde-json-wasm = { workspace = true } +serde_test = { workspace = true } diff --git a/packages/injective-cosmwasm/src/exchange/subaccount.rs b/packages/injective-cosmwasm/src/exchange/subaccount.rs index 0a0355d8..55668c96 100644 --- a/packages/injective-cosmwasm/src/exchange/subaccount.rs +++ b/packages/injective-cosmwasm/src/exchange/subaccount.rs @@ -53,14 +53,6 @@ pub fn subaccount_id_to_ethereum_address(subaccount_id: &SubaccountId) -> String pub fn subaccount_id_to_injective_address(subaccount_id: &SubaccountId, deps: &Deps) -> StdResult { let ethereum_address = subaccount_id_to_ethereum_address(subaccount_id); - println!("ethereum_address: {:?}", ethereum_address); - println!("ethereum_address: {:?}", addr_to_bech32(ethereum_address.clone()).as_str()); - - println!("ethereum_address: {:?}", deps.api.addr_validate("")); - println!( - "ethereum_address: {:?}", - deps.api.addr_validate("inj1khsfhyavadcvzug67pufytaz2cq36ljkrsr0nv") - ); deps.api.addr_validate(addr_to_bech32(ethereum_address).as_str()) } diff --git a/packages/injective-math/Cargo.toml b/packages/injective-math/Cargo.toml index 058bd6a5..33f677bc 100644 --- a/packages/injective-math/Cargo.toml +++ b/packages/injective-math/Cargo.toml @@ -13,12 +13,12 @@ version = "0.3.0" [features] [dependencies] -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" -serde = { version = "1.0.193", default-features = false, features = [ "derive" ] } -subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] } +cosmwasm-std = { workspace = true } +ethereum-types = { workspace = true } +primitive-types = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true } +subtle-encoding = { workspace = true } [dev-dependencies] -cosmwasm-schema = { version = "1.5.0" } +cosmwasm-schema = { workspace = true } diff --git a/packages/injective-std-derive/Cargo.toml b/packages/injective-std-derive/Cargo.toml index ae8e686d..49c5eaa0 100644 --- a/packages/injective-std-derive/Cargo.toml +++ b/packages/injective-std-derive/Cargo.toml @@ -11,14 +11,14 @@ version = "1.13.0" proc-macro = true [dependencies] -cosmwasm-std = { version = "2.1.0", features = [ "stargate" ] } -itertools = "0.10.3" -proc-macro2 = "1.0.40" -quote = "1.0.20" -syn = "1.0.98" +cosmwasm-std = { workspace = true } +itertools = { workspace = true } +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } [dev-dependencies] -cosmwasm-std = { version = "2.1.0", features = [ "stargate" ] } -prost = "0.12.4" -serde = "1.0.142" -trybuild = { version = "1.0.63", features = [ "diff" ] } +cosmwasm-std = { workspace = true } +prost = { workspace = true } +serde = { workspace = true } +trybuild = { workspace = true } diff --git a/packages/injective-std/Cargo.toml b/packages/injective-std/Cargo.toml index dfc8f6ea..afa6b740 100644 --- a/packages/injective-std/Cargo.toml +++ b/packages/injective-std/Cargo.toml @@ -10,11 +10,11 @@ version = "1.13.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chrono = { version = "0.4.27", default-features = false } -cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] } -injective-std-derive = { version = "1.13.0" } -prost = { version = "0.12.4", features = [ "prost-derive" ] } -prost-types = { version = "0.12.4", default-features = false } -schemars = "0.8.8" -serde = { version = "1.0", default-features = false, features = [ "derive" ] } -serde-cw-value = { version = "0.7.0" } +chrono = { workspace = true } +cosmwasm-std = { workspace = true } +injective-std-derive = { workspace = true } +prost = { workspace = true } +prost-types = { workspace = true } +schemars = { workspace = true } +serde = { workspace = true } +serde-cw-value = { workspace = true } diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml index 0ea10b8d..143d209b 100644 --- a/packages/injective-testing/Cargo.toml +++ b/packages/injective-testing/Cargo.toml @@ -8,13 +8,13 @@ repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/i version = "0.2.1" [dependencies] -anyhow = { version = "1.0.66" } -base64 = { version = "0.13.1" } -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" ] } -tiny-keccak = { version = "1.2.1" } +anyhow = { workspace = true } +base64 = { workspace = true } +cosmwasm-std = { workspace = true } +cw-multi-test = { workspace = true } +injective-cosmwasm = { workspace = true } +injective-math = { workspace = true } +rand = { workspace = true } +secp256k1 = { workspace = true } +serde = { workspace = true } +tiny-keccak = { workspace = true }