diff --git a/Cargo.lock b/Cargo.lock index 465349d20..f33166bb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arrayref" @@ -123,7 +123,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -134,7 +134,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -176,7 +176,7 @@ dependencies = [ "axum-core", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "itoa", @@ -187,8 +187,8 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 1.0.1", - "tower 0.5.1", + "sync_wrapper 1.0.2", + "tower 0.5.2", "tower-layer", "tower-service", ] @@ -202,13 +202,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -329,9 +329,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -378,7 +378,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -401,18 +401,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "shlex", ] @@ -458,7 +458,7 @@ checksum = "b22933d3a1fb401cc0208e4f8ef16f4c80579701a47b81d2f23ee5b0b697a7b0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -490,7 +490,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -558,7 +558,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -601,9 +601,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -611,9 +611,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -630,14 +630,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" @@ -705,6 +705,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -726,18 +736,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] @@ -753,9 +763,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -853,7 +863,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -873,7 +883,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "unicode-xid", ] @@ -927,7 +937,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1015,12 +1025,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1036,9 +1046,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener", "pin-project-lite", @@ -1056,9 +1066,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "ff" @@ -1183,7 +1193,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1268,7 +1278,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1277,17 +1287,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", + "http 1.2.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1308,9 +1318,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hdpath" @@ -1441,7 +1451,7 @@ dependencies = [ "hermes-relayer-components", "hermes-runtime", "hermes-runtime-components", - "http 1.1.0", + "http 1.2.0", "humantime", "ibc", "oneline-eyre", @@ -1465,7 +1475,7 @@ dependencies = [ "hermes-relayer-components", "hermes-runtime-components", "hermes-test-components", - "http 1.1.0", + "http 1.2.0", "serde", "toml", ] @@ -1533,7 +1543,7 @@ dependencies = [ "hermes-protobuf-encoding-components", "hermes-relayer-components", "hermes-relayer-components-extra", - "http 1.1.0", + "http 1.2.0", "ibc", "ibc-client-tendermint", "ibc-proto", @@ -1634,7 +1644,7 @@ dependencies = [ "hermes-tracing-logging-components", "hermes-wasm-client-components", "hermes-wasm-test-components", - "http 1.1.0", + "http 1.2.0", "ibc", "ibc-proto", "itertools 0.13.0", @@ -1667,7 +1677,7 @@ dependencies = [ "hermes-runtime", "hermes-runtime-components", "hermes-test-components", - "http 1.1.0", + "http 1.2.0", "ibc", "ibc-proto", "itertools 0.13.0", @@ -1709,7 +1719,7 @@ dependencies = [ "hermes-wasm-client-components", "hermes-wasm-encoding-components", "hermes-wasm-test-components", - "http 1.1.0", + "http 1.2.0", "ibc", "ibc-proto", "itertools 0.13.0", @@ -2074,9 +2084,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2101,7 +2111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -2112,7 +2122,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "pin-project-lite", ] @@ -2137,9 +2147,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.31" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", @@ -2161,15 +2171,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "httparse", "httpdate", @@ -2188,7 +2198,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.31", + "hyper 0.14.32", "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", @@ -2201,13 +2211,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.5.0", + "http 1.2.0", + "hyper 1.5.2", "hyper-util", - "rustls 0.23.17", + "rustls 0.23.20", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.26.1", "tower-service", ] @@ -2217,7 +2227,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.5.0", + "hyper 1.5.2", "hyper-util", "pin-project-lite", "tokio", @@ -2232,7 +2242,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.2", "hyper-util", "native-tls", "tokio", @@ -2249,9 +2259,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", - "hyper 1.5.0", + "hyper 1.5.2", "pin-project-lite", "socket2", "tokio", @@ -2294,7 +2304,7 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "http 1.1.0", + "http 1.2.0", "ibc-app-transfer-types", "ibc-core", "ibc-proto", @@ -2721,7 +2731,7 @@ checksum = "7b2bbdb8c5306e4b53545026d6ecbdbf6f9fc5a6459749c60017b99cf895fed4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -2896,7 +2906,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -2940,13 +2950,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] @@ -2967,12 +2977,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -3017,16 +3027,17 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -3059,9 +3070,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libredox" @@ -3081,9 +3092,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -3139,11 +3150,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "wasi", "windows-sys 0.52.0", @@ -3185,7 +3195,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -3308,7 +3318,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3358,29 +3368,28 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parity-scale-codec" -version = "3.7.0" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", - "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.7.0" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 1.0.109", ] [[package]] @@ -3477,7 +3486,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3530,7 +3539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3556,18 +3565,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" dependencies = [ "bytes", "prost-derive", @@ -3575,31 +3584,31 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "prost-types" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" +checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc" dependencies = [ "prost", ] [[package]] name = "quanta" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +checksum = "773ce68d0bb9bc7ef20be3536ffe94e223e1f365bd374108b2659fac0c65cfe6" dependencies = [ "crossbeam-utils", "libc", @@ -3666,9 +3675,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags 2.6.0", ] @@ -3742,7 +3751,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.31", + "hyper 0.14.32", "hyper-rustls 0.24.2", "ipnet", "js-sys", @@ -3780,11 +3789,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.2", "hyper-rustls 0.27.3", "hyper-tls", "hyper-util", @@ -3800,7 +3809,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration 0.6.1", "tokio", "tokio-native-tls", @@ -3875,15 +3884,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3914,9 +3923,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.17" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "log", "once_cell", @@ -3936,7 +3945,7 @@ dependencies = [ "openssl-probe", "rustls-pemfile 1.0.4", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] @@ -3949,20 +3958,19 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.0.1", ] [[package]] @@ -3985,9 +3993,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustls-webpki" @@ -4033,9 +4041,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" +checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "cfg-if", "derive_more 1.0.0", @@ -4045,14 +4053,14 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" +checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4085,7 +4093,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4146,7 +4154,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -4164,15 +4185,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] @@ -4207,13 +4228,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4224,7 +4245,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4233,7 +4254,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "memchr", "ryu", @@ -4248,7 +4269,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4368,9 +4389,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4455,9 +4476,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -4472,9 +4493,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -4487,7 +4508,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4497,7 +4518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.5.0", ] @@ -4508,7 +4529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -4709,7 +4730,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4798,9 +4819,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -4822,7 +4843,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -4858,20 +4879,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.17", - "rustls-pki-types", + "rustls 0.23.20", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -4880,9 +4900,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -4918,7 +4938,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -4936,21 +4956,21 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.2", "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", "prost", - "rustls-native-certs 0.8.0", + "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "socket2", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls 0.26.1", "tokio-stream", "tower 0.4.13", "tower-layer", @@ -4980,14 +5000,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -5006,9 +5026,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -5017,20 +5037,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -5049,9 +5069,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -5059,9 +5079,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -5099,7 +5119,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http 1.2.0", "httparse", "log", "rand", @@ -5131,9 +5151,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -5158,9 +5178,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -5245,9 +5265,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -5256,36 +5276,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5293,28 +5313,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -5571,9 +5591,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -5583,13 +5603,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure", ] @@ -5611,27 +5631,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure", ] @@ -5652,7 +5672,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -5674,5 +5694,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] diff --git a/crates/chain/chain-components/src/impls/payload_builders/connection.rs b/crates/chain/chain-components/src/impls/payload_builders/connection.rs index 6bebf2b81..1c0a8941a 100644 --- a/crates/chain/chain-components/src/impls/payload_builders/connection.rs +++ b/crates/chain/chain-components/src/impls/payload_builders/connection.rs @@ -1,6 +1,9 @@ use core::marker::PhantomData; use cgp::core::error::HasErrorType; +use hermes_chain_type_components::traits::types::height::HasHeightType; +use hermes_chain_type_components::traits::types::ibc::client_id::HasClientIdType; +use hermes_chain_type_components::traits::types::ibc::connection_id::HasConnectionIdType; use crate::traits::commitment_prefix::HasIbcCommitmentPrefix; use crate::traits::payload_builders::connection_handshake::{ @@ -16,7 +19,6 @@ use crate::traits::types::connection::{ HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, }; use crate::traits::types::consensus_state::HasConsensusStateType; -use crate::traits::types::ibc::HasIbcChainTypes; use crate::traits::types::proof::HasCommitmentProofHeight; use crate::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, @@ -176,7 +178,9 @@ where Chain: HasConnectionOpenConfirmPayloadType< Counterparty, ConnectionOpenConfirmPayload = ConnectionOpenConfirmPayload, - > + HasIbcChainTypes + > + HasHeightType + + HasClientIdType + + HasConnectionIdType + HasClientStateType + HasCommitmentProofHeight + CanQueryConnectionEndWithProofs, diff --git a/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs b/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs index 1efb44bb3..7cbf2c6be 100644 --- a/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs +++ b/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs @@ -1,12 +1,14 @@ use cgp::core::component::UseDelegate; use cgp::prelude::*; +use hermes_chain_type_components::traits::types::ibc::client_id::HasClientIdType; +use hermes_chain_type_components::traits::types::ibc::connection_id::HasConnectionIdType; +use hermes_chain_type_components::traits::types::message::HasMessageType; use crate::traits::types::connection::{ HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, HasInitConnectionOptionsType, }; -use crate::traits::types::ibc::HasIbcChainTypes; #[cgp_component { provider: ConnectionOpenInitMessageBuilder, @@ -14,9 +16,12 @@ use crate::traits::types::ibc::HasIbcChainTypes; }] #[async_trait] pub trait CanBuildConnectionOpenInitMessage: - HasInitConnectionOptionsType + HasIbcChainTypes + HasErrorType + HasInitConnectionOptionsType + + HasClientIdType + + HasMessageType + + HasErrorType where - Counterparty: HasConnectionOpenInitPayloadType + HasIbcChainTypes, + Counterparty: HasConnectionOpenInitPayloadType + HasClientIdType, { async fn build_connection_open_init_message( &self, @@ -33,9 +38,10 @@ where }] #[async_trait] pub trait CanBuildConnectionOpenTryMessage: - HasIbcChainTypes + HasErrorType + HasMessageType + HasClientIdType + HasErrorType where - Counterparty: HasConnectionOpenTryPayloadType + HasIbcChainTypes, + Counterparty: + HasConnectionOpenTryPayloadType + HasClientIdType + HasConnectionIdType, { async fn build_connection_open_try_message( &self, @@ -52,9 +58,9 @@ where }] #[async_trait] pub trait CanBuildConnectionOpenAckMessage: - HasIbcChainTypes + HasErrorType + HasMessageType + HasConnectionIdType + HasErrorType where - Counterparty: HasConnectionOpenAckPayloadType + HasIbcChainTypes, + Counterparty: HasConnectionOpenAckPayloadType + HasConnectionIdType, { async fn build_connection_open_ack_message( &self, @@ -70,7 +76,7 @@ where }] #[async_trait] pub trait CanBuildConnectionOpenConfirmMessage: - HasIbcChainTypes + HasErrorType + HasMessageType + HasConnectionIdType + HasErrorType where Counterparty: HasConnectionOpenConfirmPayloadType, { @@ -84,9 +90,11 @@ where impl ConnectionOpenInitMessageBuilder for UseDelegate where - Chain: - HasInitConnectionOptionsType + HasIbcChainTypes + HasErrorType, - Counterparty: HasConnectionOpenInitPayloadType + HasIbcChainTypes, + Chain: HasInitConnectionOptionsType + + HasClientIdType + + HasMessageType + + HasErrorType, + Counterparty: HasConnectionOpenInitPayloadType + HasClientIdType, Delegate: ConnectionOpenInitMessageBuilder, Components: DelegateComponent, { @@ -111,8 +119,10 @@ where impl ConnectionOpenTryMessageBuilder for UseDelegate where - Chain: HasIbcChainTypes + HasErrorType, - Counterparty: HasConnectionOpenTryPayloadType + HasIbcChainTypes, + Chain: HasMessageType + HasClientIdType + HasErrorType, + Counterparty: HasConnectionOpenTryPayloadType + + HasClientIdType + + HasConnectionIdType, Delegate: ConnectionOpenTryMessageBuilder, Components: DelegateComponent, { @@ -137,8 +147,8 @@ where impl ConnectionOpenAckMessageBuilder for UseDelegate where - Chain: HasIbcChainTypes + HasErrorType, - Counterparty: HasConnectionOpenAckPayloadType + HasIbcChainTypes, + Chain: HasMessageType + HasConnectionIdType + HasErrorType, + Counterparty: HasConnectionOpenAckPayloadType + HasConnectionIdType, Delegate: ConnectionOpenAckMessageBuilder, Components: DelegateComponent, { @@ -161,8 +171,8 @@ where impl ConnectionOpenConfirmMessageBuilder for UseDelegate where - Chain: HasIbcChainTypes + HasErrorType, - Counterparty: HasConnectionOpenConfirmPayloadType + HasIbcChainTypes, + Chain: HasMessageType + HasConnectionIdType + HasErrorType, + Counterparty: HasConnectionOpenConfirmPayloadType, Delegate: ConnectionOpenConfirmMessageBuilder, Components: DelegateComponent, { diff --git a/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs b/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs index 5b982393f..9671510a5 100644 --- a/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs +++ b/crates/chain/chain-components/src/traits/payload_builders/connection_handshake.rs @@ -1,11 +1,13 @@ use cgp::prelude::*; +use hermes_chain_type_components::traits::types::height::HasHeightType; +use hermes_chain_type_components::traits::types::ibc::client_id::HasClientIdType; +use hermes_chain_type_components::traits::types::ibc::connection_id::HasConnectionIdType; use crate::traits::types::client_state::HasClientStateType; use crate::traits::types::connection::{ HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, }; -use crate::traits::types::ibc::HasIbcChainTypes; #[cgp_component { provider: ConnectionOpenInitPayloadBuilder, @@ -27,7 +29,9 @@ pub trait CanBuildConnectionOpenInitPayload: }] #[async_trait] pub trait CanBuildConnectionOpenTryPayload: - HasIbcChainTypes + HasHeightType + + HasClientIdType + + HasConnectionIdType + HasConnectionOpenTryPayloadType + HasClientStateType + HasErrorType @@ -47,7 +51,9 @@ pub trait CanBuildConnectionOpenTryPayload: }] #[async_trait] pub trait CanBuildConnectionOpenAckPayload: - HasIbcChainTypes + HasHeightType + + HasClientIdType + + HasConnectionIdType + HasConnectionOpenAckPayloadType + HasClientStateType + HasErrorType @@ -67,7 +73,9 @@ pub trait CanBuildConnectionOpenAckPayload: }] #[async_trait] pub trait CanBuildConnectionOpenConfirmPayload: - HasIbcChainTypes + HasHeightType + + HasClientIdType + + HasConnectionIdType + HasConnectionOpenConfirmPayloadType + HasClientStateType + HasErrorType diff --git a/crates/chain/chain-components/src/traits/queries/connection_end.rs b/crates/chain/chain-components/src/traits/queries/connection_end.rs index 6eca19237..752bfa45e 100644 --- a/crates/chain/chain-components/src/traits/queries/connection_end.rs +++ b/crates/chain/chain-components/src/traits/queries/connection_end.rs @@ -1,6 +1,8 @@ use core::fmt::Debug; use cgp::prelude::*; +use hermes_chain_type_components::traits::types::height::HasHeightType; +use hermes_chain_type_components::traits::types::ibc::connection_id::HasConnectionIdType; use crate::traits::types::connection::HasConnectionEndType; use crate::traits::types::ibc::HasIbcChainTypes; @@ -12,7 +14,10 @@ use crate::traits::types::proof::HasCommitmentProofType; }] #[async_trait] pub trait CanQueryConnectionEnd: - HasConnectionEndType + HasIbcChainTypes + HasErrorType + HasHeightType + + HasConnectionIdType + + HasConnectionEndType + + HasErrorType { async fn query_connection_end( &self, @@ -27,8 +32,9 @@ pub trait CanQueryConnectionEnd: }] #[async_trait] pub trait CanQueryConnectionEndWithProofs: - HasConnectionEndType - + HasIbcChainTypes + HasHeightType + + HasConnectionIdType + + HasConnectionEndType + HasCommitmentProofType + HasErrorType { diff --git a/crates/chain/chain-components/src/traits/queries/consensus_state.rs b/crates/chain/chain-components/src/traits/queries/consensus_state.rs index 44c67d8e0..7bfb2d2ba 100644 --- a/crates/chain/chain-components/src/traits/queries/consensus_state.rs +++ b/crates/chain/chain-components/src/traits/queries/consensus_state.rs @@ -38,17 +38,19 @@ pub trait CanQueryConsensusState: }] #[async_trait] pub trait CanQueryConsensusStateWithProofs: - HasClientIdType + HasHeightType + HasCommitmentProofType + HasErrorType -where - Counterparty: HasConsensusStateType + HasHeightType, + HasClientIdType + + HasHeightType + + HasCommitmentProofType + + HasErrorType + + CanUseCounterparty + HasHeightType> { async fn query_consensus_state_with_proofs( &self, tag: PhantomData, client_id: &Self::ClientId, - consensus_height: &Counterparty::Height, + consensus_height: &HeightOf, query_height: &Self::Height, - ) -> Result<(Counterparty::ConsensusState, Self::CommitmentProof), Self::Error>; + ) -> Result<(ConsensusStateOf, Self::CommitmentProof), Self::Error>; } #[cgp_component { diff --git a/crates/chain/chain-components/src/traits/types/connection.rs b/crates/chain/chain-components/src/traits/types/connection.rs index 776bc88e5..b4f2328af 100644 --- a/crates/chain/chain-components/src/traits/types/connection.rs +++ b/crates/chain/chain-components/src/traits/types/connection.rs @@ -1,3 +1,5 @@ +use cgp::core::component::WithProvider; +use cgp::core::types::traits::ProvideType; use cgp::prelude::*; #[cgp_component { @@ -56,3 +58,13 @@ pub trait HasConnectionOpenConfirmPayloadType: Async { pub trait HasConnectionEndType: Async { type ConnectionEnd: Async; } + +impl ProvideConnectionEndType + for WithProvider +where + Provider: ProvideType, + Chain: Async, + ConnectionEnd: Async, +{ + type ConnectionEnd = ConnectionEnd; +} diff --git a/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs b/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs index c416a31a0..8c65677d4 100644 --- a/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs +++ b/crates/chain/chain-components/src/traits/types/ibc_events/connection.rs @@ -13,6 +13,7 @@ pub trait HasConnectionOpenTryEvent: type ConnectionOpenTryEvent: Async; fn try_extract_connection_open_try_event( + &self, response: &Self::MessageResponse, ) -> Option; diff --git a/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs b/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs index db5cc17bc..98af646f2 100644 --- a/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs +++ b/crates/chain/chain-type-components/src/traits/types/ibc/connection_id.rs @@ -1,5 +1,7 @@ use core::fmt::{Debug, Display}; +use cgp::core::component::WithProvider; +use cgp::core::types::traits::ProvideType; use cgp::prelude::*; #[cgp_component { @@ -14,3 +16,13 @@ pub trait HasConnectionIdType: Async { */ type ConnectionId: Debug + Display + Async; } + +impl ProvideConnectionIdType + for WithProvider +where + Chain: Async, + Provider: ProvideType, + ConnectionId: Debug + Display + Async, +{ + type ConnectionId = ConnectionId; +} diff --git a/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs b/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs index bfd10f07c..bbad30fa0 100644 --- a/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs +++ b/crates/cli/cli-components/src/impls/commands/queries/connection_end.rs @@ -4,6 +4,7 @@ use cgp::prelude::*; use hermes_relayer_components::build::traits::builders::chain_builder::CanBuildChain; use hermes_relayer_components::chain::traits::queries::chain_status::CanQueryChainHeight; use hermes_relayer_components::chain::traits::queries::connection_end::CanQueryConnectionEnd; +use hermes_relayer_components::chain::traits::types::chain_id::HasChainIdType; use hermes_relayer_components::multi::traits::chain_at::HasChainTypeAt; use hermes_relayer_components::multi::types::index::Index; @@ -55,7 +56,7 @@ where + CanRaiseError + CanRaiseError, Build: CanBuildChain, Chain = Chain> + HasChainTypeAt, Chain = Counterparty>, - Chain: CanQueryChainHeight + CanQueryConnectionEnd, + Chain: HasChainIdType + CanQueryChainHeight + CanQueryConnectionEnd, Args: Async, { async fn run_command(app: &App, args: &Args) -> Result { diff --git a/crates/cosmos/cosmos-chain-components/src/components/client.rs b/crates/cosmos/cosmos-chain-components/src/components/client.rs index fcf820ed9..d0526406a 100644 --- a/crates/cosmos/cosmos-chain-components/src/components/client.rs +++ b/crates/cosmos/cosmos-chain-components/src/components/client.rs @@ -257,7 +257,6 @@ cgp_preset! { QueryCosmosConsensusStateFromAbci, CounterpartyChainIdQuerierComponent: QueryChainIdFromAbci, - [ ConnectionOpenInitPayloadBuilderComponent, ConnectionOpenTryPayloadBuilderComponent, diff --git a/crates/cosmos/cosmos-chain-components/src/components/cosmos_to_cosmos.rs b/crates/cosmos/cosmos-chain-components/src/components/cosmos_to_cosmos.rs index ed7e49bfc..e8cb38b9f 100644 --- a/crates/cosmos/cosmos-chain-components/src/components/cosmos_to_cosmos.rs +++ b/crates/cosmos/cosmos-chain-components/src/components/cosmos_to_cosmos.rs @@ -1,38 +1,38 @@ use cgp::prelude::*; use hermes_relayer_components::chain::impls::queries::query_and_convert_client_state::QueryAndConvertRawClientState; use hermes_relayer_components::chain::impls::queries::query_and_convert_consensus_state::QueryAndConvertRawConsensusState; -use hermes_relayer_components::chain::traits::message_builders::channel_handshake::{ +pub use hermes_relayer_components::chain::traits::message_builders::channel_handshake::{ ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilderComponent, ChannelOpenTryMessageBuilderComponent, }; -use hermes_relayer_components::chain::traits::message_builders::connection_handshake::{ +pub use hermes_relayer_components::chain::traits::message_builders::connection_handshake::{ ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilderComponent, ConnectionOpenTryMessageBuilderComponent, }; -use hermes_relayer_components::chain::traits::message_builders::create_client::CreateClientMessageBuilderComponent; -use hermes_relayer_components::chain::traits::message_builders::update_client::UpdateClientMessageBuilderComponent; -use hermes_relayer_components::chain::traits::payload_builders::create_client::CreateClientPayloadBuilderComponent; -use hermes_relayer_components::chain::traits::payload_builders::update_client::UpdateClientPayloadBuilderComponent; -use hermes_relayer_components::chain::traits::queries::client_state::{ +pub use hermes_relayer_components::chain::traits::message_builders::create_client::CreateClientMessageBuilderComponent; +pub use hermes_relayer_components::chain::traits::message_builders::update_client::UpdateClientMessageBuilderComponent; +pub use hermes_relayer_components::chain::traits::payload_builders::create_client::CreateClientPayloadBuilderComponent; +pub use hermes_relayer_components::chain::traits::payload_builders::update_client::UpdateClientPayloadBuilderComponent; +pub use hermes_relayer_components::chain::traits::queries::client_state::{ AllClientStatesQuerierComponent, ClientStateQuerierComponent, ClientStateWithProofsQuerierComponent, }; -use hermes_relayer_components::chain::traits::queries::consensus_state::{ +pub use hermes_relayer_components::chain::traits::queries::consensus_state::{ ConsensusStateQuerierComponent, ConsensusStateWithProofsQuerierComponent, }; -use hermes_relayer_components::chain::traits::queries::consensus_state_height::ConsensusStateHeightsQuerierComponent; -use hermes_relayer_components::chain::traits::types::client_state::{ +pub use hermes_relayer_components::chain::traits::queries::consensus_state_height::ConsensusStateHeightsQuerierComponent; +pub use hermes_relayer_components::chain::traits::types::client_state::{ ClientStateFieldsComponent, ClientStateTypeComponent, }; -use hermes_relayer_components::chain::traits::types::consensus_state::{ +pub use hermes_relayer_components::chain::traits::types::consensus_state::{ ConsensusStateFieldComponent, ConsensusStateTypeComponent, }; -use hermes_relayer_components::chain::traits::types::create_client::{ +pub use hermes_relayer_components::chain::traits::types::create_client::{ CreateClientMessageOptionsTypeComponent, CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, }; -use hermes_relayer_components::chain::traits::types::ibc::CounterpartyMessageHeightGetterComponent; -use hermes_relayer_components::chain::traits::types::update_client::UpdateClientPayloadTypeComponent; +pub use hermes_relayer_components::chain::traits::types::ibc::CounterpartyMessageHeightGetterComponent; +pub use hermes_relayer_components::chain::traits::types::update_client::UpdateClientPayloadTypeComponent; use crate::impls::channel::channel_handshake_message::BuildCosmosChannelHandshakeMessage; use crate::impls::client::create_client_message::BuildAnyCreateClientMessage; diff --git a/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs b/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs index d484fd3b7..904f30a61 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/connection/connection_handshake_message.rs @@ -1,4 +1,5 @@ use cgp::core::error::CanRaiseError; +use hermes_chain_type_components::traits::types::message::HasMessageType; use hermes_encoding_components::traits::convert::CanConvert; use hermes_encoding_components::traits::has_encoding::HasEncoding; use hermes_encoding_components::types::AsBytes; @@ -14,7 +15,9 @@ use hermes_relayer_components::chain::traits::types::connection::{ HasInitConnectionOptionsType, }; use hermes_relayer_components::chain::traits::types::height::HasHeightFields; -use hermes_relayer_components::chain::traits::types::ibc::HasIbcChainTypes; +use hermes_relayer_components::chain::traits::types::ibc::{ + HasClientIdType, HasConnectionIdType, HasIbcChainTypes, +}; use hermes_relayer_components::chain::traits::types::proof::HasCommitmentProofBytes; use hermes_relayer_components::chain::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, @@ -22,9 +25,9 @@ use hermes_relayer_components::chain::types::payloads::connection::{ }; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; -use ibc::core::connection::types::version::Version; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; +use ibc_proto::ibc::core::connection::v1::Version; use prost_types::Any; use crate::traits::message::{CosmosMessage, ToCosmosMessage}; @@ -42,7 +45,9 @@ where Chain: HasInitConnectionOptionsType< Counterparty, InitConnectionOptions = CosmosInitConnectionOptions, - > + HasIbcChainTypes + > + HasMessageType + + HasClientIdType + + HasConnectionIdType + CanRaiseError<&'static str>, Counterparty: HasCommitmentPrefixType> + HasIbcChainTypes @@ -54,9 +59,9 @@ where { async fn build_connection_open_init_message( _chain: &Chain, - client_id: &Chain::ClientId, - counterparty_client_id: &Counterparty::ClientId, - init_connection_options: &Chain::InitConnectionOptions, + client_id: &ClientId, + counterparty_client_id: &ClientId, + init_connection_options: &CosmosInitConnectionOptions, counterparty_payload: ConnectionOpenInitPayload, ) -> Result { let client_id = client_id.clone(); @@ -64,10 +69,7 @@ where let counterparty_commitment_prefix = counterparty_payload.commitment_prefix; let delay_period = init_connection_options.delay_period; - let version = Version::compatibles() - .into_iter() - .next() - .ok_or_else(|| Chain::raise_error("expect default version to be present"))?; + let version = default_connection_version(); let message = CosmosConnectionOpenInitMessage { client_id, @@ -188,8 +190,8 @@ where .iter() .next() .cloned() - .or_else(|| Version::compatibles().into_iter().next()) - .ok_or_else(|| Chain::raise_error("expect default version to be present"))?; + .map(Version::from) + .unwrap_or_else(default_connection_version); let client_state_any = chain .encoding() @@ -262,3 +264,10 @@ where Ok(message.to_cosmos_message().into()) } } + +pub fn default_connection_version() -> Version { + Version { + identifier: "1".to_string(), + features: vec!["ORDER_ORDERED".to_string(), "ORDER_UNORDERED".to_string()], + } +} diff --git a/crates/cosmos/cosmos-chain-components/src/impls/events.rs b/crates/cosmos/cosmos-chain-components/src/impls/events.rs index 71c766bc3..245864f88 100644 --- a/crates/cosmos/cosmos-chain-components/src/impls/events.rs +++ b/crates/cosmos/cosmos-chain-components/src/impls/events.rs @@ -102,6 +102,7 @@ where type ConnectionOpenTryEvent = CosmosConnectionOpenTryEvent; fn try_extract_connection_open_try_event( + _chain: &Chain, events: &Vec>, ) -> Option { events.iter().find_map(|event| { diff --git a/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_ack.rs b/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_ack.rs index 35e74aa73..d95e5c13c 100644 --- a/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_ack.rs +++ b/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_ack.rs @@ -1,9 +1,10 @@ use ibc::core::client::types::Height; -use ibc::core::connection::types::version::Version; use ibc::core::host::types::identifiers::ConnectionId; use ibc::primitives::Signer; use ibc_proto::google::protobuf::Any as IbcProtoAny; -use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenAck as ProtoMsgConnectionOpenAck; +use ibc_proto::ibc::core::connection::v1::{ + MsgConnectionOpenAck as ProtoMsgConnectionOpenAck, Version, +}; use prost_types::Any; use crate::methods::encode::encode_to_any; @@ -42,7 +43,7 @@ impl DynCosmosMessage for CosmosConnectionOpenAckMessage { proof_client: self.proof_client.clone(), proof_consensus: self.proof_consensus.clone(), consensus_height: Some(self.proof_consensus_height.into()), - version: Some(self.version.clone().into()), + version: Some(self.version.clone()), signer: signer.to_string(), host_consensus_state_proof: Vec::new(), }; diff --git a/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_init.rs b/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_init.rs index e3cdfee54..16b49ede8 100644 --- a/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_init.rs +++ b/crates/cosmos/cosmos-chain-components/src/types/messages/connection/open_init.rs @@ -1,12 +1,11 @@ use core::time::Duration; -use ibc::core::connection::types::version::Version; use ibc::core::host::types::identifiers::ClientId; use ibc::primitives::Signer; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::commitment::v1::MerklePrefix; use ibc_proto::ibc::core::connection::v1::{ - Counterparty, MsgConnectionOpenInit as ProtoMsgConnectionOpenInit, + Counterparty, MsgConnectionOpenInit as ProtoMsgConnectionOpenInit, Version, }; use crate::methods::encode::encode_to_any; @@ -36,7 +35,7 @@ impl DynCosmosMessage for CosmosConnectionOpenInitMessage { let proto_message = ProtoMsgConnectionOpenInit { client_id: self.client_id.as_str().to_string(), counterparty: Some(counterparty), - version: Some(self.version.clone().into()), + version: Some(self.version.clone()), delay_period: self.delay_period.as_nanos() as u64, signer: signer.to_string(), }; diff --git a/crates/cosmos/cosmos-relayer/src/contexts/chain.rs b/crates/cosmos/cosmos-relayer/src/contexts/chain.rs index 74e93dd7a..0039e5de5 100644 --- a/crates/cosmos/cosmos-relayer/src/contexts/chain.rs +++ b/crates/cosmos/cosmos-relayer/src/contexts/chain.rs @@ -41,7 +41,9 @@ use hermes_logging_components::traits::has_logger::{ GlobalLoggerGetterComponent, LoggerGetterComponent, LoggerTypeComponent, }; use hermes_logging_components::traits::logger::CanLog; -use hermes_relayer_components::chain::traits::commitment_prefix::IbcCommitmentPrefixGetter; +use hermes_relayer_components::chain::traits::commitment_prefix::{ + HasCommitmentPrefixType, HasIbcCommitmentPrefix, IbcCommitmentPrefixGetter, +}; use hermes_relayer_components::chain::traits::event_subscription::HasEventSubscription; use hermes_relayer_components::chain::traits::message_builders::update_client::CanBuildUpdateClientMessage; use hermes_relayer_components::chain::traits::packet::filter::{ @@ -345,6 +347,7 @@ pub trait CanUseCosmosChain: CosmosChain, CreateClientPayloadOptions = CosmosCreateClientOptions, > + CanQueryBalance + + HasCommitmentPrefixType> + CanIbcTransferToken + CanConvertGasToFee + CanQueryEipBaseFee @@ -377,6 +380,7 @@ pub trait CanUseCosmosChain: + CanBuildDepositProposalMessage + CanBuildVoteProposalMessage + HasMessageResponseEvents + + HasIbcCommitmentPrefix + HasSendPacketEvent + CanBuildCreateClientPayload + CanFilterIncomingPacket diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs b/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs index 17649d8a9..1245d4cb2 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/bootstrap.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; +use hermes_chain_components::traits::types::ibc::HasConnectionIdType; use crate::chain::traits::types::connection::{ HasInitConnectionOptionsType, InitConnectionOptionsOf, }; -use crate::chain::traits::types::ibc::HasIbcChainTypes; use crate::relay::traits::chains::HasRelayChains; use crate::relay::traits::connection::open_handshake::CanRelayConnectionOpenHandshake; use crate::relay::traits::connection::open_init::CanInitConnection; @@ -37,8 +37,8 @@ where Relay: HasRelayChains + CanInitConnection + CanRelayConnectionOpenHandshake, - SrcChain: HasInitConnectionOptionsType + HasIbcChainTypes + HasErrorType, - DstChain: HasIbcChainTypes + HasErrorType, + SrcChain: HasInitConnectionOptionsType + HasConnectionIdType + HasErrorType, + DstChain: HasConnectionIdType + HasErrorType, { async fn bootstrap_connection( &self, diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs index 57c81dd7c..218e6d22a 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_init.rs @@ -8,7 +8,6 @@ use crate::chain::traits::payload_builders::connection_handshake::CanBuildConnec use crate::chain::traits::queries::client_state::CanQueryClientStateWithLatestHeight; use crate::chain::traits::send_message::CanSendSingleMessage; use crate::chain::traits::types::connection::HasInitConnectionOptionsType; -use crate::chain::traits::types::ibc::HasIbcChainTypes; use crate::chain::traits::types::ibc_events::connection::HasConnectionOpenInitEvent; use crate::relay::traits::chains::{CanRaiseRelayChainErrors, HasRelayChains, HasRelayClientIds}; use crate::relay::traits::connection::open_init::ConnectionInitializer; @@ -36,7 +35,7 @@ where + CanBuildConnectionOpenInitMessage + CanQueryClientStateWithLatestHeight + HasConnectionOpenInitEvent, - DstChain: HasIbcChainTypes + CanBuildConnectionOpenInitPayload, + DstChain: CanBuildConnectionOpenInitPayload, SrcChain::ConnectionId: Clone, { async fn init_connection( diff --git a/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs b/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs index c7872c07d..dcbf42f81 100644 --- a/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs +++ b/crates/relayer/relayer-components/src/relay/impls/connection/open_try.rs @@ -98,7 +98,8 @@ where .send_message(DestinationTarget, open_try_message) .await?; - let open_try_event = DstChain::try_extract_connection_open_try_event(&response) + let open_try_event = dst_chain + .try_extract_connection_open_try_event(&response) .ok_or_else(|| { Relay::raise_error(MissingConnectionTryEventError { relay, diff --git a/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs b/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs index 11352c50c..6752b1a68 100644 --- a/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs +++ b/crates/relayer/relayer-components/src/relay/traits/connection/open_init.rs @@ -1,4 +1,5 @@ use cgp::prelude::*; +use hermes_chain_components::traits::types::connection::InitConnectionOptionsOf; use crate::chain::traits::types::connection::HasInitConnectionOptionsType; use crate::relay::traits::chains::HasRelayChains; @@ -14,8 +15,6 @@ pub trait CanInitConnection: { async fn init_connection( &self, - init_connection_options: &>::InitConnectionOptions, + init_connection_options: &InitConnectionOptionsOf, ) -> Result, Self::Error>; }