From 4f351290e4a48a78c9096811ab96f90737008617 Mon Sep 17 00:00:00 2001 From: Sean Chen Date: Fri, 9 Aug 2024 14:41:09 -0500 Subject: [PATCH] Update basecoin to reflect ibc-rs 0.54 changes (#189) * Use UpgradeClientStatePath and UpgradeConsensusStatePath types * deps: update ibc revision * deps: update informalsystems/tower-abci revision * fix: place tower-abci under patch.crates-io * Revert cargo.toml dependencies * fix: place tower-abci under patch.crates-io * Format cargo.toml files * Bump basecoin to v0.2.0 --------- Co-authored-by: Farhad Shabani --- Cargo.lock | 746 +++++++++++++----------- Cargo.toml | 32 +- basecoin/modules/src/ibc/impls.rs | 7 +- basecoin/modules/src/upgrade/impls.rs | 26 +- basecoin/modules/src/upgrade/service.rs | 7 +- 5 files changed, 448 insertions(+), 370 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4298a11e..afd48ac1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -34,33 +34,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -74,9 +74,9 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -108,15 +108,21 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -125,18 +131,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -145,7 +150,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -153,17 +158,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -219,7 +227,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basecoin" -version = "0.1.0" +version = "0.2.0" dependencies = [ "basecoin-app", "basecoin-modules", @@ -251,7 +259,7 @@ dependencies = [ [[package]] name = "basecoin-app" -version = "0.1.0" +version = "0.2.0" dependencies = [ "basecoin-modules", "basecoin-store", @@ -259,9 +267,9 @@ dependencies = [ "ibc-proto", "prost", "serde_json", - "tendermint 0.37.0", + "tendermint", "tendermint-abci", - "tendermint-proto 0.37.0", + "tendermint-proto", "tonic", "tower", "tower-abci", @@ -270,7 +278,7 @@ dependencies = [ [[package]] name = "basecoin-modules" -version = "0.1.0" +version = "0.2.0" dependencies = [ "base64 0.22.1", "basecoin-store", @@ -287,7 +295,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.8", - "tendermint 0.37.0", + "tendermint", "tendermint-rpc", "tonic", "tracing", @@ -295,7 +303,7 @@ dependencies = [ [[package]] name = "basecoin-store" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", "ics23", @@ -304,7 +312,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "tendermint 0.37.0", + "tendermint", "tracing", ] @@ -316,9 +324,9 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" [[package]] name = "bip32" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164" +checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b" dependencies = [ "bs58", "hmac", @@ -361,9 +369,9 @@ checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" [[package]] name = "bitcoin-units" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb54da0b28892f3c52203a7191534033e051b6f4b52bc15480681b57b7e036f5" +checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" dependencies = [ "bitcoin-internals", ] @@ -386,9 +394,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake2" @@ -401,9 +409,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -453,18 +461,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.99" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cfg-if" @@ -474,9 +482,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.7" +version = "4.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "c937d4061031a6d0c8da4b9a4f98a172fc2976dfb1c19213a9cf7d0d3c837e36" dependencies = [ "clap_builder", "clap_derive", @@ -484,9 +492,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "85379ba512b21a328adf887e85f7742d12e96eb31f3ef077df4ffc26b506ffed" dependencies = [ "anstream", "anstyle", @@ -497,9 +505,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -509,15 +517,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "const-oid" @@ -549,20 +557,20 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cosmos-sdk-proto" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e23f6ab56d5f031cde05b8b82a5fefd3a1a223595c79e32317a97189e612bc" +checksum = "8b2f63ab112b8c8e7b8a29c891adc48f43145beb21c0bfbf562957072c1e0beb" dependencies = [ "prost", "prost-types", - "tendermint-proto 0.35.0", + "tendermint-proto", ] [[package]] name = "cosmrs" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d184abb7b0039cc64f282dfa5b34165e4c5a7410ab46804636d53f4d09aee44" +checksum = "9f21bb63ec6a903510a3d01f44735dd4914724e5eccbe409e6da6833d17c7829" dependencies = [ "bip32", "cosmos-sdk-proto", @@ -574,7 +582,7 @@ dependencies = [ "serde_json", "signature", "subtle-encoding", - "tendermint 0.35.0", + "tendermint", "thiserror", ] @@ -729,9 +737,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -971,8 +979,27 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.2.6", + "http 0.2.12", + "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util 0.7.11", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.3.0", "slab", "tokio", "tokio-util 0.7.11", @@ -1063,6 +1090,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -1070,7 +1108,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -1088,17 +1149,17 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1110,6 +1171,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1117,8 +1199,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.30", "rustls", "tokio", "tokio-rustls", @@ -1126,20 +1208,41 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ - "hyper", + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", + "socket2", "tokio", - "tokio-io-timeout", + "tower", + "tower-service", + "tracing", ] [[package]] name = "ibc" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-apps", "ibc-clients", @@ -1152,7 +1255,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1162,7 +1265,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1176,7 +1279,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-app-transfer", ] @@ -1184,7 +1287,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1194,14 +1297,14 @@ dependencies = [ "ibc-core-host", "ibc-primitives", "serde", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", ] [[package]] name = "ibc-client-tendermint-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1210,15 +1313,15 @@ dependencies = [ "ibc-primitives", "ibc-proto", "serde", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", - "tendermint-proto 0.37.0", + "tendermint-proto", ] [[package]] name = "ibc-client-wasm-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1232,7 +1335,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1241,7 +1344,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1257,7 +1360,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1272,7 +1375,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1285,13 +1388,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-client" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1304,7 +1407,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1314,13 +1417,13 @@ dependencies = [ "ibc-core-host-types", "ibc-primitives", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-client-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1330,13 +1433,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-commitment-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1351,7 +1454,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1363,7 +1466,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1374,13 +1477,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-handler" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1395,7 +1498,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1409,13 +1512,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-host" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1433,7 +1536,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1450,13 +1553,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-host-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1467,7 +1570,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1481,7 +1584,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", @@ -1490,13 +1593,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-derive" version = "0.7.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "proc-macro2", "quote", @@ -1506,22 +1609,22 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "derive_more", "displaydoc", "ibc-proto", "prost", "serde", - "tendermint 0.37.0", + "tendermint", "time", ] [[package]] name = "ibc-proto" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65" +checksum = "1678333cf68c9094ca66aaf9a271269f1f6bf5c26881161def8bd88cee831a23" dependencies = [ "base64 0.22.1", "bytes", @@ -1531,14 +1634,14 @@ dependencies = [ "prost", "serde", "subtle-encoding", - "tendermint-proto 0.37.0", + "tendermint-proto", "tonic", ] [[package]] name = "ibc-query" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=e36015c#e36015c94122faddb2e6cacec464b6c6f9749c91" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=6c7a65e#6c7a65e646f7bcae1d4ba6c9054059ca966bb979" dependencies = [ "displaydoc", "ibc", @@ -1548,9 +1651,9 @@ dependencies = [ [[package]] name = "ics23" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3b8be84e7285c73b88effdc3294b552277d6b0ec728ee016c861b7b9a2c19c" +checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12" dependencies = [ "anyhow", "blake2", @@ -1602,9 +1705,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1628,15 +1731,15 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1679,9 +1782,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -1707,9 +1810,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "matchit" @@ -1740,13 +1843,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1765,17 +1869,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1785,21 +1878,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" -version = "0.36.0" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -1848,7 +1931,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1868,9 +1951,9 @@ dependencies = [ [[package]] name = "peg" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a625d12ad770914cbf7eff6f9314c3ef803bfe364a1b20bc36ddf56673e71e5" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" dependencies = [ "peg-macros", "peg-runtime", @@ -1878,9 +1961,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" dependencies = [ "peg-runtime", "proc-macro2", @@ -1949,9 +2032,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "primitive-types" @@ -1975,9 +2061,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -1985,9 +2071,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", "itertools", @@ -1998,9 +2084,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ "prost", ] @@ -2046,11 +2132,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2064,10 +2150,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-rustls", "ipnet", "js-sys", @@ -2082,7 +2168,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls", @@ -2146,7 +2232,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2279,11 +2365,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2292,9 +2378,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -2308,9 +2394,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -2326,18 +2412,18 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", @@ -2346,11 +2432,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2368,9 +2455,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2504,9 +2591,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subtle-encoding" @@ -2525,9 +2612,9 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "2.0.67" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -2540,6 +2627,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "system-configuration" version = "0.5.1" @@ -2563,9 +2656,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.35.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" +checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" dependencies = [ "bytes", "digest 0.10.7", @@ -2587,103 +2680,56 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto 0.35.0", - "time", - "zeroize", -] - -[[package]] -name = "tendermint" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42" -dependencies = [ - "bytes", - "digest 0.10.7", - "ed25519", - "ed25519-consensus", - "flex-error", - "futures", - "num-traits", - "once_cell", - "prost", - "prost-types", - "serde", - "serde_bytes", - "serde_json", - "serde_repr", - "sha2 0.10.8", - "signature", - "subtle", - "subtle-encoding", - "tendermint-proto 0.37.0", + "tendermint-proto", "time", "zeroize", ] [[package]] name = "tendermint-abci" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4dafb8cd52d40bcda1c40c826a7e63c744fd46d4c67a8ec4fe98a6f6499a790" +checksum = "1fb2c67292d6ab192d9264f634cf1fc34d4481950432904765c5813dafa0b140" dependencies = [ "bytes", "flex-error", "prost", - "tendermint-proto 0.37.0", + "tendermint-proto", "tracing", ] [[package]] name = "tendermint-config" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84b11b57d20ee4492a1452faff85f5c520adc36ca9fe5e701066935255bb89f" +checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" dependencies = [ "flex-error", "serde", "serde_json", - "tendermint 0.37.0", + "tendermint", "toml", "url", ] [[package]] name = "tendermint-light-client-verifier" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e" +checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" dependencies = [ "derive_more", "flex-error", "serde", - "tendermint 0.37.0", + "tendermint", "time", ] [[package]] name = "tendermint-proto" -version = "0.35.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" -dependencies = [ - "bytes", - "flex-error", - "num-derive", - "num-traits", - "prost", - "prost-types", - "serde", - "serde_bytes", - "subtle-encoding", - "time", -] - -[[package]] -name = "tendermint-proto" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87" +checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" dependencies = [ "bytes", "flex-error", @@ -2697,9 +2743,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdc2281e271277fda184d96d874a6fe59f569b130b634289257baacfc95aa85" +checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" dependencies = [ "async-trait", "bytes", @@ -2716,9 +2762,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", "tendermint-config", - "tendermint-proto 0.37.0", + "tendermint-proto", "thiserror", "time", "tokio", @@ -2740,18 +2786,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -2819,9 +2865,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2834,38 +2880,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -2922,9 +2957,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2934,20 +2969,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_spanned", "toml_datetime", @@ -2956,23 +2991,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", + "socket2", "tokio", "tokio-stream", "tower", @@ -2983,9 +3021,9 @@ dependencies = [ [[package]] name = "tonic-reflection" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" +checksum = "b742c83ad673e9ab5b4ce0981f7b9e8932be9d60e8682cbf9120494764dbc173" dependencies = [ "prost", "prost-types", @@ -3017,15 +3055,15 @@ dependencies = [ [[package]] name = "tower-abci" -version = "0.14.0" -source = "git+https://github.com/informalsystems/tower-abci?rev=37d952e#37d952e5cd8405cf47e761a20ac3a377119b0ad5" +version = "0.16.0" +source = "git+https://github.com/informalsystems/tower-abci?rev=0992541#099254105a8441f6e3284c773990a2bad4b25344" dependencies = [ "bytes", "futures", "pin-project", "prost", - "tendermint 0.37.0", - "tendermint-proto 0.37.0", + "tendermint", + "tendermint-proto", "tokio", "tokio-stream", "tokio-util 0.6.10", @@ -3173,9 +3211,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "valuable" @@ -3185,9 +3223,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3308,11 +3346,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3336,7 +3374,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3356,18 +3403,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3378,9 +3425,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3390,9 +3437,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3402,15 +3449,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3420,9 +3467,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3432,9 +3479,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3444,9 +3491,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3456,15 +3503,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -3479,6 +3526,27 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/Cargo.toml b/Cargo.toml index a9237349..73cb95cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" members = [ "basecoin", "basecoin/app", "basecoin/modules", "basecoin/store" ] [workspace.package] -version = "0.1.0" +version = "0.2.0" license = "Apache-2.0" edition = "2021" rust-version = "1.64" @@ -16,37 +16,37 @@ authors = [ "Informal Systems " ] [workspace.dependencies] # external dependencies base64 = { version = "0.22.1", default-features = false, features = [ "alloc" ] } -cosmrs = { version = "0.16.0" } +cosmrs = { version = "0.18.0" } displaydoc = { version = "0.2", default-features = false } derive_more = { version = "0.99.18", default-features = false, features = [ "from", "into", "display" ] } ed25519 = { version = "2.2.3", default-features = false } -prost = { version = "0.12", default-features = false } +prost = { version = "0.13.1", default-features = false } serde = "1.0" serde_json = "1.0" sha2 = "0.10.8" -tonic = "0.11" -tonic-reflection = "0.11" +tonic = "0.12.1" +tonic-reflection = "0.12.1" tracing = "0.1.40" tracing-subscriber = "0.3.18" # ibc dependencies ibc = { version = "0.53.0", default-features = false, features = [ "serde" ] } ibc-query = { version = "0.53.0", default-features = false } -ibc-proto = { version = "0.46.0", default-features = false } -ics23 = { version = "0.11", default-features = false } +ibc-proto = { version = "0.47.0", default-features = false } +ics23 = { version = "0.12", default-features = false } # tendermint dependencies -tendermint = { version = "0.37", default-features = false } -tendermint-abci = { version = "0.37", default-features = false } -tendermint-proto = { version = "0.37", default-features = false } -tendermint-rpc = { version = "0.37", default-features = false } +tendermint = { version = "0.38", default-features = false } +tendermint-abci = { version = "0.38", default-features = false } +tendermint-proto = { version = "0.38", default-features = false } +tendermint-rpc = { version = "0.38", default-features = false } # tower abci -tower-abci = { version = "0.14" } +tower-abci = { version = "0.16" } [patch.crates-io] -ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "e36015c" } -ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "e36015c" } +ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "6c7a65e" } +ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "6c7a65e" } -# for tendermint 0.37 -tower-abci = { git = "https://github.com/informalsystems/tower-abci", rev = "37d952e" } +# for tendermint 0.38 +tower-abci = { git = "https://github.com/informalsystems/tower-abci", rev = "0992541" } diff --git a/basecoin/modules/src/ibc/impls.rs b/basecoin/modules/src/ibc/impls.rs index 856e43ad..7b3d63d0 100644 --- a/basecoin/modules/src/ibc/impls.rs +++ b/basecoin/modules/src/ibc/impls.rs @@ -483,7 +483,12 @@ where fn host_timestamp(&self) -> Result { let host_height = self.host_height()?; let host_cons_state = self.host_consensus_state(&host_height)?; - Ok(host_cons_state.timestamp().into()) + Ok(host_cons_state + .timestamp() + .try_into() + .map_err(|_| ClientError::Other { + description: "Invalid timestamp".into(), + })?) } fn host_consensus_state( diff --git a/basecoin/modules/src/upgrade/impls.rs b/basecoin/modules/src/upgrade/impls.rs index 9f5e7809..09c5d736 100644 --- a/basecoin/modules/src/upgrade/impls.rs +++ b/basecoin/modules/src/upgrade/impls.rs @@ -9,7 +9,9 @@ use ibc::clients::tendermint::types::ConsensusState as ConsensusStateType; use ibc::core::client::types::error::UpgradeClientError; use ibc::core::client::types::Height as IbcHeight; use ibc::core::commitment_types::commitment::CommitmentRoot; -use ibc::core::host::types::path::{Path as IbcPath, UpgradeClientPath}; +use ibc::core::host::types::path::{ + Path as IbcPath, UpgradeClientStatePath, UpgradeConsensusStatePath, +}; use ibc::cosmos_host::upgrade_proposal::{ Plan, UpgradeChain, UpgradeExecutionContext, UpgradeValidationContext, UpgradedConsensusStateRef, @@ -41,10 +43,10 @@ where upgrade_plan: ProtobufStore, UpgradePlanPath, Plan, Any>, /// A typed-store for upgraded ClientState upgraded_client_state_store: - ProtobufStore, UpgradeClientPath, AnyClientState, Any>, + ProtobufStore, UpgradeClientStatePath, AnyClientState, Any>, /// A typed-store for upgraded ConsensusState upgraded_consensus_state_store: - ProtobufStore, UpgradeClientPath, AnyConsensusState, Any>, + ProtobufStore, UpgradeConsensusStatePath, AnyConsensusState, Any>, } /// Trait to provide proofs in gRPC service blanket implementations. @@ -153,7 +155,8 @@ where if let Ok(plan) = self.upgrade_plan() { debug!("Upgrade plan found: {:?}", plan); - let upgraded_client_state_path = UpgradeClientPath::UpgradedClientState(plan.height); + let upgraded_client_state_path = + UpgradeClientStatePath::new_with_default_path(plan.height); // Checks if the upgraded client state for this plan is already set. self.upgraded_client_state(&upgraded_client_state_path) @@ -173,7 +176,7 @@ where }; let upgraded_cons_state_path = - UpgradeClientPath::UpgradedClientConsensusState(plan.height); + UpgradeConsensusStatePath::new_with_default_path(plan.height); self.store_upgraded_consensus_state( upgraded_cons_state_path, @@ -237,7 +240,7 @@ where fn upgraded_client_state( &self, - upgrade_path: &UpgradeClientPath, + upgrade_path: &UpgradeClientStatePath, ) -> Result { let upgraded_tm_client_state = self .upgraded_client_state_store @@ -250,7 +253,7 @@ where fn upgraded_consensus_state( &self, - upgrade_path: &UpgradeClientPath, + upgrade_path: &UpgradeConsensusStatePath, ) -> Result, UpgradeClientError> { let upgraded_tm_consensus_state = self .upgraded_consensus_state_store @@ -298,12 +301,13 @@ where }); } - let upgraded_client_state_path = UpgradeClientPath::UpgradedClientState(plan_height); + let upgraded_client_state_path = UpgradeClientStatePath::new_with_default_path(plan_height); self.upgraded_client_state_store .delete(upgraded_client_state_path); - let upgraded_cons_state_path = UpgradeClientPath::UpgradedClientConsensusState(plan_height); + let upgraded_cons_state_path = + UpgradeConsensusStatePath::new_with_default_path(plan_height); self.upgraded_consensus_state_store .delete(upgraded_cons_state_path); @@ -315,7 +319,7 @@ where fn store_upgraded_client_state( &mut self, - upgrade_path: UpgradeClientPath, + upgrade_path: UpgradeClientStatePath, client_state: AnyClientState, ) -> Result<(), UpgradeClientError> { self.upgraded_client_state_store @@ -329,7 +333,7 @@ where fn store_upgraded_consensus_state( &mut self, - upgrade_path: UpgradeClientPath, + upgrade_path: UpgradeConsensusStatePath, consensus_state: AnyConsensusState, ) -> Result<(), UpgradeClientError> { self.upgraded_consensus_state_store diff --git a/basecoin/modules/src/upgrade/service.rs b/basecoin/modules/src/upgrade/service.rs index 5c4a76ff..3654cae4 100644 --- a/basecoin/modules/src/upgrade/service.rs +++ b/basecoin/modules/src/upgrade/service.rs @@ -2,7 +2,7 @@ use basecoin_store::context::Store; use basecoin_store::impls::SharedStore; use basecoin_store::types::{Height, ProtobufStore, TypedStore}; use ibc::clients::tendermint::types::ConsensusState as TmConsensusState; -use ibc::core::host::types::path::UpgradeClientPath; +use ibc::core::host::types::path::UpgradeConsensusStatePath; use ibc_proto::cosmos::upgrade::v1beta1::query_server::Query as UpgradeQuery; use ibc_proto::cosmos::upgrade::v1beta1::{ QueryAppliedPlanRequest, QueryAppliedPlanResponse, QueryAuthorityRequest, @@ -16,7 +16,7 @@ use tonic::{Request, Response, Status}; pub struct UpgradeService { upgraded_consensus_state_store: - ProtobufStore, UpgradeClientPath, TmConsensusState, Any>, + ProtobufStore, UpgradeConsensusStatePath, TmConsensusState, Any>, } impl UpgradeService @@ -60,7 +60,8 @@ impl UpgradeQuery for UpgradeService { let last_height = u64::try_from(request.into_inner().last_height) .map_err(|_| Status::invalid_argument("invalid height".to_string()))?; - let upgraded_consensus_state_path = UpgradeClientPath::UpgradedClientState(last_height); + let upgraded_consensus_state_path = + UpgradeConsensusStatePath::new_with_default_path(last_height); let upgraded_consensus_state = self .upgraded_consensus_state_store