From e985ca5a080641a9cac591a9f64f4e373561a526 Mon Sep 17 00:00:00 2001 From: Trinity Date: Wed, 14 Aug 2024 12:03:26 +0700 Subject: [PATCH 1/2] Remove virtual staking mock --- Cargo.lock | 266 +++++++++-------- contracts/consumer/converter/Cargo.toml | 1 + contracts/consumer/converter/src/multitest.rs | 40 +-- .../src/multitest/virtual_staking_mock.rs | 276 ------------------ .../consumer/virtual-staking/src/contract.rs | 58 +++- contracts/consumer/virtual-staking/src/msg.rs | 11 + 6 files changed, 229 insertions(+), 423 deletions(-) delete mode 100644 contracts/consumer/converter/src/multitest/virtual_staking_mock.rs diff --git a/Cargo.lock b/Cargo.lock index 0df67f14..77d629a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -15,15 +15,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base16ct" @@ -33,9 +33,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -75,15 +75,15 @@ checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cfg-if" @@ -93,18 +93,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "num-traits", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_panic" @@ -123,12 +123,11 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.5.4" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b4c3f9c4616d6413d4b5fc4c270a4cc32a374b9be08671e80e1a019f805d8f" +checksum = "0f862b355f7e47711e0acfe6af92cb3fd8fd5936b66a9eaa338b51edabd1e77d" dependencies = [ "digest 0.10.7", - "ecdsa", "ed25519-zebra", "k256", "rand_core 0.6.4", @@ -137,18 +136,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.5.4" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c586ced10c3b00e809ee664a895025a024f60d65d34fe4c09daed4a4db68a3f3" +checksum = "cd85de6467cd1073688c86b39833679ae6db18cf4771471edd9809f15f1679f1" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.5.4" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8467874827d384c131955ff6f4d47d02e72a956a08eb3c0ff24f8c903a5517b4" +checksum = "5b4cd28147a66eba73720b47636a58097a979ad8c8bfdb4ed437ebcbfe362576" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -159,9 +158,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.5.4" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6db85d98ac80922aef465e564d5b21fa9cfac5058cb62df7f116c3682337393" +checksum = "9acd45c63d41bc9b16bc6dc7f6bd604a8c2ad29ce96c8f3c96d7fc8ef384392e" dependencies = [ "proc-macro2", "quote", @@ -170,9 +169,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.5.4" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712fe58f39d55c812f7b2c84e097cdede3a39d520f89b6dc3153837e31741927" +checksum = "2685c2182624b2e9e17f7596192de49a3f86b7a0c9a5f6b25c1df5e24592e836" dependencies = [ "base64", "bech32", @@ -192,18 +191,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -247,7 +246,7 @@ dependencies = [ "cw-utils", "derivative", "itertools 0.12.1", - "prost 0.12.4", + "prost 0.12.6", "schemars", "serde", "sha2 0.10.8", @@ -297,9 +296,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -339,15 +338,15 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", @@ -374,15 +373,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -432,9 +431,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -463,9 +462,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hex" @@ -484,12 +483,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.5", ] [[package]] @@ -512,15 +511,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "k256" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -532,9 +531,9 @@ dependencies = [ [[package]] name = "konst" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" dependencies = [ "const_panic", "konst_kernel", @@ -544,9 +543,9 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" dependencies = [ "typewit", ] @@ -559,15 +558,15 @@ checksum = "4e28ab1dc35e09d60c2b8c90d12a9a8d9666c876c10a3739a3196db0103b6043" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "memchr" -version = "2.6.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mesh-apis" @@ -610,6 +609,7 @@ dependencies = [ "mesh-bindings", "mesh-burn", "mesh-simple-price-feed", + "mesh-virtual-staking", "schemars", "serde", "sylvia", @@ -822,24 +822,24 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "osmosis-std" @@ -916,9 +916,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -935,12 +935,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]] @@ -958,15 +958,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.60", + "syn 2.0.74", ] [[package]] @@ -1014,15 +1014,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schemars" -version = "0.8.17" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -1032,14 +1032,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.17" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.60", + "syn 2.0.74", ] [[package]] @@ -1058,15 +1058,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" dependencies = [ "serde_derive", ] @@ -1100,33 +1100,34 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.74", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1157,9 +1158,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -1167,9 +1168,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -1183,9 +1184,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[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 = "sylvia" @@ -1218,7 +1219,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.74", ] [[package]] @@ -1234,9 +1235,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -1261,7 +1262,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.74", ] [[package]] @@ -1272,41 +1273,41 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.74", "test-case-core", ] [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.74", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", @@ -1315,33 +1316,42 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.5.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[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 = "wasi" @@ -1351,15 +1361,15 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/contracts/consumer/converter/Cargo.toml b/contracts/consumer/converter/Cargo.toml index a152fbeb..c71087f0 100644 --- a/contracts/consumer/converter/Cargo.toml +++ b/contracts/consumer/converter/Cargo.toml @@ -38,6 +38,7 @@ thiserror = { workspace = true } [dev-dependencies] mesh-burn = { workspace = true } mesh-simple-price-feed = { workspace = true, features = ["mt"] } +mesh-virtual-staking = { workspace = true, features = ["mt"] } cw-multi-test = { workspace = true } test-case = { workspace = true } diff --git a/contracts/consumer/converter/src/multitest.rs b/contracts/consumer/converter/src/multitest.rs index 22169d99..551150c2 100644 --- a/contracts/consumer/converter/src/multitest.rs +++ b/contracts/consumer/converter/src/multitest.rs @@ -1,21 +1,20 @@ -mod virtual_staking_mock; - use cosmwasm_std::{coin, coins, Addr, Decimal, StdError, Uint128, Validator}; use cw_multi_test::{no_init, AppBuilder}; use mesh_apis::converter_api::sv::mt::ConverterApiProxy; use mesh_apis::converter_api::RewardInfo; use mesh_simple_price_feed::contract::sv::mt::CodeId as PriceFeedCodeId; use mesh_simple_price_feed::contract::SimplePriceFeedContract; +use mesh_virtual_staking::contract::sv::mt::{ + CodeId as VirtualStakingCodeId, VirtualStakingContractProxy, +}; +use mesh_virtual_staking::contract::VirtualStakingContract; use sylvia::multitest::{App, Proxy}; -use virtual_staking_mock::sv::mt::CodeId as VirtualStakingCodeId; -use virtual_staking_mock::VirtualStakingMock; use crate::contract::sv::mt::CodeId as ConverterCodeId; use crate::contract::sv::mt::ConverterContractProxy; use crate::contract::{custom, ConverterContract}; use crate::error::ContractError; use crate::error::ContractError::Unauthorized; -use crate::multitest::virtual_staking_mock::sv::mt::VirtualStakingMockProxy; const JUNO: &str = "ujuno"; @@ -31,7 +30,7 @@ struct SetupArgs<'a> { struct SetupResponse<'a> { price_feed: Proxy<'a, MtApp, SimplePriceFeedContract<'a>>, converter: Proxy<'a, MtApp, ConverterContract<'a>>, - virtual_staking: Proxy<'a, MtApp, VirtualStakingMock<'a>>, + virtual_staking: Proxy<'a, MtApp, VirtualStakingContract<'a>>, } fn new_app() -> App { @@ -152,10 +151,10 @@ fn ibc_stake_and_unstake() { // no one is staked let val1 = "Val Kilmer"; let val2 = "Valley Girl"; - assert!(virtual_staking.all_stake().unwrap().stakes.is_empty()); + assert!(virtual_staking.get_all_stake().unwrap().stakes.is_empty()); assert_eq!( virtual_staking - .stake(val1.to_string()) + .get_stake(val1.to_string()) .unwrap() .stake .u128(), @@ -163,7 +162,7 @@ fn ibc_stake_and_unstake() { ); assert_eq!( virtual_staking - .stake(val2.to_string()) + .get_stake(val2.to_string()) .unwrap() .stake .u128(), @@ -186,10 +185,13 @@ fn ibc_stake_and_unstake() { .call(owner) .unwrap(); + // new epoch to update all stake values + virtual_staking.test_handle_epoch().call(owner).unwrap(); + // and check the stakes (1000 * 0.6 * 0.5 = 300) (2000 * 0.6 * 0.5 = 600) assert_eq!( virtual_staking - .stake(val1.to_string()) + .get_stake(val1.to_string()) .unwrap() .stake .u128(), @@ -197,14 +199,14 @@ fn ibc_stake_and_unstake() { ); assert_eq!( virtual_staking - .stake(val2.to_string()) + .get_stake(val2.to_string()) .unwrap() .stake .u128(), 600 ); assert_eq!( - virtual_staking.all_stake().unwrap().stakes, + virtual_staking.get_all_stake().unwrap().stakes, vec![ (val1.to_string(), Uint128::new(300)), (val2.to_string(), Uint128::new(600)), @@ -238,10 +240,10 @@ fn ibc_stake_and_burn() { // no one is staked let val1 = "Val Kilmer"; let val2 = "Valley Girl"; - assert!(virtual_staking.all_stake().unwrap().stakes.is_empty()); + assert!(virtual_staking.get_all_stake().unwrap().stakes.is_empty()); assert_eq!( virtual_staking - .stake(val1.to_string()) + .get_stake(val1.to_string()) .unwrap() .stake .u128(), @@ -249,7 +251,7 @@ fn ibc_stake_and_burn() { ); assert_eq!( virtual_staking - .stake(val2.to_string()) + .get_stake(val2.to_string()) .unwrap() .stake .u128(), @@ -272,10 +274,12 @@ fn ibc_stake_and_burn() { .call(owner) .unwrap(); + // new epoch to update all stake values + virtual_staking.test_handle_epoch().call(owner).unwrap(); // and check the stakes (1000 * 0.6 * 0.5 = 300) (2000 * 0.6 * 0.5 = 600) assert_eq!( virtual_staking - .stake(val1.to_string()) + .get_stake(val1.to_string()) .unwrap() .stake .u128(), @@ -283,14 +287,14 @@ fn ibc_stake_and_burn() { ); assert_eq!( virtual_staking - .stake(val2.to_string()) + .get_stake(val2.to_string()) .unwrap() .stake .u128(), 600 ); assert_eq!( - virtual_staking.all_stake().unwrap().stakes, + virtual_staking.get_all_stake().unwrap().stakes, vec![ (val1.to_string(), Uint128::new(300)), (val2.to_string(), Uint128::new(600)), diff --git a/contracts/consumer/converter/src/multitest/virtual_staking_mock.rs b/contracts/consumer/converter/src/multitest/virtual_staking_mock.rs deleted file mode 100644 index 3faaedf8..00000000 --- a/contracts/consumer/converter/src/multitest/virtual_staking_mock.rs +++ /dev/null @@ -1,276 +0,0 @@ -use cosmwasm_schema::cw_serde; -use cosmwasm_std::{ensure_eq, Addr, Coin, Response, StdError, StdResult, Uint128, Validator}; - -use cw_storage_plus::{Item, Map}; -use cw_utils::{nonpayable, PaymentError}; -use mesh_apis::virtual_staking_api::{self, ValidatorSlash, VirtualStakingApi}; -use sylvia::contract; -use sylvia::types::{ExecCtx, InstantiateCtx, QueryCtx, SudoCtx}; - -use crate::contract::custom; - -#[cw_serde] -pub struct Config { - /// The denom we accept for staking - pub denom: String, - /// The address of the converter contract (that is authorized to bond/unbond and will receive rewards) - pub converter: Addr, -} - -#[derive(thiserror::Error, Debug)] -pub enum ContractError { - #[error("{0}")] - Std(#[from] StdError), - - #[error("{0}")] - Payment(#[from] PaymentError), - - #[error("Unauthorized")] - Unauthorized, - - #[error("Wrong denom. Cannot stake {0}")] - WrongDenom(String), - - #[error("Virtual staking {0} has not enough delegated funds: {1}")] - InsufficientDelegations(String, Uint128), -} - -/// This is a stub implementation of the virtual staking contract, for test purposes only. -/// When proper virtual staking contract is available, this should be replaced in multitests -pub struct VirtualStakingMock<'a> { - config: Item<'a, Config>, - stake: Map<'a, &'a str, Uint128>, -} - -#[contract] -#[sv::error(ContractError)] -#[sv::messages(virtual_staking_api as VirtualStakingApi)] -#[sv::custom(query=custom::ConverterQuery, msg=custom::ConverterMsg)] -impl VirtualStakingMock<'_> { - pub const fn new() -> Self { - Self { - config: Item::new("config"), - stake: Map::new("stake"), - } - } - - #[sv::msg(instantiate)] - pub fn instantiate( - &self, - ctx: InstantiateCtx, - ) -> Result { - nonpayable(&ctx.info)?; - let denom = ctx.deps.querier.query_bonded_denom()?; - let config = Config { - denom, - converter: ctx.info.sender, - }; - self.config.save(ctx.deps.storage, &config)?; - Ok(Response::new()) - } - - #[sv::msg(query)] - fn config( - &self, - ctx: QueryCtx, - ) -> Result { - let cfg = self.config.load(ctx.deps.storage)?; - let denom = cfg.denom; - let converter = cfg.converter.into_string(); - Ok(ConfigResponse { denom, converter }) - } - - #[sv::msg(query)] - fn stake( - &self, - ctx: QueryCtx, - validator: String, - ) -> Result { - let stake = self - .stake - .may_load(ctx.deps.storage, &validator)? - .unwrap_or_default(); - Ok(StakeResponse { stake }) - } - - #[sv::msg(query)] - fn all_stake( - &self, - ctx: QueryCtx, - ) -> Result { - let stakes = self - .stake - .range(ctx.deps.storage, None, None, cosmwasm_std::Order::Ascending) - .collect::>()?; - Ok(AllStakeResponse { stakes }) - } -} - -#[cw_serde] -pub struct StakeResponse { - pub stake: Uint128, -} - -#[cw_serde] -pub struct AllStakeResponse { - pub stakes: Vec<(String, Uint128)>, -} - -#[cw_serde] -pub struct ConfigResponse { - pub denom: String, - pub converter: String, -} - -impl VirtualStakingApi for VirtualStakingMock<'_> { - type Error = ContractError; - type ExecC = custom::ConverterMsg; - type QueryC = custom::ConverterQuery; - - /// Requests to bond tokens to a validator. This will be actually handled at the next epoch. - /// If the virtual staking module is over the max cap, it will trigger a rebalance. - /// If the max cap is 0, then this will immediately return an error. - fn bond( - &self, - ctx: ExecCtx, - validator: String, - amount: Coin, - ) -> Result, Self::Error> { - nonpayable(&ctx.info)?; - let cfg = self.config.load(ctx.deps.storage)?; - ensure_eq!(ctx.info.sender, cfg.converter, ContractError::Unauthorized); // only the converter can call this - ensure_eq!( - amount.denom, - cfg.denom, - ContractError::WrongDenom(cfg.denom) - ); - - // Update the amount requested - self.stake - .update::<_, ContractError>(ctx.deps.storage, &validator, |old| { - Ok(old.unwrap_or_default() + amount.amount) - })?; - - Ok(Response::new()) - } - - /// Requests to unbond tokens from a validator. This will be actually handled at the next epoch. - /// If the virtual staking module is over the max cap, it will trigger a rebalance in addition to unbond. - /// If the virtual staking contract doesn't have at least amount tokens staked to the given validator, this will return an error. - fn unbond( - &self, - ctx: ExecCtx, - validator: String, - amount: Coin, - ) -> Result, Self::Error> { - nonpayable(&ctx.info)?; - let cfg = self.config.load(ctx.deps.storage)?; - ensure_eq!(ctx.info.sender, cfg.converter, ContractError::Unauthorized); // only the converter can call this - ensure_eq!( - amount.denom, - cfg.denom, - ContractError::WrongDenom(cfg.denom) - ); - - // Update the amount requested - self.stake - .update::<_, ContractError>(ctx.deps.storage, &validator, |old| { - Ok(old.unwrap_or_default() - amount.amount) - })?; - - Ok(Response::new()) - } - - /// Requests to unbond and burn tokens from a lists of validators (one or more). This will be actually handled at the next epoch. - /// If the virtual staking module is over the max cap, it will trigger a rebalance in addition to unbond. - /// If the virtual staking contract doesn't have at least amount tokens staked over the given validators, this will return an error. - fn burn( - &self, - ctx: ExecCtx, - validators: Vec, - amount: Coin, - ) -> Result, Self::Error> { - nonpayable(&ctx.info)?; - let cfg = self.config.load(ctx.deps.storage)?; - // only the converter can call this - ensure_eq!(ctx.info.sender, cfg.converter, ContractError::Unauthorized); - ensure_eq!( - amount.denom, - cfg.denom, - ContractError::WrongDenom(cfg.denom) - ); - - let mut stakes = vec![]; - for validator in validators { - let stake = self - .stake - .may_load(ctx.deps.storage, &validator)? - .unwrap_or_default() - .u128(); - if stake != 0 { - stakes.push((validator, stake)); - } - } - - // Error if no delegations - if stakes.is_empty() { - return Err(ContractError::InsufficientDelegations( - ctx.env.contract.address.to_string(), - amount.amount, - )); - } - - let (burned, burns) = mesh_burn::distribute_burn(stakes.as_slice(), amount.amount.u128()); - - // Bail if we still don't have enough stake - if burned < amount.amount.u128() { - return Err(ContractError::InsufficientDelegations( - ctx.env.contract.address.to_string(), - amount.amount, - )); - } - - // Update stake - for (validator, burn_amount) in burns { - self.stake - .update::<_, ContractError>(ctx.deps.storage, validator, |old| { - Ok(old.unwrap_or_default() - Uint128::new(burn_amount)) - })?; - } - - Ok(Response::new()) - } - - /// SudoMsg::HandleEpoch{} should be called once per epoch by the sdk (in EndBlock). - /// It allows the virtual staking contract to bond or unbond any pending requests, as well - /// as to perform a rebalance if needed (over the max cap). - /// - /// It should also withdraw all pending rewards here, and send them to the converter contract. - fn handle_epoch( - &self, - _ctx: SudoCtx, - ) -> Result, Self::Error> { - unimplemented!() - } - - /// SudoMsg::ValsetUpdate{} should be called every time there's a validator set update: - /// - Addition of a new validator to the active validator set. - /// - Temporary removal of a validator from the active set. (i.e. `unbonded` state). - /// - Update of validator data. - /// - Temporary removal of a validator from the active set due to jailing. Implies slashing. - /// - Addition of an existing validator to the active validator set. - /// - Permanent removal (i.e. tombstoning) of a validator from the active set. Implies slashing - fn handle_valset_update( - &self, - _ctx: SudoCtx, - _additions: Option>, - _removals: Option>, - _updated: Option>, - _jailed: Option>, - _unjailed: Option>, - _tombstoned: Option>, - _slashed: Option>, - ) -> Result, Self::Error> { - unimplemented!() - } -} diff --git a/contracts/consumer/virtual-staking/src/contract.rs b/contracts/consumer/virtual-staking/src/contract.rs index 52af7d8b..a963e7c2 100644 --- a/contracts/consumer/virtual-staking/src/contract.rs +++ b/contracts/consumer/virtual-staking/src/contract.rs @@ -18,7 +18,7 @@ use sylvia::{contract, schemars}; use mesh_apis::virtual_staking_api::{self, ValidatorSlash, VirtualStakingApi}; use crate::error::ContractError; -use crate::msg::ConfigResponse; +use crate::msg::{AllStakeResponse, ConfigResponse, StakeResponse}; use crate::state::Config; pub const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME"); @@ -221,6 +221,62 @@ impl VirtualStakingContract<'_> { Ok(Response::new()) } } + + /// This is only used for tests. + /// Ideally we want conditional compilation of these whole methods and the enum variants + #[sv::msg(exec)] + pub fn test_handle_epoch( + &self, + ctx: ExecCtx, + ) -> Result, ContractError> { + #[cfg(any(test, feature = "mt"))] + { + let ExecCtx { mut deps, .. } = ctx; + let requests: Vec<(String, Uint128)> = self + .bond_requests + .range( + deps.as_ref().storage, + None, + None, + cosmwasm_std::Order::Ascending, + ) + .collect::>()?; + + // Save the future values + self.bonded.save(deps.branch().storage, &requests)?; + Ok(Response::new()) + } + #[cfg(not(any(test, feature = "mt")))] + { + Err(ContractError::Unauthorized) + } + } + + #[sv::msg(query)] + fn get_stake( + &self, + ctx: QueryCtx, + validator: String, + ) -> Result { + let bonded = self.bonded.load(ctx.deps.storage)?; + + if let Some(stake) = bonded.iter().find(|&x| x.0 == validator) { + Ok(StakeResponse { stake: stake.1 }) + } else { + Ok(StakeResponse { + stake: Uint128::zero(), + }) + } + } + + #[sv::msg(query)] + fn get_all_stake( + &self, + ctx: QueryCtx, + ) -> Result { + let stakes = self.bonded.load(ctx.deps.storage)?; + Ok(AllStakeResponse { stakes }) + } } /// Returns a tuple containing the reward target and a boolean value diff --git a/contracts/consumer/virtual-staking/src/msg.rs b/contracts/consumer/virtual-staking/src/msg.rs index 6833b801..eeb70c50 100644 --- a/contracts/consumer/virtual-staking/src/msg.rs +++ b/contracts/consumer/virtual-staking/src/msg.rs @@ -1,4 +1,5 @@ use cosmwasm_schema::cw_serde; +use cosmwasm_std::Uint128; use crate::state::Config; @@ -11,6 +12,16 @@ pub struct ConfigResponse { pub converter: String, } +#[cw_serde] +pub struct StakeResponse { + pub stake: Uint128, +} + +#[cw_serde] +pub struct AllStakeResponse { + pub stakes: Vec<(String, Uint128)>, +} + impl From for ConfigResponse { fn from(config: Config) -> Self { Self { From 0844fed210ae013d08e95d33fc1f3e12ef742610 Mon Sep 17 00:00:00 2001 From: Trinity Date: Wed, 14 Aug 2024 12:14:11 +0700 Subject: [PATCH 2/2] handle unused variable --- contracts/consumer/virtual-staking/src/contract.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/consumer/virtual-staking/src/contract.rs b/contracts/consumer/virtual-staking/src/contract.rs index a963e7c2..be6a9014 100644 --- a/contracts/consumer/virtual-staking/src/contract.rs +++ b/contracts/consumer/virtual-staking/src/contract.rs @@ -248,6 +248,7 @@ impl VirtualStakingContract<'_> { } #[cfg(not(any(test, feature = "mt")))] { + let _ = ctx; Err(ContractError::Unauthorized) } }