diff --git a/Cargo.lock b/Cargo.lock index 4c9fa76..e4fd3fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,11 +2,22 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "autocfg" @@ -22,9 +33,9 @@ checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" @@ -34,9 +45,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bech32" @@ -70,9 +81,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" dependencies = [ "serde", ] @@ -85,9 +96,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "const-oid" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "cosmos-sdk-proto" @@ -95,8 +106,8 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20b42021d8488665b1a0d9748f1f81df7235362d194f44481e2e61bf376b77b4" dependencies = [ - "prost 0.11.0", - "prost-types 0.11.1", + "prost 0.11.6", + "prost-types 0.11.6", "tendermint-proto 0.23.9", ] @@ -106,8 +117,8 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4776e787b24d9568dd61d3237eeb4eb321d622fb881b858c7b82806420e87d4" dependencies = [ - "prost 0.11.0", - "prost-types 0.11.1", + "prost 0.11.6", + "prost-types 0.11.6", "tendermint-proto 0.27.0", ] @@ -117,7 +128,7 @@ version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "227315dc11f0bb22a273d0c43d3ba8ef52041c42cf959f09045388a89c57e661" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "ed25519-zebra", "k256", "rand_core 0.6.4", @@ -135,9 +146,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema" -version = "1.1.4" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6fe57b9e59a87a406b825cbe647f6456e1a853f8d4c99bffcc20957fd29d6" +checksum = "04135971e2c3b867eb793ca4e832543c077dbf72edaef7672699190f8fcdb619" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -148,9 +159,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.1.4" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e8cfc90b557a8ed272c9daf0ff3634e6b9f4698a19832bba6a4c7baa46da04" +checksum = "a06c8f516a13ae481016aa35f0b5c4652459e8aee65b15b6fb51547a07cea5a0" dependencies = [ "proc-macro2", "quote", @@ -163,7 +174,7 @@ version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b13d5a84d15cf7be17dc249a21588cdb0f7ef308907c50ce2723316a7d79c3dc" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "cosmwasm-crypto", "cosmwasm-derive", "derivative", @@ -226,17 +237,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cw-storage-plus" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8b264257c4f44c49b7ce09377af63aa040768ecd3fd7bdd2d48a09323a1e90" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - [[package]] name = "cw-storage-plus" version = "0.15.1" @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", "zeroize", @@ -304,9 +304,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -315,9 +315,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" @@ -333,16 +333,16 @@ dependencies = [ [[package]] name = "ed25519-zebra" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek", + "hashbrown", "hex", "rand_core 0.6.4", "serde", "sha2 0.9.9", - "thiserror", "zeroize", ] @@ -361,7 +361,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.5", + "digest 0.10.6", "ff", "generic-array", "group", @@ -374,9 +374,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", "subtle", @@ -409,24 +409,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -440,6 +429,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + [[package]] name = "hex" version = "0.4.3" @@ -452,7 +450,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -461,9 +459,9 @@ version = "0.1.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus 1.0.1", "cw2", - "neutron-sdk", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b)", "protobuf", "schemars", "serde", @@ -481,9 +479,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "k256" @@ -499,14 +497,34 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.133" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "neutron-sdk" +version = "0.1.0" +source = "git+https://github.com/neutron-org/neutron-contracts.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b#2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b" +dependencies = [ + "base64 0.20.0", + "bech32", + "cosmos-sdk-proto 0.16.0", + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus 1.0.1", + "prost 0.11.6", + "protobuf", + "schemars", + "serde", + "serde-json-wasm", + "serde_json", + "thiserror", +] [[package]] name = "neutron-sdk" version = "0.1.0" -source = "git+https://github.com/neutron-org/neutron-sdk.git?rev=6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a#6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a" +source = "git+https://github.com/neutron-org/neutron-sdk.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b#2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b" dependencies = [ "base64 0.20.0", "bech32", @@ -514,7 +532,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 1.0.1", - "prost 0.11.0", + "prost 0.11.6", "protobuf", "schemars", "serde", @@ -527,14 +545,14 @@ dependencies = [ name = "neutron_interchain_queries" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "cosmos-sdk-proto 0.14.0", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus 1.0.1", "cw2", - "neutron-sdk", - "prost 0.11.0", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b)", + "prost 0.11.6", "schemars", "serde", "serde-json-wasm", @@ -544,16 +562,16 @@ dependencies = [ name = "neutron_interchain_txs" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bech32", "cosmos-sdk-proto 0.14.0", "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus 1.0.1", "cw2", - "neutron-sdk", - "prost 0.11.0", - "prost-types 0.11.1", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-contracts.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b)", + "prost 0.11.6", + "prost-types 0.11.6", "protobuf", "schemars", "serde", @@ -565,15 +583,15 @@ dependencies = [ name = "neutron_validators_test" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bech32", "cosmos-sdk-proto 0.14.0", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus 1.0.1", "cw2", - "neutron-sdk", - "prost 0.11.0", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b)", + "prost 0.11.6", "prost-types 0.10.1", "protobuf", "schemars", @@ -613,9 +631,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -625,9 +643,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pkcs8" @@ -641,9 +659,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] @@ -660,12 +678,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.0" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", - "prost-derive 0.11.0", + "prost-derive 0.11.6", ] [[package]] @@ -683,9 +701,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.0" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -706,12 +724,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.1" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", - "prost 0.11.0", + "prost 0.11.6", ] [[package]] @@ -737,9 +755,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -749,9 +767,6 @@ name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] [[package]] name = "rand_core" @@ -759,7 +774,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom", ] [[package]] @@ -769,16 +784,16 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw2", - "neutron-sdk", + "neutron-sdk 0.1.0 (git+https://github.com/neutron-org/neutron-sdk.git?rev=2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b)", "schemars", "serde", ] [[package]] name = "rfc6979" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c86280f057430a52f4861551b092a01b419b8eacefc7c995eacb9dc132fe32" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint", "hmac", @@ -787,15 +802,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "schemars" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed" +checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" dependencies = [ "dyn-clone", "schemars_derive", @@ -805,9 +820,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743" +checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" dependencies = [ "proc-macro2", "quote", @@ -831,9 +846,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -849,18 +864,18 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -880,9 +895,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -910,7 +925,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -919,7 +934,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -956,9 +971,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.102" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -975,8 +990,8 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.0", - "prost-types 0.11.1", + "prost 0.11.6", + "prost-types 0.11.6", "serde", "serde_bytes", "subtle-encoding", @@ -993,8 +1008,8 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.0", - "prost-types 0.11.1", + "prost 0.11.6", + "prost-types 0.11.6", "serde", "serde_bytes", "subtle-encoding", @@ -1003,18 +1018,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1040,15 +1055,15 @@ checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "uint" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -1058,9 +1073,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "version_check" @@ -1068,12 +1083,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt index 43d0933..a1bce03 100644 --- a/artifacts/checksums.txt +++ b/artifacts/checksums.txt @@ -1,5 +1,5 @@ -c7ed506092e89eefca6e293e8ed7d35b1f58f094381d0d2257fcdbcb45dfeb91 ibc_transfer.wasm -c7a43bce3c73e1d3a555e86c1fe9f284ea8eeb37373745c356ae0ba10465b6c8 neutron_interchain_queries.wasm -a54bb822ce4b9c5350646df16372e57f43ce3ed80fdd6aa8a2df6146f3eb7461 neutron_interchain_txs.wasm -0c2f7fb79d7986545536664576167271d85a3411e7c19ab553219312ddcca479 neutron_validators_test.wasm -072f3c7f5c7f27b03b949cf2a3fc2558de857ec8b3fc3a9a60d5f0ea3bc58851 reflect.wasm +49d4f73126e31738ae13591a01f89c6a441006dc3068124d19ce676b7403d602 ibc_transfer.wasm +23d30e7c997387139fc6480fcf6ec2a8fe4aeed16aa0b299937a183d49f05968 neutron_interchain_queries.wasm +8f49a5e4018576ff3292e78f53c8adf76014bf05d43452915711b47e80caa59b neutron_interchain_txs.wasm +99d7c8e439237678f15d0d0d17f2e68384cffc428a5f05773041ba7e573caffc neutron_validators_test.wasm +0490b9740d56337c2077c81343664ba93ce32aa81a2464bef920974e878fb47e reflect.wasm diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt index e447c60..c925e35 100644 --- a/artifacts/checksums_intermediate.txt +++ b/artifacts/checksums_intermediate.txt @@ -1,5 +1,5 @@ -e03020e1c1c0bf4bfcbde395f359ee50f6f837842044c2c812434202a0fc7c6c target/wasm32-unknown-unknown/release/ibc_transfer.wasm -04e9ca02f3caa5eec0bf91731477aec315a3e14b065da56b2248b661769e620e target/wasm32-unknown-unknown/release/neutron_interchain_queries.wasm -49aec477b48a9e23b5ae787c8cc93337bfe54571e45eae89fd1074ad135fe470 target/wasm32-unknown-unknown/release/neutron_interchain_txs.wasm -0cc3a704c7f4b1fb1bd8d0221e67757f6e5043cf0ac6fbe811ed00626096d44f target/wasm32-unknown-unknown/release/neutron_validators_test.wasm -96ad7090b712befc6e9eca4542f5d5623714df6898eb17a4f0ce04341ec7a72e target/wasm32-unknown-unknown/release/reflect.wasm +af733ce3de2894e2047396b3f525ce4b0e3d518c41a26491e4da165d34655fc0 target/wasm32-unknown-unknown/release/ibc_transfer.wasm +5cc2f2b312e4967c4626d9043e1ad19d73b7badcfc4ed79efc1d4e50b2b803a8 target/wasm32-unknown-unknown/release/neutron_interchain_queries.wasm +f6976cd17de2d17df7ef053cb4f91269f5542409754a23718b5b83cfc066d458 target/wasm32-unknown-unknown/release/neutron_interchain_txs.wasm +b97da17c5de6ae9e642999d995b2a2b5a33c8731b426828f94ba8b9ada6d24bf target/wasm32-unknown-unknown/release/neutron_validators_test.wasm +879912369c5ad94e1b7ee16e2d62d55c8fa79ee44873504dc68959e7bb33e03d target/wasm32-unknown-unknown/release/reflect.wasm diff --git a/artifacts/ibc_transfer.wasm b/artifacts/ibc_transfer.wasm index 3ab3c90..3b14edd 100644 Binary files a/artifacts/ibc_transfer.wasm and b/artifacts/ibc_transfer.wasm differ diff --git a/artifacts/neutron_interchain_queries.wasm b/artifacts/neutron_interchain_queries.wasm index 3bd6e3d..cac5cb0 100644 Binary files a/artifacts/neutron_interchain_queries.wasm and b/artifacts/neutron_interchain_queries.wasm differ diff --git a/artifacts/neutron_interchain_txs.wasm b/artifacts/neutron_interchain_txs.wasm index 38abb4c..0b591c3 100644 Binary files a/artifacts/neutron_interchain_txs.wasm and b/artifacts/neutron_interchain_txs.wasm differ diff --git a/artifacts/neutron_validators_test.wasm b/artifacts/neutron_validators_test.wasm index 8700427..0163b61 100644 Binary files a/artifacts/neutron_validators_test.wasm and b/artifacts/neutron_validators_test.wasm differ diff --git a/artifacts/reflect.wasm b/artifacts/reflect.wasm index bcf94a5..3dc6433 100644 Binary files a/artifacts/reflect.wasm and b/artifacts/reflect.wasm differ diff --git a/contracts/ibc_transfer/Cargo.toml b/contracts/ibc_transfer/Cargo.toml index 458a92d..1ddcb9e 100644 --- a/contracts/ibc_transfer/Cargo.toml +++ b/contracts/ibc_transfer/Cargo.toml @@ -38,9 +38,9 @@ cw2 = "0.15.1" schemars = "0.8.10" serde = { version = "1.0.103", default-features = false, features = ["derive"] } serde-json-wasm = { version = "0.4.1" } -cw-storage-plus = { version = "0.14.0", features = ["iterator"]} -neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a"} +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} +neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk.git", rev="2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b", default-features = false} protobuf = { version = "3.2.0", features = ["with-bytes"] } - + [dev-dependencies] cosmwasm-schema = { version = "1.0.0", default-features = false } diff --git a/contracts/ibc_transfer/schema/execute_msg.json b/contracts/ibc_transfer/schema/execute_msg.json index 910eb5d..7a5ee25 100644 --- a/contracts/ibc_transfer/schema/execute_msg.json +++ b/contracts/ibc_transfer/schema/execute_msg.json @@ -67,6 +67,12 @@ "denom": { "type": "string" }, + "payer": { + "type": [ + "string", + "null" + ] + }, "recv_fee": { "type": "integer", "format": "uint128", diff --git a/contracts/ibc_transfer/src/contract.rs b/contracts/ibc_transfer/src/contract.rs index ab72b20..e2c4403 100644 --- a/contracts/ibc_transfer/src/contract.rs +++ b/contracts/ibc_transfer/src/contract.rs @@ -57,6 +57,7 @@ pub enum ExecuteMsg { ack_fee: u128, timeout_fee: u128, denom: String, + payer: Option, }, /// Used only in integration tests framework to simulate failures. /// After executing this message, contract will fail, all of this happening @@ -93,7 +94,8 @@ pub fn execute( ack_fee, timeout_fee, denom, - } => execute_set_fees(deps, recv_fee, ack_fee, timeout_fee, denom), + payer, + } => execute_set_fees(deps, recv_fee, ack_fee, timeout_fee, denom, payer), // Used only in integration tests framework to simulate failures. // After executing this message, contract fail, all of this happening // in sudo callback handler. @@ -183,11 +185,21 @@ fn execute_set_fees( ack_fee: u128, timeout_fee: u128, denom: String, + payer: Option, ) -> StdResult> { + let payer = match payer { + Some(payer) => match deps.api.addr_validate(&payer) { + Ok(addr) => Some(addr), + Err(_) => return Err(StdError::generic_err("Invalid payer address")), + }, + None => None, + }; + let fee = IbcFee { recv_fee: get_fee_item(denom.clone(), recv_fee), ack_fee: get_fee_item(denom.clone(), ack_fee), timeout_fee: get_fee_item(denom, timeout_fee), + payer, }; IBC_FEE.save(deps.storage, &fee)?; diff --git a/contracts/neutron_interchain_queries/Cargo.toml b/contracts/neutron_interchain_queries/Cargo.toml index 14db534..4a0217d 100644 --- a/contracts/neutron_interchain_queries/Cargo.toml +++ b/contracts/neutron_interchain_queries/Cargo.toml @@ -36,10 +36,10 @@ cosmwasm-std = { version = "1.0.0", features = ["staking"] } cw2 = "0.15.1" schemars = "0.8.10" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a"} +neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b"} base64 = "0.13.0" cosmos-sdk-proto = { version = "0.14.0", default-features = false } -cw-storage-plus = { version = "0.14.0", features = ["iterator"]} +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} prost = "0.11" serde-json-wasm = "0.4.1" diff --git a/contracts/neutron_interchain_txs/Cargo.toml b/contracts/neutron_interchain_txs/Cargo.toml index 9e74609..00b3a16 100644 --- a/contracts/neutron_interchain_txs/Cargo.toml +++ b/contracts/neutron_interchain_txs/Cargo.toml @@ -39,7 +39,7 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] } serde-json-wasm = { version = "0.4.1" } cw-storage-plus = { version = "1.0.1", features = ["iterator"]} cosmos-sdk-proto = { version = "0.14.0", default-features = false } -neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a"} +neutron-sdk = { git = "https://github.com/neutron-org/neutron-contracts.git", rev="2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b", default-features = false} base64 = "0.13.0" protobuf = { version = "3.2.0", features = ["with-bytes"] } prost = "0.11" diff --git a/contracts/neutron_interchain_txs/schema/execute_msg.json b/contracts/neutron_interchain_txs/schema/execute_msg.json index 5a4bb71..d0cbb95 100644 --- a/contracts/neutron_interchain_txs/schema/execute_msg.json +++ b/contracts/neutron_interchain_txs/schema/execute_msg.json @@ -49,6 +49,12 @@ "denom": { "type": "string" }, + "payer": { + "type": [ + "string", + "null" + ] + }, "recv_fee": { "type": "integer", "format": "uint128", diff --git a/contracts/neutron_interchain_txs/src/contract.rs b/contracts/neutron_interchain_txs/src/contract.rs index f30f662..50786a5 100644 --- a/contracts/neutron_interchain_txs/src/contract.rs +++ b/contracts/neutron_interchain_txs/src/contract.rs @@ -123,7 +123,8 @@ pub fn execute( recv_fee, ack_fee, timeout_fee, - } => execute_set_fees(deps, denom, recv_fee, ack_fee, timeout_fee), + payer, + } => execute_set_fees(deps, denom, recv_fee, ack_fee, timeout_fee, payer), ExecuteMsg::CleanAckResults {} => execute_clean_ack_results(deps), // Used only in integration tests framework to simulate failures. // After executing this message, contract fail, all of this happening @@ -206,7 +207,16 @@ fn execute_set_fees( recv_fee: u128, ack_fee: u128, timeout_fee: u128, + payer: Option, ) -> StdResult> { + let payer = match payer { + Some(payer) => match deps.api.addr_validate(&payer) { + Ok(addr) => Some(addr), + Err(_) => return Err(StdError::generic_err("Invalid payer address")), + }, + None => None, + }; + let fees = IbcFee { recv_fee: vec![CosmosCoin { denom: denom.clone(), @@ -220,6 +230,7 @@ fn execute_set_fees( denom, amount: Uint128::from(timeout_fee), }], + payer, }; IBC_FEE.save(deps.storage, &fees)?; Ok(Response::default()) diff --git a/contracts/neutron_interchain_txs/src/msg.rs b/contracts/neutron_interchain_txs/src/msg.rs index bb0cff4..c197808 100644 --- a/contracts/neutron_interchain_txs/src/msg.rs +++ b/contracts/neutron_interchain_txs/src/msg.rs @@ -40,6 +40,7 @@ pub enum ExecuteMsg { recv_fee: u128, ack_fee: u128, timeout_fee: u128, + payer: Option, }, Delegate { interchain_account_id: String, diff --git a/contracts/neutron_validator_test/Cargo.toml b/contracts/neutron_validator_test/Cargo.toml index 1fd169b..a36aa1f 100644 --- a/contracts/neutron_validator_test/Cargo.toml +++ b/contracts/neutron_validator_test/Cargo.toml @@ -37,9 +37,9 @@ cw2 = "0.15.1" schemars = "0.8.10" serde = { version = "1.0.103", default-features = false, features = ["derive"] } serde-json-wasm = { version = "0.4.1" } -cw-storage-plus = { version = "0.14.0", features = ["iterator"]} +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} cosmos-sdk-proto = { version = "0.14.0", default-features = false } -neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a"} +neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b"} base64 = "0.13.0" protobuf = { version = "3", features = ["with-bytes"] } prost = "0.11" diff --git a/contracts/neutron_validator_test/src/contract.rs b/contracts/neutron_validator_test/src/contract.rs index 25ecf4d..a35340d 100644 --- a/contracts/neutron_validator_test/src/contract.rs +++ b/contracts/neutron_validator_test/src/contract.rs @@ -243,6 +243,7 @@ fn execute_set_fees( recv_fee: get_fee_item(denom.clone(), recv_fee), ack_fee: get_fee_item(denom.clone(), ack_fee), timeout_fee: get_fee_item(denom, timeout_fee), + payer: None, }; IBC_FEE.save(deps.storage, &fee)?; diff --git a/contracts/reflect/Cargo.toml b/contracts/reflect/Cargo.toml index e2e7a70..1c822b1 100644 --- a/contracts/reflect/Cargo.toml +++ b/contracts/reflect/Cargo.toml @@ -37,7 +37,7 @@ cosmwasm-std = { version = "1.0.0", features = ["staking"] } cw2 = "0.15.1" schemars = "0.8.10" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="6e9fa85595e6ec5853bc01e1ac2ade93d8b6526a"} +neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="2085fd7506ca52de6eb7b6d9f23f89067f1d8e2b"} [dev-dependencies] cosmwasm-schema = { version = "1.0.0", default-features = false }