diff --git a/target_chains/cosmwasm/Cargo.lock b/target_chains/cosmwasm/Cargo.lock index 905686a42f..cc448c9a27 100644 --- a/target_chains/cosmwasm/Cargo.lock +++ b/target_chains/cosmwasm/Cargo.lock @@ -67,18 +67,36 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + [[package]] name = "bigint" version = "4.4.3" @@ -129,6 +147,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "bnum" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" + [[package]] name = "borsh" version = "0.9.3" @@ -275,7 +299,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.60", ] [[package]] @@ -343,9 +367,22 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f22add0f9b2a5416df98c1d0248a8d8eedb882c38fbf0c5052b64eebe865df6d" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", + "ed25519-zebra", + "k256 0.11.6", + "rand_core 0.6.4", + "thiserror", +] + +[[package]] +name = "cosmwasm-crypto" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b08e6670ab9e13a1a8a9cfad8fdad48bf0aaf88a6e81f39f2d9b2fc79b1890" +dependencies = [ + "digest 0.10.7", "ed25519-zebra", - "k256", + "k256 0.13.3", "rand_core 0.6.4", "thiserror", ] @@ -359,13 +396,35 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cosmwasm-derive" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8b0918fc1a24b2ee08142c8d99d03f4c8e6d74244bdb304dbb29c0dab8e77e9" +dependencies = [ + "syn 1.0.109", +] + [[package]] name = "cosmwasm-schema" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe5ad2e23a971b9e4cd57b20cee3e2e79c33799bed4b128e473aca3702bfe5dd" dependencies = [ - "cosmwasm-schema-derive", + "cosmwasm-schema-derive 1.2.3", + "schemars", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cosmwasm-schema" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26dbdb5800ca67f2f2f938d67db59a7c5434af133c3e508779a4df7a9b5d533b" +dependencies = [ + "cosmwasm-schema-derive 2.0.2", "schemars", "serde", "serde_json", @@ -383,33 +442,66 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cosmwasm-schema-derive" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8ee47cf29f7688ebfa6ade8ddabcf51fc153f1157a3b46f5b4b1ce7a0316fdf" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "cosmwasm-std" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76fee88ff5bf7bef55bd37ac0619974701b99bf6bd4b16cf56ee8810718abd71" dependencies = [ - "base64", - "cosmwasm-crypto", - "cosmwasm-derive", + "base64 0.13.1", + "cosmwasm-crypto 1.2.3", + "cosmwasm-derive 1.2.3", "derivative", "forward_ref", "hex", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 0.5.1", "sha2 0.10.6", "thiserror", "uint", ] +[[package]] +name = "cosmwasm-std" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88191bd0d4743613eb7a2f086acb0838404cb531bf658382effafc7ba91e8320" +dependencies = [ + "base64 0.21.7", + "bech32", + "bnum", + "cosmwasm-crypto 2.0.2", + "cosmwasm-derive 2.0.2", + "derivative", + "forward_ref", + "hex", + "schemars", + "serde", + "serde-json-wasm 1.0.1", + "sha2 0.10.6", + "static_assertions", + "thiserror", +] + [[package]] name = "cosmwasm-storage" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "639bc36408bc1ac45e3323166ceeb8f0b91b55a941c4ad59d389829002fbbd94" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.2.3", "serde", ] @@ -422,8 +514,8 @@ dependencies = [ "bitflags", "bytecheck", "clru", - "cosmwasm-crypto", - "cosmwasm-std", + "cosmwasm-crypto 1.2.3", + "cosmwasm-std 1.2.3", "enumset", "hex", "loupe", @@ -581,6 +673,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -620,7 +724,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.2.3", "schemars", "serde", "thiserror", @@ -632,7 +736,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cb782b8f110819a4eb5dbbcfed25ffba49ec16bbe32b4ad8da50a5ce68fec05" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.2.3", "cw-utils", "schemars", "serde", @@ -682,6 +786,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "derivative" version = "2.2.0" @@ -704,11 +818,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -751,10 +866,24 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "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", + "digest 0.10.7", + "elliptic-curve 0.13.8", + "rfc6979 0.4.0", + "signature 2.2.0", + "spki 0.7.3", ] [[package]] @@ -784,16 +913,35 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", - "digest 0.10.6", - "ff", + "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", + "digest 0.10.7", + "ff 0.13.0", "generic-array", - "group", - "pkcs8", + "group 0.13.0", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -894,6 +1042,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fnv" version = "1.0.7" @@ -914,6 +1072,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -950,7 +1109,18 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff", + "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", "rand_core 0.6.4", "subtle", ] @@ -1013,7 +1183,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1101,9 +1271,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2 0.10.6", +] + +[[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", + "once_cell", "sha2 0.10.6", + "signature 2.2.0", ] [[package]] @@ -1150,7 +1334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -1393,9 +1577,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -1410,7 +1594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a10a056b61279b3529aeaa623b0a4b37b39b4b7061e833ff963fb4bc614d5e13" dependencies = [ "chrono", - "cosmwasm-std", + "cosmwasm-std 1.2.3", "osmosis-std-derive", "prost", "prost-types", @@ -1449,8 +1633,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "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", ] [[package]] @@ -1494,9 +1688,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1568,8 +1762,8 @@ version = "1.3.0" dependencies = [ "bigint", "byteorder", - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 1.2.3", + "cosmwasm-std 1.2.3", "cosmwasm-storage", "cosmwasm-vm", "generic-array", @@ -1623,8 +1817,8 @@ dependencies = [ name = "pyth-sdk-cw" version = "1.2.1" dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", + "cosmwasm-schema 2.0.2", + "cosmwasm-std 2.0.2", "pyth-sdk 0.7.0", "thiserror", ] @@ -1661,9 +1855,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1779,11 +1973,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac 0.12.1", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + [[package]] name = "rkyv" version = "0.7.41" @@ -1898,10 +2102,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "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", "generic-array", - "pkcs8", + "pkcs8 0.10.2", "subtle", "zeroize", ] @@ -1914,9 +2132,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -1939,6 +2157,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde-json-wasm" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.9" @@ -1950,13 +2177,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.60", ] [[package]] @@ -1989,7 +2216,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.60", ] [[package]] @@ -1998,7 +2225,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24b022bf813578a06341fd453c3fd6e64945d9975191193d5d45e8dbd97d1d84" dependencies = [ - "base64", + "base64 0.13.1", "itoa", "serde", "serde_bytes", @@ -2026,7 +2253,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2047,7 +2274,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -2057,7 +2284,17 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", + "rand_core 0.6.4", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", "rand_core 0.6.4", ] @@ -2089,7 +2326,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der 0.7.9", ] [[package]] @@ -2123,9 +2370,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -2157,7 +2404,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9540f8489ec6e098de380c9fa8fa81fa95e502f87d63705aa6fba56817ad1a7" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.2.3", "cosmwasm-storage", "cw20", "protobuf", @@ -2182,7 +2429,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.60", ] [[package]] @@ -2798,11 +3045,11 @@ name = "wormhole-cosmwasm" version = "0.1.0" source = "git+https://github.com/wormhole-foundation/wormhole?tag=rust-sdk-2024-01-25#55faa9ca1fe456e90e957b33aa7bcc565a33c3fa" dependencies = [ - "cosmwasm-std", + "cosmwasm-std 1.2.3", "cosmwasm-storage", "generic-array", "hex", - "k256", + "k256 0.11.6", "schemars", "serde", "sha3 0.9.1", @@ -2837,6 +3084,6 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/target_chains/cosmwasm/sdk/rust/Cargo.toml b/target_chains/cosmwasm/sdk/rust/Cargo.toml index d1584e6b5f..35ca06affc 100644 --- a/target_chains/cosmwasm/sdk/rust/Cargo.toml +++ b/target_chains/cosmwasm/sdk/rust/Cargo.toml @@ -16,6 +16,6 @@ osmosis=[] [dependencies] pyth-sdk = "0.7.0" -cosmwasm-std = { version = "1.0.0" } -cosmwasm-schema = "1.1.9" +cosmwasm-std = { version = "2.0.2" } +cosmwasm-schema = "2.0.2" thiserror = "1.0.20" diff --git a/target_chains/cosmwasm/sdk/rust/src/lib.rs b/target_chains/cosmwasm/sdk/rust/src/lib.rs index a66e23cba5..e89a5987ff 100644 --- a/target_chains/cosmwasm/sdk/rust/src/lib.rs +++ b/target_chains/cosmwasm/sdk/rust/src/lib.rs @@ -13,7 +13,7 @@ use { QueryResponses, }, cosmwasm_std::{ - to_binary, + to_json_binary, Addr, Binary, Coin, @@ -59,7 +59,7 @@ pub fn query_price_feed( ) -> StdResult { let price_feed_response = querier.query(&QueryRequest::Wasm(WasmQuery::Smart { contract_addr: contract_addr.into_string(), - msg: to_binary(&QueryMsg::PriceFeed { id })?, + msg: to_json_binary(&QueryMsg::PriceFeed { id })?, }))?; Ok(price_feed_response) } @@ -73,7 +73,7 @@ pub fn get_update_fee( ) -> StdResult { querier.query(&QueryRequest::Wasm(WasmQuery::Smart { contract_addr: contract_addr.into_string(), - msg: to_binary(&QueryMsg::GetUpdateFee { + msg: to_json_binary(&QueryMsg::GetUpdateFee { vaas: price_update_vaas.to_vec(), })?, })) @@ -90,7 +90,7 @@ pub fn get_update_fee_for_denom( ) -> StdResult { querier.query(&QueryRequest::Wasm(WasmQuery::Smart { contract_addr: contract_addr.into_string(), - msg: to_binary(&QueryMsg::GetUpdateFeeForDenom { + msg: to_json_binary(&QueryMsg::GetUpdateFeeForDenom { vaas: price_update_vaas.to_vec(), denom, })?, @@ -101,6 +101,6 @@ pub fn get_update_fee_for_denom( pub fn get_valid_time_period(querier: &QuerierWrapper, contract_addr: Addr) -> StdResult { querier.query(&QueryRequest::Wasm(WasmQuery::Smart { contract_addr: contract_addr.into_string(), - msg: to_binary(&QueryMsg::GetValidTimePeriod)?, + msg: to_json_binary(&QueryMsg::GetValidTimePeriod)?, })) } diff --git a/target_chains/cosmwasm/sdk/rust/src/testing.rs b/target_chains/cosmwasm/sdk/rust/src/testing.rs index b202bdb015..9225e67e5c 100644 --- a/target_chains/cosmwasm/sdk/rust/src/testing.rs +++ b/target_chains/cosmwasm/sdk/rust/src/testing.rs @@ -7,19 +7,11 @@ use { QueryMsg, }, cosmwasm_std::{ - from_binary, - to_binary, - Binary, - Coin, - ContractResult, - QuerierResult, - SystemError, - SystemResult, + from_json, to_json_binary, Binary, Coin, ContractResult, QuerierResult, SystemError, SystemResult }, std::{ collections::HashMap, time::Duration, - u128, }, }; @@ -58,18 +50,18 @@ impl MockPyth { /// `https://github.com/pyth-network/pyth-crosschain/blob/main/target_chains/cosmwasm/examples/cw-contract/src/contract.rs#L13` /// for how to use this handler within your tests. pub fn handle_wasm_query(&self, msg: &Binary) -> QuerierResult { - let query_msg = from_binary::(msg); + let query_msg = from_json::(msg); match query_msg { Ok(QueryMsg::PriceFeed { id }) => match self.feeds.get(&id) { Some(feed) => { - SystemResult::Ok(to_binary(&PriceFeedResponse { price_feed: *feed }).into()) + SystemResult::Ok(to_json_binary(&PriceFeedResponse { price_feed: *feed }).into()) } None => SystemResult::Ok(ContractResult::from(Err( PythContractError::PriceFeedNotFound, ))), }, Ok(QueryMsg::GetValidTimePeriod) => { - SystemResult::Ok(to_binary(&self.valid_time_period).into()) + SystemResult::Ok(to_json_binary(&self.valid_time_period).into()) } Ok(QueryMsg::GetUpdateFee { vaas }) => { @@ -79,7 +71,7 @@ impl MockPyth { .u128() .checked_mul(vaas.len() as u128) .unwrap(); - SystemResult::Ok(to_binary(&Coin::new(new_amount, &self.fee_per_vaa.denom)).into()) + SystemResult::Ok(to_json_binary(&Coin::new(new_amount, &self.fee_per_vaa.denom)).into()) } #[cfg(feature = "osmosis")] Ok(QueryMsg::GetUpdateFeeForDenom { vaas, denom }) => { @@ -89,7 +81,7 @@ impl MockPyth { .u128() .checked_mul(vaas.len() as u128) .unwrap(); - SystemResult::Ok(to_binary(&Coin::new(new_amount, denom)).into()) + SystemResult::Ok(to_json_binary(&Coin::new(new_amount, denom)).into()) } Err(_e) => SystemResult::Err(SystemError::InvalidRequest { error: "Invalid message".into(),