From c500c34a0662559d6ece72c2fa82a4bb01893a84 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 16:52:27 +0000
Subject: [PATCH 01/11] Update `cgp` to v0.3.1

---
 light-client/Cargo.lock                       | 168 ++++++-----
 light-client/Cargo.toml                       |   8 +-
 relayer/Cargo.lock                            | 266 ++++++++++--------
 relayer/Cargo.toml                            |  62 ++--
 .../src/impls/encode_mut/bool.rs              |   4 +-
 .../src/impls/encode_mut/cons.rs              |   6 +-
 .../src/impls/encode_mut/end.rs               |   4 +-
 .../src/impls/encode_mut/felt.rs              |   6 +-
 .../src/impls/encode_mut/from_u128.rs         |   6 +-
 .../src/impls/encode_mut/pair.rs              |   6 +-
 .../src/impls/encode_mut/string.rs            |   4 +-
 .../src/impls/encode_mut/unit.rs              |  10 +-
 .../src/impls/encode_mut/variant.rs           |   8 +-
 .../src/impls/encode_mut/variant_from.rs      |   6 +-
 .../src/components/chain.rs                   |   2 +-
 .../src/components/starknet_to_cosmos.rs      |   2 +-
 .../src/impls/contract/call.rs                |   4 +-
 .../src/impls/contract/declare.rs             |  12 +-
 .../src/impls/contract/deploy.rs              |   4 +-
 .../src/impls/encoding/events.rs              |   4 +-
 .../src/impls/error/account.rs                |   4 +-
 .../src/impls/error/provider.rs               |   4 +-
 .../src/impls/error/starknet.rs               |   4 +-
 .../src/impls/messages/channel.rs             |  12 +-
 .../src/impls/messages/connection.rs          |  22 +-
 .../src/impls/messages/create_client.rs       |   2 +-
 .../src/impls/messages/packet.rs              |  10 +-
 .../src/impls/messages/update_client.rs       |   2 +-
 .../src/impls/packet_filter.rs                |   6 +-
 .../impls/payload_builders/create_client.rs   |   4 +-
 .../impls/payload_builders/update_client.rs   |   6 +-
 .../src/impls/queries/ack_commitment.rs       |   2 +-
 .../src/impls/queries/balance.rs              |   6 +-
 .../src/impls/queries/channel_end.rs          |   4 +-
 .../src/impls/queries/client_state.rs         |   4 +-
 .../src/impls/queries/connection_end.rs       |   4 +-
 .../src/impls/queries/consensus_state.rs      |   6 +-
 .../src/impls/queries/contract_address.rs     |   2 +-
 .../src/impls/queries/packet_commitment.rs    |   2 +-
 .../src/impls/queries/packet_receipt.rs       |   2 +-
 .../src/impls/queries/packet_received.rs      |   2 +-
 .../src/impls/queries/status.rs               |   6 +-
 .../src/impls/queries/token_balance.rs        |   6 +-
 .../src/impls/send_message.rs                 |   6 +-
 .../starknet_to_cosmos/channel_message.rs     |  14 +-
 .../starknet_to_cosmos/connection_message.rs  |   8 +-
 .../query_consensus_state_height.rs           |   8 +-
 .../update_client_message.rs                  |   2 +-
 .../update_client_payload.rs                  |   4 +-
 .../src/impls/tx_response.rs                  |   4 +-
 .../src/impls/types/height.rs                 |   4 +-
 .../src/traits/account.rs                     |   8 +-
 .../src/traits/contract/call.rs               |   2 +-
 .../src/traits/contract/declare.rs            |   2 +-
 .../src/traits/contract/deploy.rs             |   2 +-
 .../src/traits/contract/invoke.rs             |   2 +-
 .../src/traits/messages/transfer.rs           |   2 +-
 .../src/traits/queries/address.rs             |   2 +-
 .../src/traits/queries/token_balance.rs       |   2 +-
 .../src/traits/transfer.rs                    |   2 +-
 .../src/types/consensus_state.rs              |   6 +-
 .../src/types/cosmos/client_state.rs          |   4 +-
 .../src/types/events/channel.rs               |  20 +-
 .../src/types/events/connection.rs            |  18 +-
 .../src/types/events/erc20.rs                 |   6 +-
 .../src/types/events/ics20.rs                 |  16 +-
 .../src/types/events/packet.rs                |  24 +-
 .../src/types/messages/erc20/transfer.rs      |   2 +-
 .../src/contexts/chain.rs                     |   4 +-
 .../src/contexts/encoding/cairo.rs            |   2 +-
 .../crates/starknet-cli/src/contexts/app.rs   |   4 +-
 .../src/impls/bootstrap/starknet_chain.rs     |   2 +-
 .../crates/starknet-cli/src/impls/build.rs    |   4 +-
 .../crates/starknet-cli/src/impls/error.rs    |   4 +-
 .../src/contexts/bootstrap.rs                 |   4 +-
 .../src/contexts/chain_driver.rs              |   4 +-
 .../src/contexts/osmosis_bootstrap.rs         |   4 +-
 .../src/build/components/relay/build.rs       |   2 +-
 .../starknet-relayer/src/contexts/builder.rs  |   6 +-
 .../starknet-relayer/src/presets/relay.rs     |   6 +-
 .../src/impls/bootstrap/bootstrap_chain.rs    |   4 +-
 .../src/impls/bootstrap/start_chain.rs        |   4 +-
 82 files changed, 499 insertions(+), 439 deletions(-)

diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock
index 557bc95f..5a50f061 100644
--- a/light-client/Cargo.lock
+++ b/light-client/Cargo.lock
@@ -261,7 +261,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -302,9 +302,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "cgp"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5adf76ce3579324bc8804a03da7e05a5012e4096e295d7ce16073dd0f55e923e"
+checksum = "4ea80431b9e73ebb8b04657c3890f80b40b987f505f91a65659614d397ec89c5"
 dependencies = [
  "cgp-async",
  "cgp-core",
@@ -313,9 +313,9 @@ dependencies = [
 
 [[package]]
 name = "cgp-async"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0623cc42c39044ad4223a60b58d427fdece736913fa70e0c0b7787b207545886"
+checksum = "7cca3a368634ced2b77f1e00e7ebb0872402a1d8fd6dbf05880329b0a001b37e"
 dependencies = [
  "cgp-async-macro",
  "cgp-sync",
@@ -323,97 +323,107 @@ dependencies = [
 
 [[package]]
 name = "cgp-async-macro"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22933d3a1fb401cc0208e4f8ef16f4c80579701a47b81d2f23ee5b0b697a7b0"
+checksum = "c1656912abbbf7ff2fe11c9680ae5883afe79cac6f2f51bd486d04a3fbba9426"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-component"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a567833f055c865fb46258f7c6a511b22a1da6bc22f58b47a5e5e3da7a2dd2"
-dependencies = [
- "cgp-component-macro",
-]
+checksum = "12793289566a983f8a3151448cb8820bcc4704c34a0a9cf19bb1ed48e0844e81"
 
 [[package]]
 name = "cgp-component-macro"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4c375220b569b618d6b4ec8793c61bbdd24925786aeb4ea1eac5010916c262"
+checksum = "f37331b62cbb29d159d2c3bc3c21bdc885576d9c024d0e9ea4cb3e7513138897"
 dependencies = [
  "cgp-component-macro-lib",
- "proc-macro2",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-component-macro-lib"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e9fa127625afac0527a2f1595ba365142d8d875ff04f155cb248aee456d2c0"
+checksum = "29461124d295bf42c48106e81cb0f89a4eb64132752b916d5ec5df9875d03d58"
 dependencies = [
- "itertools 0.11.0",
+ "itertools 0.14.0",
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-core"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39951e4828fb216d51bfa42121095654f2adb0e4abbc9d03b011c5b47372a4c1"
+checksum = "fbc9ec022a14d652748da1cfb4a880a9046fe9b0fddbe20faf4955e3237dd51a"
 dependencies = [
  "cgp-async",
  "cgp-component",
+ "cgp-component-macro",
  "cgp-error",
  "cgp-field",
- "cgp-inner",
+ "cgp-field-macro",
  "cgp-type",
 ]
 
 [[package]]
 name = "cgp-error"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3866da7384b88d3260e781e60bc9da3a68d5552c33eea56e6780fea8c97d000"
+checksum = "ed10c471f0af57e4f5a196e21af4f95c7ba3fb6d990d623eb3f47a0f75b4d385"
 dependencies = [
  "cgp-async",
  "cgp-component",
+ "cgp-component-macro",
  "cgp-type",
 ]
 
+[[package]]
+name = "cgp-error-extra"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb44c5e45fb8de9d5e8d77a4736c01d09fdee2f4e822b5ea5a3b6243ddbdd9c"
+dependencies = [
+ "cgp-error",
+]
+
 [[package]]
 name = "cgp-extra"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f79c15ed0088b1ca06ad58a8f124c1d63f4a554073ed372ff2b488a3fbf6fb9"
+checksum = "04a67b3e5c5fd4420c0fd16c1e93a9e28a7e10f9aa911b66d7a2b9588fbb11c4"
 dependencies = [
+ "cgp-error-extra",
+ "cgp-inner",
  "cgp-run",
+ "cgp-runtime",
 ]
 
 [[package]]
 name = "cgp-field"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6956ca07b849e38106ee5b3c71c7e396088619115fe60934fd2598b873a9efac"
+checksum = "193dec7508c4b4efd6a1ef5eac6789eb0a297561e55dcb8cd377a904f055a176"
 dependencies = [
  "cgp-component",
- "cgp-field-macro",
  "cgp-type",
 ]
 
 [[package]]
 name = "cgp-field-macro"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2286ec0bd3a48571ee3644e80a52ba029f10c2edd6bc3da4f4ef9279583798d5"
+checksum = "c7853451aedcc73c0edf67d44ca9652a7b1ba8a18ac0499f4fced1ac845b7711"
 dependencies = [
  "cgp-field-macro-lib",
  "proc-macro2",
@@ -421,53 +431,64 @@ dependencies = [
 
 [[package]]
 name = "cgp-field-macro-lib"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e05fc04f941c797c28db9dd9685d779b76784f29bdbe2eb368329abfca14d9a"
+checksum = "785d154b6d17929919e3bee306c515c7d78e420303605829e48116fcef2ccf9e"
 dependencies = [
- "itertools 0.11.0",
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-inner"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd062e3bef5a8353acdcdae3e04c0012de0b19e9bd02acbccfce09e895814cf"
+checksum = "be4e35f1ad7bfb5df01c9f263d054ba53ff87c3d1da20cb5c0872191df904583"
 dependencies = [
  "cgp-component",
+ "cgp-component-macro",
 ]
 
 [[package]]
 name = "cgp-run"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf13ddcb395e915d314abf917d86dc7fa461bd73a3da2724b4698d45eaa283e"
+checksum = "0ec7009079ecfd0a5db07a5dda0e7cece70b1774ead842a42919a93b4662eb96"
 dependencies = [
  "cgp-async",
  "cgp-component",
+ "cgp-component-macro",
  "cgp-error",
 ]
 
+[[package]]
+name = "cgp-runtime"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "332d92088b07754adbde9ecdf894b8c3b9303b287c8d82d11f8886a394121925"
+dependencies = [
+ "cgp-core",
+]
+
 [[package]]
 name = "cgp-sync"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1c0e460bcccd3e2e39ded6a2078f012d3c00b523caafc05b5bdace9205b0cf"
+checksum = "eb37ca18a65f3603aaa307ba76d92f64025db56160143a0e96466b5855d61a29"
 dependencies = [
  "cgp-async-macro",
 ]
 
 [[package]]
 name = "cgp-type"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3c9a9059625de770e4acddff6d5e56c5defd959b010b9643cfcb81832f5bed"
+checksum = "4a4638c888a38fbb1c88406c224c38d7b9e230a306e7b07f796280b89f5baa54"
 dependencies = [
  "cgp-component",
+ "cgp-component-macro",
 ]
 
 [[package]]
@@ -538,7 +559,7 @@ checksum = "3c94a4b93e722c91d2e58471cfe69480f4a656cfccacd8bfda5638f2a5d4512b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -562,7 +583,7 @@ checksum = "edd3d80310cd7b86b09dbe886f4f2ca235a5ddb8d478493c6e50e720a3b38a42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -675,7 +696,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -742,7 +763,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -762,7 +783,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
  "unicode-xid",
 ]
 
@@ -795,7 +816,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1041,7 +1062,7 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 [[package]]
 name = "hermes-cosmos-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -1055,7 +1076,7 @@ dependencies = [
 [[package]]
 name = "hermes-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
 ]
@@ -1063,7 +1084,7 @@ dependencies = [
 [[package]]
 name = "hermes-protobuf-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -1546,7 +1567,7 @@ checksum = "7b2bbdb8c5306e4b53545026d6ecbdbf6f9fc5a6459749c60017b99cf895fed4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1650,6 +1671,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -1792,12 +1822,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.25"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
 dependencies = [
  "proc-macro2",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1858,7 +1888,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1872,9 +1902,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -2005,7 +2035,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2062,7 +2092,7 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2073,7 +2103,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2096,7 +2126,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2199,9 +2229,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2283,7 +2313,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2402,7 +2432,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2422,5 +2452,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
index 4296fe4c..1a7956a8 100644
--- a/light-client/Cargo.toml
+++ b/light-client/Cargo.toml
@@ -32,7 +32,7 @@ ibc-client-cw = { version = "0.56.0", default-features = false }
 ibc-proto     = { version = "0.51.1", default-features = false }
 tendermint    = { version = "0.40.0", default-features = false }
 
-cgp                                 = { version = "0.2.0" }
+cgp                                 = { version = "0.3.1" }
 hermes-encoding-components          = { version = "0.1.0" }
 hermes-protobuf-encoding-components = { version = "0.1.0" }
 hermes-cosmos-encoding-components   = { version = "0.1.0" }
@@ -77,6 +77,6 @@ ibc-client-starknet-types = { path = "./ibc-client-starknet-types" }
 # cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
 # cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
 
-hermes-encoding-components          = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-encoding-components   = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-encoding-components          = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-encoding-components   = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock
index 6b2c3a48..cf405eb2 100644
--- a/relayer/Cargo.lock
+++ b/relayer/Cargo.lock
@@ -188,7 +188,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -199,7 +199,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -233,7 +233,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -475,7 +475,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -680,9 +680,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "cgp"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5adf76ce3579324bc8804a03da7e05a5012e4096e295d7ce16073dd0f55e923e"
+checksum = "4ea80431b9e73ebb8b04657c3890f80b40b987f505f91a65659614d397ec89c5"
 dependencies = [
  "cgp-async",
  "cgp-core",
@@ -691,9 +691,9 @@ dependencies = [
 
 [[package]]
 name = "cgp-async"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0623cc42c39044ad4223a60b58d427fdece736913fa70e0c0b7787b207545886"
+checksum = "7cca3a368634ced2b77f1e00e7ebb0872402a1d8fd6dbf05880329b0a001b37e"
 dependencies = [
  "cgp-async-macro",
  "cgp-sync",
@@ -701,77 +701,85 @@ dependencies = [
 
 [[package]]
 name = "cgp-async-macro"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22933d3a1fb401cc0208e4f8ef16f4c80579701a47b81d2f23ee5b0b697a7b0"
+checksum = "c1656912abbbf7ff2fe11c9680ae5883afe79cac6f2f51bd486d04a3fbba9426"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-component"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a567833f055c865fb46258f7c6a511b22a1da6bc22f58b47a5e5e3da7a2dd2"
-dependencies = [
- "cgp-component-macro",
-]
+checksum = "12793289566a983f8a3151448cb8820bcc4704c34a0a9cf19bb1ed48e0844e81"
 
 [[package]]
 name = "cgp-component-macro"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4c375220b569b618d6b4ec8793c61bbdd24925786aeb4ea1eac5010916c262"
+checksum = "f37331b62cbb29d159d2c3bc3c21bdc885576d9c024d0e9ea4cb3e7513138897"
 dependencies = [
  "cgp-component-macro-lib",
- "proc-macro2",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-component-macro-lib"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e9fa127625afac0527a2f1595ba365142d8d875ff04f155cb248aee456d2c0"
+checksum = "29461124d295bf42c48106e81cb0f89a4eb64132752b916d5ec5df9875d03d58"
 dependencies = [
- "itertools 0.11.0",
+ "itertools 0.14.0",
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-core"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39951e4828fb216d51bfa42121095654f2adb0e4abbc9d03b011c5b47372a4c1"
+checksum = "fbc9ec022a14d652748da1cfb4a880a9046fe9b0fddbe20faf4955e3237dd51a"
 dependencies = [
  "cgp-async",
  "cgp-component",
+ "cgp-component-macro",
  "cgp-error",
  "cgp-field",
- "cgp-inner",
+ "cgp-field-macro",
  "cgp-type",
 ]
 
 [[package]]
 name = "cgp-error"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3866da7384b88d3260e781e60bc9da3a68d5552c33eea56e6780fea8c97d000"
+checksum = "ed10c471f0af57e4f5a196e21af4f95c7ba3fb6d990d623eb3f47a0f75b4d385"
 dependencies = [
  "cgp-async",
  "cgp-component",
+ "cgp-component-macro",
  "cgp-type",
 ]
 
+[[package]]
+name = "cgp-error-extra"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb44c5e45fb8de9d5e8d77a4736c01d09fdee2f4e822b5ea5a3b6243ddbdd9c"
+dependencies = [
+ "cgp-error",
+]
+
 [[package]]
 name = "cgp-error-eyre"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d8f2acb1bd034ba0fe99eb6ab80356aa8a9b39b1be8e320f317e576e9414f1"
+checksum = "b55353f7f8495c809b21e386f2a35c4665f382836a46a2c961216b5aa2bcdc05"
 dependencies = [
  "cgp-core",
  "eyre",
@@ -779,29 +787,31 @@ dependencies = [
 
 [[package]]
 name = "cgp-extra"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f79c15ed0088b1ca06ad58a8f124c1d63f4a554073ed372ff2b488a3fbf6fb9"
+checksum = "04a67b3e5c5fd4420c0fd16c1e93a9e28a7e10f9aa911b66d7a2b9588fbb11c4"
 dependencies = [
+ "cgp-error-extra",
+ "cgp-inner",
  "cgp-run",
+ "cgp-runtime",
 ]
 
 [[package]]
 name = "cgp-field"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6956ca07b849e38106ee5b3c71c7e396088619115fe60934fd2598b873a9efac"
+checksum = "193dec7508c4b4efd6a1ef5eac6789eb0a297561e55dcb8cd377a904f055a176"
 dependencies = [
  "cgp-component",
- "cgp-field-macro",
  "cgp-type",
 ]
 
 [[package]]
 name = "cgp-field-macro"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2286ec0bd3a48571ee3644e80a52ba029f10c2edd6bc3da4f4ef9279583798d5"
+checksum = "c7853451aedcc73c0edf67d44ca9652a7b1ba8a18ac0499f4fced1ac845b7711"
 dependencies = [
  "cgp-field-macro-lib",
  "proc-macro2",
@@ -809,53 +819,64 @@ dependencies = [
 
 [[package]]
 name = "cgp-field-macro-lib"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e05fc04f941c797c28db9dd9685d779b76784f29bdbe2eb368329abfca14d9a"
+checksum = "785d154b6d17929919e3bee306c515c7d78e420303605829e48116fcef2ccf9e"
 dependencies = [
- "itertools 0.11.0",
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "cgp-inner"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd062e3bef5a8353acdcdae3e04c0012de0b19e9bd02acbccfce09e895814cf"
+checksum = "be4e35f1ad7bfb5df01c9f263d054ba53ff87c3d1da20cb5c0872191df904583"
 dependencies = [
  "cgp-component",
+ "cgp-component-macro",
 ]
 
 [[package]]
 name = "cgp-run"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf13ddcb395e915d314abf917d86dc7fa461bd73a3da2724b4698d45eaa283e"
+checksum = "0ec7009079ecfd0a5db07a5dda0e7cece70b1774ead842a42919a93b4662eb96"
 dependencies = [
  "cgp-async",
  "cgp-component",
+ "cgp-component-macro",
  "cgp-error",
 ]
 
+[[package]]
+name = "cgp-runtime"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "332d92088b07754adbde9ecdf894b8c3b9303b287c8d82d11f8886a394121925"
+dependencies = [
+ "cgp-core",
+]
+
 [[package]]
 name = "cgp-sync"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1c0e460bcccd3e2e39ded6a2078f012d3c00b523caafc05b5bdace9205b0cf"
+checksum = "eb37ca18a65f3603aaa307ba76d92f64025db56160143a0e96466b5855d61a29"
 dependencies = [
  "cgp-async-macro",
 ]
 
 [[package]]
 name = "cgp-type"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3c9a9059625de770e4acddff6d5e56c5defd959b010b9643cfcb81832f5bed"
+checksum = "4a4638c888a38fbb1c88406c224c38d7b9e230a306e7b07f796280b89f5baa54"
 dependencies = [
  "cgp-component",
+ "cgp-component-macro",
 ]
 
 [[package]]
@@ -912,7 +933,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1132,7 +1153,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1143,7 +1164,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1203,7 +1224,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1223,7 +1244,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
  "unicode-xid",
 ]
 
@@ -1277,7 +1298,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1607,7 +1628,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1781,7 +1802,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "hermes-any-counterparty"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-cosmos-chain-components",
@@ -1798,7 +1819,7 @@ dependencies = [
 [[package]]
 name = "hermes-async-runtime-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "async-trait",
  "cgp",
@@ -1821,7 +1842,7 @@ dependencies = [
 [[package]]
 name = "hermes-chain-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -1832,7 +1853,7 @@ dependencies = [
 [[package]]
 name = "hermes-chain-type-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
 ]
@@ -1840,7 +1861,7 @@ dependencies = [
 [[package]]
 name = "hermes-cli-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "clap",
@@ -1858,7 +1879,7 @@ dependencies = [
 [[package]]
 name = "hermes-comet-light-client-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -1867,7 +1888,7 @@ dependencies = [
 [[package]]
 name = "hermes-comet-light-client-context"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "eyre",
@@ -1883,7 +1904,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-chain-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "bech32 0.9.1",
  "bitcoin",
@@ -1936,7 +1957,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -1950,7 +1971,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-integration-tests"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "eyre",
@@ -1983,7 +2004,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-relayer"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "dirs-next",
@@ -2032,7 +2053,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-test-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hdpath",
@@ -2059,7 +2080,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-wasm-relayer"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "eyre",
@@ -2108,7 +2129,7 @@ dependencies = [
 [[package]]
 name = "hermes-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
 ]
@@ -2116,7 +2137,7 @@ dependencies = [
 [[package]]
 name = "hermes-error"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "eyre",
@@ -2126,7 +2147,7 @@ dependencies = [
 [[package]]
 name = "hermes-ibc-test-suite"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-logging-components",
@@ -2137,7 +2158,7 @@ dependencies = [
 [[package]]
 name = "hermes-logger"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-logging-components",
@@ -2149,7 +2170,7 @@ dependencies = [
 [[package]]
 name = "hermes-logging-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
 ]
@@ -2157,7 +2178,7 @@ dependencies = [
 [[package]]
 name = "hermes-protobuf-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -2168,7 +2189,7 @@ dependencies = [
 [[package]]
 name = "hermes-relayer-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-chain-components",
@@ -2181,7 +2202,7 @@ dependencies = [
 [[package]]
 name = "hermes-relayer-components-extra"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -2193,7 +2214,7 @@ dependencies = [
 [[package]]
 name = "hermes-runtime"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-async-runtime-components",
@@ -2205,7 +2226,7 @@ dependencies = [
 [[package]]
 name = "hermes-runtime-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
 ]
@@ -2388,7 +2409,7 @@ dependencies = [
 [[package]]
 name = "hermes-test-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -2400,7 +2421,7 @@ dependencies = [
 [[package]]
 name = "hermes-tokio-runtime-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "futures",
@@ -2414,7 +2435,7 @@ dependencies = [
 [[package]]
 name = "hermes-tracing-logging-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-logging-components",
@@ -2426,7 +2447,7 @@ dependencies = [
 [[package]]
 name = "hermes-wasm-client-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-cosmos-chain-components",
@@ -2445,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "hermes-wasm-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-cosmos-encoding-components",
@@ -2459,7 +2480,7 @@ dependencies = [
 [[package]]
 name = "hermes-wasm-test-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git#9dd5e3539cf60d645f13a9787b7c40d5b943fecc"
+source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -3200,7 +3221,7 @@ checksum = "7b2bbdb8c5306e4b53545026d6ecbdbf6f9fc5a6459749c60017b99cf895fed4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3375,7 +3396,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3458,7 +3479,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3553,6 +3574,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -3956,7 +3986,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -4149,7 +4179,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -4226,12 +4256,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.25"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
 dependencies = [
  "proc-macro2",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -4297,7 +4327,7 @@ dependencies = [
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -4326,9 +4356,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -4603,7 +4633,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -4820,7 +4850,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -4854,7 +4884,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5006,7 +5036,7 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5017,7 +5047,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5051,7 +5081,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5116,7 +5146,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5128,7 +5158,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5413,7 +5443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8986a940af916fc0a034f4e42c6ba76d94f1e97216d75447693dfd7aefaf3ef2"
 dependencies = [
  "starknet-core 0.12.0",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5528,9 +5558,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5560,7 +5590,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5793,7 +5823,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -5916,7 +5946,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -6116,7 +6146,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -6376,7 +6406,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
  "wasm-bindgen-shared",
 ]
 
@@ -6411,7 +6441,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6716,7 +6746,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
  "synstructure",
 ]
 
@@ -6738,7 +6768,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -6758,7 +6788,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
  "synstructure",
 ]
 
@@ -6779,7 +6809,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -6801,5 +6831,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.96",
 ]
diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
index 84cf38c3..8e1b5fe5 100644
--- a/relayer/Cargo.toml
+++ b/relayer/Cargo.toml
@@ -27,8 +27,8 @@ rust-version = "1.81"
 overflow-checks = true
 
 [workspace.dependencies]
-cgp            = { version = "0.2.0" }
-cgp-error-eyre = { version = "0.2.0" }
+cgp            = { version = "0.3.1" }
+cgp-error-eyre = { version = "0.3.0" }
 
 starknet                    = { version = "0.11.0" }
 starknet-types-core         = { version = "0.1.7" }
@@ -134,32 +134,32 @@ poseidon = { path = "./crates/poseidon" }
 # cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
 # cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
 
-hermes-chain-components              = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-chain-type-components         = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-relayer-components            = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-relayer-components-extra      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-runtime-components            = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-async-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-tokio-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-runtime                       = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-error                         = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-encoding-components           = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-protobuf-encoding-components  = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-logging-components            = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-tracing-logging-components    = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-logger                        = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-test-components               = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-ibc-test-suite                = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-any-counterparty              = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-chain-components       = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-relayer                = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-wasm-relayer           = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-test-components        = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-encoding-components    = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cosmos-integration-tests      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-comet-light-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-comet-light-client-context    = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-wasm-test-components          = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-wasm-client-components        = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-wasm-encoding-components      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
-hermes-cli-components                = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-chain-components              = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-chain-type-components         = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-relayer-components            = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-relayer-components-extra      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-runtime-components            = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-async-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-tokio-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-runtime                       = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-error                         = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-encoding-components           = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-protobuf-encoding-components  = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-logging-components            = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-tracing-logging-components    = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-logger                        = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-test-components               = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-ibc-test-suite                = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-any-counterparty              = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-chain-components       = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-relayer                = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-wasm-relayer           = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-test-components        = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-encoding-components    = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cosmos-integration-tests      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-comet-light-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-comet-light-client-context    = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-wasm-test-components          = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-wasm-client-components        = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-wasm-encoding-components      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-cli-components                = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/bool.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/bool.rs
index 5e203e14..c79237d7 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/bool.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/bool.rs
@@ -1,6 +1,6 @@
 use core::fmt::Debug;
 
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_encoding_components::traits::decode_mut::{CanDecodeMut, MutDecoder};
 use hermes_encoding_components::traits::encode_mut::{CanEncodeMut, MutEncoder};
 use starknet::core::types::Felt;
@@ -29,7 +29,7 @@ where
 
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, bool> for EncodeBool
 where
-    Encoding: CanDecodeMut<Strategy, Felt> + CanRaiseError<DecodeBoolError>,
+    Encoding: CanDecodeMut<Strategy, Felt> + CanRaiseAsyncError<DecodeBoolError>,
 {
     fn decode_mut(
         encoding: &Encoding,
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/cons.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/cons.rs
index 590883c9..b0700152 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/cons.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/cons.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use cgp::core::error::HasErrorType;
+use cgp::core::error::HasAsyncErrorType;
 use cgp::prelude::Cons;
 use hermes_encoding_components::traits::decode_mut::MutDecoder;
 use hermes_encoding_components::traits::encode_mut::MutEncoder;
@@ -12,7 +12,7 @@ pub struct EncoderCons<EncoderA, EncoderB>(pub PhantomData<(EncoderA, EncoderB)>
 impl<Encoding, Strategy, EncoderA, EncoderB, ValueA, ValueB>
     MutEncoder<Encoding, Strategy, Cons<ValueA, ValueB>> for EncoderCons<EncoderA, EncoderB>
 where
-    Encoding: HasEncodeBufferType + HasErrorType,
+    Encoding: HasEncodeBufferType + HasAsyncErrorType,
     EncoderA: MutEncoder<Encoding, Strategy, ValueA>,
     EncoderB: MutEncoder<Encoding, Strategy, ValueB>,
 {
@@ -31,7 +31,7 @@ where
 impl<Encoding, Strategy, EncoderA, EncoderB, ValueA, ValueB>
     MutDecoder<Encoding, Strategy, Cons<ValueA, ValueB>> for EncoderCons<EncoderA, EncoderB>
 where
-    Encoding: HasDecodeBufferType + HasErrorType,
+    Encoding: HasDecodeBufferType + HasAsyncErrorType,
     EncoderA: MutDecoder<Encoding, Strategy, ValueA>,
     EncoderB: MutDecoder<Encoding, Strategy, ValueB>,
 {
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/end.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/end.rs
index 59c85a2b..477763f6 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/end.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/end.rs
@@ -1,6 +1,6 @@
 use core::fmt::Debug;
 
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_encoding_components::traits::decode_mut::MutDecoder;
 use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType;
 
@@ -12,7 +12,7 @@ pub struct NonEmptyBuffer;
 #[allow(unused_mut)]
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, ()> for DecodeEnd
 where
-    Encoding: HasDecodeBufferType + CanRaiseError<NonEmptyBuffer>,
+    Encoding: HasDecodeBufferType + CanRaiseAsyncError<NonEmptyBuffer>,
     for<'a> Encoding::DecodeBuffer<'a>: Iterator,
 {
     fn decode_mut(
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/felt.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/felt.rs
index 0d0fa0c2..ecdaae0e 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/felt.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/felt.rs
@@ -1,6 +1,6 @@
 use core::iter;
 
-use cgp::core::error::{CanRaiseError, HasErrorType};
+use cgp::core::error::{CanRaiseAsyncError, HasAsyncErrorType};
 use hermes_encoding_components::traits::decode_mut::MutDecoder;
 use hermes_encoding_components::traits::encode_mut::MutEncoder;
 use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType;
@@ -15,7 +15,7 @@ pub struct UnexpectedEndOfBuffer;
 #[allow(unused_mut)]
 impl<Encoding, Strategy> MutEncoder<Encoding, Strategy, Felt> for EncodeFelt
 where
-    Encoding: HasEncodeBufferType + HasErrorType,
+    Encoding: HasEncodeBufferType + HasAsyncErrorType,
     Encoding::EncodeBuffer: Extend<Felt>,
 {
     fn encode_mut(
@@ -32,7 +32,7 @@ where
 #[allow(unused_mut)]
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, Felt> for EncodeFelt
 where
-    Encoding: HasDecodeBufferType + CanRaiseError<UnexpectedEndOfBuffer>,
+    Encoding: HasDecodeBufferType + CanRaiseAsyncError<UnexpectedEndOfBuffer>,
     for<'a> Encoding::DecodeBuffer<'a>: CanIterFeltBuffer<'a>,
 {
     fn decode_mut(
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_u128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_u128.rs
index 868157db..ea587b03 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_u128.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_u128.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_encoding_components::traits::decode_mut::{CanDecodeMut, MutDecoder};
 use hermes_encoding_components::traits::encode_mut::{CanEncodeMut, MutEncoder};
 
@@ -6,7 +6,7 @@ pub struct EncodeFromU128;
 
 impl<Strategy, Encoding, Value, Error> MutEncoder<Encoding, Strategy, Value> for EncodeFromU128
 where
-    Encoding: CanEncodeMut<Strategy, u128> + CanRaiseError<Error>,
+    Encoding: CanEncodeMut<Strategy, u128> + CanRaiseAsyncError<Error>,
     Value: Clone + TryInto<u128, Error = Error>,
 {
     fn encode_mut(
@@ -21,7 +21,7 @@ where
 
 impl<Strategy, Encoding, Value, Error> MutDecoder<Encoding, Strategy, Value> for EncodeFromU128
 where
-    Encoding: CanDecodeMut<Strategy, u128> + CanRaiseError<Error>,
+    Encoding: CanDecodeMut<Strategy, u128> + CanRaiseAsyncError<Error>,
     Value: TryFrom<u128, Error = Error>,
 {
     fn decode_mut(
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/pair.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/pair.rs
index 2e51d264..5a6e2418 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/pair.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/pair.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use cgp::core::error::HasErrorType;
+use cgp::core::error::HasAsyncErrorType;
 use hermes_encoding_components::traits::decode_mut::MutDecoder;
 use hermes_encoding_components::traits::encode_mut::MutEncoder;
 use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType;
@@ -11,7 +11,7 @@ pub struct EncoderPair<EncoderA, EncoderB>(pub PhantomData<(EncoderA, EncoderB)>
 impl<Encoding, Strategy, EncoderA, EncoderB, ValueA, ValueB>
     MutEncoder<Encoding, Strategy, (ValueA, ValueB)> for EncoderPair<EncoderA, EncoderB>
 where
-    Encoding: HasEncodeBufferType + HasErrorType,
+    Encoding: HasEncodeBufferType + HasAsyncErrorType,
     EncoderA: MutEncoder<Encoding, Strategy, ValueA>,
     EncoderB: MutEncoder<Encoding, Strategy, ValueB>,
 {
@@ -30,7 +30,7 @@ where
 impl<Encoding, Strategy, EncoderA, EncoderB, ValueA, ValueB>
     MutDecoder<Encoding, Strategy, (ValueA, ValueB)> for EncoderPair<EncoderA, EncoderB>
 where
-    Encoding: HasDecodeBufferType + HasErrorType,
+    Encoding: HasDecodeBufferType + HasAsyncErrorType,
     EncoderA: MutDecoder<Encoding, Strategy, ValueA>,
     EncoderB: MutDecoder<Encoding, Strategy, ValueB>,
 {
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/string.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/string.rs
index 7d1e6d50..14dc4aa5 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/string.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/string.rs
@@ -1,6 +1,6 @@
 use std::string::FromUtf8Error;
 
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use cgp::prelude::DelegateComponent;
 use hermes_encoding_components::traits::decode_mut::{CanDecodeMut, MutDecoder};
 use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
@@ -15,7 +15,7 @@ impl DelegateComponent<MutEncoderComponent> for EncodeUtf8String {
 
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, String> for EncodeUtf8String
 where
-    Encoding: CanDecodeMut<Strategy, Vec<u8>> + CanRaiseError<FromUtf8Error>,
+    Encoding: CanDecodeMut<Strategy, Vec<u8>> + CanRaiseAsyncError<FromUtf8Error>,
 {
     fn decode_mut(
         encoding: &Encoding,
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/unit.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/unit.rs
index 8f1891f4..79e38add 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/unit.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/unit.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::HasErrorType;
+use cgp::core::error::HasAsyncErrorType;
 use cgp::prelude::Nil;
 use hermes_encoding_components::traits::decode_mut::MutDecoder;
 use hermes_encoding_components::traits::encode_mut::MutEncoder;
@@ -9,7 +9,7 @@ pub struct EncodeNothing;
 
 impl<Encoding, Strategy> MutEncoder<Encoding, Strategy, ()> for EncodeNothing
 where
-    Encoding: HasEncodeBufferType + HasErrorType,
+    Encoding: HasEncodeBufferType + HasAsyncErrorType,
 {
     fn encode_mut(
         _encoding: &Encoding,
@@ -22,7 +22,7 @@ where
 
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, ()> for EncodeNothing
 where
-    Encoding: HasDecodeBufferType + HasErrorType,
+    Encoding: HasDecodeBufferType + HasAsyncErrorType,
 {
     fn decode_mut(
         _encoding: &Encoding,
@@ -34,7 +34,7 @@ where
 
 impl<Encoding, Strategy> MutEncoder<Encoding, Strategy, Nil> for EncodeNothing
 where
-    Encoding: HasEncodeBufferType + HasErrorType,
+    Encoding: HasEncodeBufferType + HasAsyncErrorType,
 {
     fn encode_mut(
         _encoding: &Encoding,
@@ -47,7 +47,7 @@ where
 
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, Nil> for EncodeNothing
 where
-    Encoding: HasDecodeBufferType + HasErrorType,
+    Encoding: HasDecodeBufferType + HasAsyncErrorType,
 {
     fn decode_mut(
         _encoding: &Encoding,
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant.rs
index e5d4e3d5..fc4a7be6 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use cgp::core::error::{CanRaiseError, HasErrorType};
+use cgp::core::error::CanRaiseAsyncError;
 use cgp::prelude::*;
 use hermes_encoding_components::traits::decode_mut::{
     CanDecodeMut, CanPeekDecodeBuffer, MutDecoder,
@@ -33,7 +33,7 @@ where
         encoding: &Encoding,
         value: &Either<ValueA, ValueB>,
         buffer: &mut <Encoding as HasEncodeBufferType>::EncodeBuffer,
-    ) -> Result<(), <Encoding as HasErrorType>::Error> {
+    ) -> Result<(), Encoding::Error> {
         match value {
             Either::Left(value) => {
                 encoding.encode_mut(&I::N, buffer)?;
@@ -72,7 +72,7 @@ where
     Encoding: CanDecodeMut<Strategy, ValueA>
         + CanDecodeMut<Strategy, usize>
         + CanPeekDecodeBuffer<Felt>
-        + CanRaiseError<UnexpectedEndOfBuffer>,
+        + CanRaiseAsyncError<UnexpectedEndOfBuffer>,
     I: Nat,
     SumEncoders<S<I>, N>: MutDecoder<Encoding, Strategy, ValueB>,
 {
@@ -102,7 +102,7 @@ where
     Encoding: CanDecodeMut<Strategy, Value>
         + CanDecodeMut<Strategy, usize>
         + CanPeekDecodeBuffer<Felt>
-        + CanRaiseError<VariantIndexOutOfBound>,
+        + CanRaiseAsyncError<VariantIndexOutOfBound>,
     I: Nat,
 {
     fn decode_mut(
diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant_from.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant_from.rs
index 918cc78f..eb09298f 100644
--- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant_from.rs
+++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/variant_from.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use cgp::core::error::HasErrorType;
+use cgp::core::error::HasAsyncErrorType;
 use hermes_encoding_components::traits::decode_mut::MutDecoder;
 use hermes_encoding_components::traits::encode_mut::MutEncoder;
 use hermes_encoding_components::traits::transform::{Transformer, TransformerRef};
@@ -16,7 +16,7 @@ pub struct EncodeVariantFrom<Transform>(pub PhantomData<Transform>);
 impl<Encoding, Strategy, N, Transform> MutEncoder<Encoding, Strategy, Transform::From>
     for EncodeVariantFrom<Transform>
 where
-    Encoding: HasEncodeBufferType + HasErrorType,
+    Encoding: HasEncodeBufferType + HasAsyncErrorType,
     SumEncoders<Z, N>: for<'a> MutEncoder<Encoding, Strategy, Transform::To<'a>>,
     Transform: TransformerRef,
     for<'a> Transform::To<'a>: HasSize<Size = S<N>>,
@@ -34,7 +34,7 @@ where
 impl<Encoding, Strategy, N, Transform, Source, Target> MutDecoder<Encoding, Strategy, Target>
     for EncodeVariantFrom<Transform>
 where
-    Encoding: HasDecodeBufferType + HasErrorType,
+    Encoding: HasDecodeBufferType + HasAsyncErrorType,
     SumEncoders<Z, N>: MutDecoder<Encoding, Strategy, Source>,
     Transform: Transformer<From = Source, To = Target>,
     Source: HasSize<Size = S<N>>,
diff --git a/relayer/crates/starknet-chain-components/src/components/chain.rs b/relayer/crates/starknet-chain-components/src/components/chain.rs
index 5b9d3217..92539c18 100644
--- a/relayer/crates/starknet-chain-components/src/components/chain.rs
+++ b/relayer/crates/starknet-chain-components/src/components/chain.rs
@@ -1,5 +1,5 @@
 use cgp::core::component::WithProvider;
-use cgp::core::types::impls::UseDelegatedType;
+use cgp::core::types::UseDelegatedType;
 use cgp::prelude::*;
 use hermes_chain_components::impls::payload_builders::channel::BuildChannelHandshakePayload;
 use hermes_chain_components::impls::payload_builders::connection::BuildConnectionHandshakePayload;
diff --git a/relayer/crates/starknet-chain-components/src/components/starknet_to_cosmos.rs b/relayer/crates/starknet-chain-components/src/components/starknet_to_cosmos.rs
index 5bb22bbb..5acb07cf 100644
--- a/relayer/crates/starknet-chain-components/src/components/starknet_to_cosmos.rs
+++ b/relayer/crates/starknet-chain-components/src/components/starknet_to_cosmos.rs
@@ -1,4 +1,4 @@
-use cgp::core::types::impls::WithType;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_chain_components::traits::types::ibc::CounterpartyMessageHeightGetterComponent;
 use hermes_cosmos_chain_components::components::client::{
diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/call.rs b/relayer/crates/starknet-chain-components/src/impls/contract/call.rs
index 3e9126fb..67c7583d 100644
--- a/relayer/crates/starknet-chain-components/src/impls/contract/call.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/contract/call.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_test_components::chain::traits::types::address::HasAddressType;
 use starknet::core::types::{BlockId, BlockTag, Felt, FunctionCall};
 use starknet::providers::{Provider, ProviderError};
@@ -16,7 +16,7 @@ where
         + HasSelectorType<Selector = Felt>
         + HasBlobType<Blob = Vec<Felt>>
         + HasStarknetProvider
-        + CanRaiseError<ProviderError>,
+        + CanRaiseAsyncError<ProviderError>,
 {
     async fn call_contract(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs b/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs
index 71adb84b..40a4f01e 100644
--- a/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs
@@ -4,7 +4,7 @@ use cairo_lang_starknet_classes::casm_contract_class::{
     CasmContractClass, StarknetSierraCompilationError,
 };
 use cairo_lang_starknet_classes::contract_class::ContractClass;
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse;
 use starknet::accounts::Account;
 use starknet::core::types::contract::{
@@ -29,11 +29,11 @@ where
         + HasStarknetAccount
         + CanPollTxResponse<TxHash = Felt, TxResponse = TxResponse>
         + CanRaiseAccountErrors
-        + CanRaiseError<serde_json::error::Error>
-        + CanRaiseError<JsonError>
-        + CanRaiseError<ComputeClassHashError>
-        + CanRaiseError<RevertedInvocation>
-        + CanRaiseError<StarknetSierraCompilationError>,
+        + CanRaiseAsyncError<serde_json::error::Error>
+        + CanRaiseAsyncError<JsonError>
+        + CanRaiseAsyncError<ComputeClassHashError>
+        + CanRaiseAsyncError<RevertedInvocation>
+        + CanRaiseAsyncError<StarknetSierraCompilationError>,
 {
     async fn declare_contract(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs b/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs
index 6b53a541..53a3f082 100644
--- a/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse;
 use hermes_test_components::chain::traits::types::address::HasAddressType;
 use starknet::contract::ContractFactory;
@@ -25,7 +25,7 @@ where
         + CanPollTxResponse<TxHash = Felt, TxResponse = TxResponse>
         + HasStarknetAccount
         + CanRaiseAccountErrors
-        + CanRaiseError<RevertedInvocation>,
+        + CanRaiseAsyncError<RevertedInvocation>,
 {
     async fn deploy_contract(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs
index 0bc55125..176a4a48 100644
--- a/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs
@@ -1,9 +1,9 @@
-use cgp::prelude::HasErrorType;
+use cgp::prelude::HasAsyncErrorType;
 use hermes_cairo_encoding_components::strategy::ViaCairo;
 use hermes_encoding_components::traits::decode::CanDecode;
 use hermes_encoding_components::traits::types::encoded::HasEncodedType;
 
-pub trait CanFilterDecodeEvents<Value>: HasEncodedType + HasErrorType {
+pub trait CanFilterDecodeEvents<Value>: HasEncodedType + HasAsyncErrorType {
     fn filter_decode_events(&self, encoded: &[Self::Encoded]) -> Result<Vec<Value>, Self::Error>;
 }
 
diff --git a/relayer/crates/starknet-chain-components/src/impls/error/account.rs b/relayer/crates/starknet-chain-components/src/impls/error/account.rs
index a2a4b896..a6f09592 100644
--- a/relayer/crates/starknet-chain-components/src/impls/error/account.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/error/account.rs
@@ -1,6 +1,6 @@
 use core::fmt::Debug;
 
-use cgp::core::error::{CanRaiseError, ErrorRaiser};
+use cgp::core::error::{CanRaiseAsyncError, ErrorRaiser};
 use starknet::accounts::AccountError;
 use starknet::providers::ProviderError;
 
@@ -8,7 +8,7 @@ pub struct RaiseAccountError;
 
 impl<Context, S> ErrorRaiser<Context, AccountError<S>> for RaiseAccountError
 where
-    Context: CanRaiseError<ProviderError> + CanRaiseError<String>,
+    Context: CanRaiseAsyncError<ProviderError> + CanRaiseAsyncError<String>,
     S: Debug,
 {
     fn raise_error(e: AccountError<S>) -> Context::Error {
diff --git a/relayer/crates/starknet-chain-components/src/impls/error/provider.rs b/relayer/crates/starknet-chain-components/src/impls/error/provider.rs
index d66a121e..c0ede874 100644
--- a/relayer/crates/starknet-chain-components/src/impls/error/provider.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/error/provider.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::{CanRaiseError, ErrorRaiser};
+use cgp::core::error::{CanRaiseAsyncError, ErrorRaiser};
 use starknet::core::types::StarknetError;
 use starknet::providers::ProviderError;
 
@@ -6,7 +6,7 @@ pub struct RaiseProviderError;
 
 impl<Context> ErrorRaiser<Context, ProviderError> for RaiseProviderError
 where
-    Context: CanRaiseError<StarknetError> + CanRaiseError<String>,
+    Context: CanRaiseAsyncError<StarknetError> + CanRaiseAsyncError<String>,
 {
     fn raise_error(e: ProviderError) -> Context::Error {
         match e {
diff --git a/relayer/crates/starknet-chain-components/src/impls/error/starknet.rs b/relayer/crates/starknet-chain-components/src/impls/error/starknet.rs
index 6b440dfe..dbd7cf30 100644
--- a/relayer/crates/starknet-chain-components/src/impls/error/starknet.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/error/starknet.rs
@@ -1,11 +1,11 @@
-use cgp::core::error::{CanRaiseError, ErrorRaiser};
+use cgp::core::error::{CanRaiseAsyncError, ErrorRaiser};
 use starknet::core::types::StarknetError;
 
 pub struct RaiseStarknetError;
 
 impl<Context> ErrorRaiser<Context, StarknetError> for RaiseStarknetError
 where
-    Context: CanRaiseError<String>,
+    Context: CanRaiseAsyncError<String>,
 {
     fn raise_error(e: StarknetError) -> Context::Error {
         match e {
diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs b/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs
index ea6c1710..3a527950 100644
--- a/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs
@@ -51,8 +51,8 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasPortIdType<Counterparty, PortId = IbcPortId>
         + HasInitChannelOptionsType<Counterparty, InitChannelOptions = CosmosInitChannelOptions>
-        + CanRaiseError<&'static str>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasPortIdType<Chain, PortId = IbcPortId>,
     Encoding: CanEncode<ViaCairo, MsgChanOpenInit> + HasEncodedType<Encoded = Vec<Felt>>,
 {
@@ -127,8 +127,8 @@ where
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasPortIdType<Counterparty, PortId = IbcPortId>
-        + CanRaiseError<&'static str>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasChannelIdType<Chain, ChannelId = ChannelId>
         + HasHeightType<Height = Height>
         + HasPortIdType<Chain, PortId = IbcPortId>
@@ -230,7 +230,7 @@ where
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasPortIdType<Counterparty, PortId = IbcPortId>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasChannelOpenAckPayloadType<
             Chain,
             ChannelOpenAckPayload = ChannelOpenAckPayload<Counterparty, Chain>,
@@ -307,7 +307,7 @@ where
         + HasAddressType<Address = Felt>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasHeightType<Height = Height>
         + HasCommitmentProofType
         + HasChannelOpenConfirmPayloadType<
diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs b/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs
index 3570a8e8..2eb9690c 100644
--- a/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs
@@ -62,11 +62,11 @@ where
         + HasMessageType<Message = StarknetMessage>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<&'static str>
-        + CanRaiseError<Encoding::Error>
-        + CanRaiseError<ParseIntError>
-        + CanRaiseError<serde_json::Error>
-        + CanRaiseError<Utf8Error>,
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<Encoding::Error>
+        + CanRaiseAsyncError<ParseIntError>
+        + CanRaiseAsyncError<serde_json::Error>
+        + CanRaiseAsyncError<Utf8Error>,
     Counterparty: HasClientIdType<Chain, ClientId = CosmosClientId>
         + HasCommitmentPrefixType<CommitmentPrefix = Vec<u8>>
         + HasConnectionOpenInitPayloadType<
@@ -173,10 +173,10 @@ where
         + HasAddressType<Address = Felt>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<ParseIntError>
-        + CanRaiseError<Utf8Error>
-        + CanRaiseError<Encoding::Error>
-        + CanRaiseError<&'static str>,
+        + CanRaiseAsyncError<ParseIntError>
+        + CanRaiseAsyncError<Utf8Error>
+        + CanRaiseAsyncError<Encoding::Error>
+        + CanRaiseAsyncError<&'static str>,
     Counterparty: HasHeightType<Height = Height>
         + HasCommitmentPrefixType<CommitmentPrefix = Vec<u8>>
         + HasCommitmentProofType
@@ -274,7 +274,7 @@ where
         + HasMessageType<Message = StarknetMessage>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasHeightType<Height = Height>
         + HasCommitmentProofType
         + HasConnectionIdType<Chain, ConnectionId = CosmosConnectionId>
@@ -349,7 +349,7 @@ where
         + HasMessageType<Message = StarknetMessage>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasHeightType<Height = Height>
         + HasCommitmentProofType
         + HasConnectionOpenConfirmPayloadType<
diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/create_client.rs b/relayer/crates/starknet-chain-components/src/impls/messages/create_client.rs
index 69d38ed9..f466c717 100644
--- a/relayer/crates/starknet-chain-components/src/impls/messages/create_client.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/messages/create_client.rs
@@ -33,7 +33,7 @@ where
         + HasAddressType<Address = Felt>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty:
         HasCreateClientPayloadType<Chain, CreateClientPayload = CosmosCreateClientPayload>,
     Encoding: HasEncodedType<Encoded = Vec<Felt>>
diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs b/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs
index 6ed03860..627feb9e 100644
--- a/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs
@@ -51,7 +51,7 @@ where
         + HasAddressType<Address = Felt>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasOutgoingPacketType<Chain, OutgoingPacket = IbcPacket>
         + HasHeightType<Height = Height>
         + HasCommitmentProofType
@@ -111,9 +111,9 @@ where
         + HasAddressType<Address = Felt>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
-        + CanRaiseError<Encoding::Error>
+        + CanRaiseAsyncError<Encoding::Error>
         + HasOutgoingPacketType<Counterparty, OutgoingPacket = IbcPacket>
-        + HasErrorType,
+        + HasAsyncErrorType,
     Counterparty: HasAckPacketPayloadType<Chain, AckPacketPayload = AckPacketPayload<Counterparty, Chain>>
         + HasHeightType<Height = Height>
         + HasCommitmentProofType
@@ -177,9 +177,9 @@ where
         + HasAddressType<Address = Felt>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
-        + CanRaiseError<Encoding::Error>
+        + CanRaiseAsyncError<Encoding::Error>
         + HasOutgoingPacketType<Counterparty, OutgoingPacket = IbcPacket>
-        + HasErrorType,
+        + HasAsyncErrorType,
     Counterparty: HasHeightType<Height = Height>
         + HasCommitmentProofType
         + HasTimeoutUnorderedPacketPayloadType<
diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/update_client.rs b/relayer/crates/starknet-chain-components/src/impls/messages/update_client.rs
index c6b1624f..0656aea8 100644
--- a/relayer/crates/starknet-chain-components/src/impls/messages/update_client.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/messages/update_client.rs
@@ -32,7 +32,7 @@ where
         + HasClientIdType<Counterparty, ClientId = ClientId>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasUpdateClientPayloadType<Chain, UpdateClientPayload = CometUpdateHeader>,
     Encoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanEncode<ViaCairo, CometUpdateHeader>
diff --git a/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs b/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs
index 9fcfcac0..6060d2d0 100644
--- a/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::HasErrorType;
+use cgp::prelude::HasAsyncErrorType;
 use hermes_chain_components::traits::packet::filter::{IncomingPacketFilter, OutgoingPacketFilter};
 use hermes_chain_components::traits::types::packet::{
     HasIncomingPacketType, HasOutgoingPacketType,
@@ -8,7 +8,7 @@ pub struct FilterStarknetPackets;
 
 impl<Chain, Counterparty> OutgoingPacketFilter<Chain, Counterparty> for FilterStarknetPackets
 where
-    Chain: HasOutgoingPacketType<Counterparty> + HasErrorType,
+    Chain: HasOutgoingPacketType<Counterparty> + HasAsyncErrorType,
 {
     async fn should_relay_outgoing_packet(
         _chain: &Chain,
@@ -20,7 +20,7 @@ where
 
 impl<Chain, Counterparty> IncomingPacketFilter<Chain, Counterparty> for FilterStarknetPackets
 where
-    Chain: HasIncomingPacketType<Counterparty> + HasErrorType,
+    Chain: HasIncomingPacketType<Counterparty> + HasAsyncErrorType,
 {
     async fn should_relay_incoming_packet(
         _chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/payload_builders/create_client.rs b/relayer/crates/starknet-chain-components/src/impls/payload_builders/create_client.rs
index e440835a..84ef9aac 100644
--- a/relayer/crates/starknet-chain-components/src/impls/payload_builders/create_client.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/payload_builders/create_client.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::CanRaiseError;
+use cgp::prelude::CanRaiseAsyncError;
 use hermes_chain_components::traits::types::chain_id::HasChainId;
 use hermes_relayer_components::chain::traits::payload_builders::create_client::CreateClientPayloadBuilder;
 use hermes_relayer_components::chain::traits::queries::chain_status::CanQueryChainStatus;
@@ -28,7 +28,7 @@ where
         > + HasCreateClientPayloadType<Counterparty, CreateClientPayload = StarknetCreateClientPayload>
         + CanQueryChainStatus<ChainStatus = StarknetChainStatus>
         + HasChainId<ChainId = ChainId>
-        + CanRaiseError<ClientError>,
+        + CanRaiseAsyncError<ClientError>,
 {
     async fn build_create_client_payload(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-chain-components/src/impls/payload_builders/update_client.rs
index 72ec4b0d..4c521766 100644
--- a/relayer/crates/starknet-chain-components/src/impls/payload_builders/update_client.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/payload_builders/update_client.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::CanRaiseError;
+use cgp::prelude::CanRaiseAsyncError;
 use hermes_relayer_components::chain::traits::payload_builders::update_client::UpdateClientPayloadBuilder;
 use hermes_relayer_components::chain::traits::queries::chain_status::CanQueryChainStatus;
 use hermes_relayer_components::chain::traits::types::client_state::HasClientStateType;
@@ -25,8 +25,8 @@ where
         + HasUpdateClientPayloadType<Counterparty, UpdateClientPayload = StarknetUpdateClientPayload>
         + CanQueryChainStatus<ChainStatus = StarknetChainStatus>
         + HasStarknetProvider
-        + CanRaiseError<&'static str>
-        + CanRaiseError<ProviderError>,
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<ProviderError>,
 {
     async fn build_update_client_payload(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs b/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
index 7cf8ad2a..a9162be8 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
@@ -42,7 +42,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasSequenceType<Chain, Sequence = IbcSequence>,
 
     Encoding: CanEncode<ViaCairo, Product![CairoPortId, ChannelId, Sequence]>
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs b/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs
index fcd4d709..d784fd78 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::CanRaiseError;
+use cgp::prelude::CanRaiseAsyncError;
 use hermes_cairo_encoding_components::strategy::ViaCairo;
 use hermes_cairo_encoding_components::types::as_felt::AsFelt;
 use hermes_chain_type_components::traits::types::address::HasAddressType;
@@ -28,8 +28,8 @@ where
         + HasSelectorType<Selector = Felt>
         + CanCallContract
         + HasEncoding<AsFelt, Encoding = Encoding>
-        + CanRaiseError<&'static str>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanDecode<ViaCairo, U256, Encoded = Vec<Felt>>,
 {
     async fn query_balance(
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs b/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
index 2ce3eb75..5e66eb27 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
@@ -40,7 +40,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanEncode<ViaCairo, Product![PortId, ChannelId]>
         + CanDecode<ViaCairo, ChannelEnd>
         + HasEncodedType<Encoded = Vec<Felt>>,
@@ -87,7 +87,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanEncode<ViaCairo, Product![PortId, ChannelId]>
         + CanDecode<ViaCairo, ChannelEnd>
         + HasEncodedType<Encoded = Vec<Felt>>,
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/client_state.rs b/relayer/crates/starknet-chain-components/src/impls/queries/client_state.rs
index fda43803..b326d037 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/client_state.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/client_state.rs
@@ -37,7 +37,7 @@ where
         + HasBlobType<Blob = Vec<Felt>>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_client_contract_address")>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasClientStateType<Chain, ClientState = CometClientState>,
     Encoding: CanEncode<ViaCairo, u64>
         + CanDecode<ViaCairo, Vec<Felt>>
@@ -79,7 +79,7 @@ where
         + HasHeightType<Height = u64>
         + HasCommitmentProofType<CommitmentProof = StarknetCommitmentProof>
         + CanQueryClientState<Counterparty>
-        + HasErrorType,
+        + HasAsyncErrorType,
     Counterparty: HasClientStateType<Chain> + HasHeightType,
 {
     async fn query_client_state_with_proofs(
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs b/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
index 48cc252a..f3b72411 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
@@ -38,7 +38,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanEncode<ViaCairo, ConnectionId>
         + CanDecode<ViaCairo, ConnectionEnd>
         + HasEncodedType<Encoded = Vec<Felt>>,
@@ -77,7 +77,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanEncode<ViaCairo, ConnectionId>
         + CanDecode<ViaCairo, ConnectionEnd>
         + HasEncodedType<Encoded = Vec<Felt>>,
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/consensus_state.rs b/relayer/crates/starknet-chain-components/src/impls/queries/consensus_state.rs
index a68db6d0..a412672f 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/consensus_state.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/consensus_state.rs
@@ -44,8 +44,8 @@ where
         + HasBlobType<Blob = Vec<Felt>>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanQueryContractAddress<symbol!("ibc_client_contract_address")>
-        + CanRaiseError<ConsensusStateNotFound>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<ConsensusStateNotFound>
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty:
         HasConsensusStateType<Chain, ConsensusState = CometConsensusState> + HasHeightFields,
     Encoding: CanEncode<ViaCairo, (u64, Height)>
@@ -104,7 +104,7 @@ where
         + HasHeightType<Height = u64>
         + HasCommitmentProofType<CommitmentProof = StarknetCommitmentProof>
         + CanQueryConsensusState<Counterparty>
-        + HasErrorType,
+        + HasAsyncErrorType,
     Counterparty: HasConsensusStateType<Chain> + HasHeightType,
 {
     async fn query_consensus_state_with_proofs(
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/contract_address.rs b/relayer/crates/starknet-chain-components/src/impls/queries/contract_address.rs
index e6c7fa40..e4e20538 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/contract_address.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/contract_address.rs
@@ -13,7 +13,7 @@ pub struct ContractAddressNotFound;
 impl<Chain, Tag> ContractAddressQuerier<Chain, Tag> for GetContractAddressFromField
 where
     Chain: HasAddressType<Address: Clone>
-        + CanRaiseError<ContractAddressNotFound>
+        + CanRaiseAsyncError<ContractAddressNotFound>
         + HasField<Tag, Value = Option<Chain::Address>>,
     Tag: Async,
 {
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
index 85186280..a05b9584 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
@@ -43,7 +43,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanEncode<ViaCairo, Product![CairoPortId, ChannelId, Sequence]>
         + CanDecode<ViaCairo, Product![[u32; 8]]>
         + HasEncodedType<Encoded = Vec<Felt>>,
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
index 5b84555b..4cae92e3 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
@@ -42,7 +42,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasSequenceType<Chain, Sequence = IbcSequence>,
     Encoding: CanEncode<ViaCairo, Product![CairoPortId, ChannelId, Sequence]>
         + CanDecode<ViaCairo, bool>
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_received.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_received.rs
index 490e3cbf..7f6cc630 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/packet_received.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/packet_received.rs
@@ -44,7 +44,7 @@ where
         + CanQueryContractAddress<symbol!("ibc_core_contract_address")>
         + HasEncoding<AsFelt, Encoding = Encoding>
         + CanCallContract
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasSequenceType<Chain, Sequence = IbcSequence>,
     Encoding: CanEncode<ViaCairo, Product![CairoPortId, ChannelId, Sequence]>
         + CanDecode<ViaCairo, bool>
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/status.rs b/relayer/crates/starknet-chain-components/src/impls/queries/status.rs
index 996c5a9c..5259f136 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/status.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/status.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::CanRaiseError;
+use cgp::prelude::CanRaiseAsyncError;
 use hermes_cosmos_chain_components::types::status::Time;
 use hermes_relayer_components::chain::traits::queries::chain_status::ChainStatusQuerier;
 use hermes_relayer_components::chain::traits::types::status::HasChainStatusType;
@@ -14,8 +14,8 @@ impl<Chain> ChainStatusQuerier<Chain> for QueryStarknetChainStatus
 where
     Chain: HasChainStatusType<ChainStatus = StarknetChainStatus>
         + HasStarknetProvider
-        + CanRaiseError<ProviderError>
-        + CanRaiseError<&'static str>,
+        + CanRaiseAsyncError<ProviderError>
+        + CanRaiseAsyncError<&'static str>,
 {
     async fn query_chain_status(chain: &Chain) -> Result<StarknetChainStatus, Chain::Error> {
         let block = chain
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_balance.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_balance.rs
index 140906a9..d2447b93 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/token_balance.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_balance.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_cairo_encoding_components::strategy::ViaCairo;
 use hermes_cairo_encoding_components::types::as_felt::AsFelt;
 use hermes_encoding_components::traits::decode::CanDecode;
@@ -26,8 +26,8 @@ where
         + HasSelectorType<Selector = Felt>
         + CanCallContract
         + HasEncoding<AsFelt, Encoding = Encoding>
-        + CanRaiseError<&'static str>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanDecode<ViaCairo, U256, Encoded = Vec<Felt>>,
 {
     async fn query_token_balance(
diff --git a/relayer/crates/starknet-chain-components/src/impls/send_message.rs b/relayer/crates/starknet-chain-components/src/impls/send_message.rs
index ea8ee5a6..3b165f39 100644
--- a/relayer/crates/starknet-chain-components/src/impls/send_message.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/send_message.rs
@@ -1,6 +1,6 @@
 use core::fmt::Debug;
 
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType;
 use hermes_relayer_components::chain::traits::send_message::MessageSender;
 use hermes_relayer_components::chain::traits::types::message::HasMessageType;
@@ -30,8 +30,8 @@ where
         + HasTxResponseType<TxResponse = TxResponse>
         + HasMessageResponseType<MessageResponse = StarknetMessageResponse>
         + CanPollTxResponse
-        + CanRaiseError<RevertedInvocation>
-        + CanRaiseError<UnexpectedTransactionTraceType>,
+        + CanRaiseAsyncError<RevertedInvocation>
+        + CanRaiseAsyncError<UnexpectedTransactionTraceType>,
 {
     async fn send_messages(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/channel_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/channel_message.rs
index 06406423..1d6e7245 100644
--- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/channel_message.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/channel_message.rs
@@ -40,11 +40,11 @@ impl<Chain, Counterparty> ChannelOpenTryMessageBuilder<Chain, Counterparty>
 where
     Chain: HasMessageType<Message = CosmosMessage>
         + HasPortIdType<Counterparty, PortId = IbcPortId>
-        + CanRaiseError<Infallible>
-        + CanRaiseError<ClientError>
-        + CanRaiseError<&'static str>
-        + CanRaiseError<ParseIntError>
-        + CanRaiseError<IdentifierError>,
+        + CanRaiseAsyncError<Infallible>
+        + CanRaiseAsyncError<ClientError>
+        + CanRaiseAsyncError<&'static str>
+        + CanRaiseAsyncError<ParseIntError>
+        + CanRaiseAsyncError<IdentifierError>,
     Counterparty: HasChannelIdType<Chain, ChannelId = StarknetChannelId>
         + HasPortIdType<Chain, PortId = IbcPortId>
         + HasHeightType<Height = u64>
@@ -128,7 +128,7 @@ where
     Chain: HasMessageType<Message = CosmosMessage>
         + HasPortIdType<Counterparty, PortId = IbcPortId>
         + HasChannelIdType<Counterparty, ChannelId = IbcChannelId>
-        + CanRaiseError<ClientError>,
+        + CanRaiseAsyncError<ClientError>,
     Counterparty: HasChannelIdType<Chain, ChannelId = StarknetChannelId>
         + HasPortIdType<Chain, PortId = IbcPortId>
         + HasCommitmentProofType<CommitmentProof = StarknetCommitmentProof>
@@ -170,7 +170,7 @@ where
     Chain: HasMessageType<Message = CosmosMessage>
         + HasPortIdType<Counterparty, PortId = IbcPortId>
         + HasChannelIdType<Counterparty, ChannelId = IbcChannelId>
-        + CanRaiseError<ClientError>,
+        + CanRaiseAsyncError<ClientError>,
     Counterparty: HasHeightType<Height = u64>
         + HasCommitmentProofType<CommitmentProof = StarknetCommitmentProof>
         + HasChannelOpenConfirmPayloadType<
diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/connection_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/connection_message.rs
index 5df64504..1a5ab5e9 100644
--- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/connection_message.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/connection_message.rs
@@ -49,7 +49,7 @@ where
             InitConnectionOptions = CosmosInitConnectionOptions,
         > + HasClientIdType<Counterparty, ClientId = CosmosClientId>
         + HasMessageType<Message = CosmosMessage>
-        + HasErrorType,
+        + HasAsyncErrorType,
     Counterparty: HasClientIdType<Chain, ClientId = StarknetClientId>
         + HasCommitmentPrefixType<CommitmentPrefix = Vec<u8>>
         + HasConnectionOpenInitPayloadType<
@@ -82,7 +82,7 @@ where
     Chain: HasMessageType<Message = CosmosMessage>
         + HasHeightType<Height = CosmosHeight>
         + HasClientIdType<Counterparty, ClientId = CosmosClientId>
-        + CanRaiseError<ClientError>
+        + CanRaiseAsyncError<ClientError>
         + HasClientStateType<Counterparty, ClientState = CometClientState>,
     Counterparty: HasConnectionOpenTryPayloadType<
             Chain,
@@ -146,7 +146,7 @@ where
         + HasConnectionIdType<Counterparty, ConnectionId = CosmosConnectionId>
         + HasClientStateType<Counterparty, ClientState = CometClientState>
         + HasHeightType<Height = CosmosHeight>
-        + CanRaiseError<ClientError>,
+        + CanRaiseAsyncError<ClientError>,
     Counterparty: HasConnectionOpenAckPayloadType<
             Chain,
             ConnectionOpenAckPayload = ConnectionOpenAckPayload<Counterparty, Chain>,
@@ -196,7 +196,7 @@ impl<Chain, Counterparty> ConnectionOpenConfirmMessageBuilder<Chain, Counterpart
 where
     Chain: HasMessageType<Message = CosmosMessage>
         + HasConnectionIdType<Counterparty, ConnectionId = CosmosConnectionId>
-        + CanRaiseError<ClientError>,
+        + CanRaiseAsyncError<ClientError>,
     Counterparty: HasConnectionOpenConfirmPayloadType<
             Chain,
             ConnectionOpenConfirmPayload = ConnectionOpenConfirmPayload<Counterparty>,
diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/query_consensus_state_height.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/query_consensus_state_height.rs
index 9a650e7b..248c0a39 100644
--- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/query_consensus_state_height.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/query_consensus_state_height.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_cosmos_chain_components::traits::grpc_address::HasGrpcAddress;
 use hermes_relayer_components::chain::traits::queries::consensus_state_height::ConsensusStateHeightsQuerier;
 use hermes_relayer_components::chain::traits::types::height::HasHeightType;
@@ -18,9 +18,9 @@ impl<Chain, Counterparty> ConsensusStateHeightsQuerier<Chain, Counterparty>
 where
     Chain: HasIbcChainTypes<Counterparty, ClientId = ClientId>
         + HasGrpcAddress
-        + CanRaiseError<InvalidUri>
-        + CanRaiseError<TransportError>
-        + CanRaiseError<Status>,
+        + CanRaiseAsyncError<InvalidUri>
+        + CanRaiseAsyncError<TransportError>
+        + CanRaiseAsyncError<Status>,
     Counterparty: HasHeightType<Height = u64>,
 {
     async fn query_consensus_state_heights(
diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_message.rs
index f6f31e4d..283197f8 100644
--- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_message.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_message.rs
@@ -21,7 +21,7 @@ impl<Chain, Counterparty, Encoding> UpdateClientMessageBuilder<Chain, Counterpar
 where
     Chain: HasIbcChainTypes<Counterparty, ClientId = ClientId>
         + HasMessageType<Message = CosmosMessage>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Counterparty: HasUpdateClientPayloadType<Chain, UpdateClientPayload = StarknetUpdateClientPayload>
         + HasDefaultEncoding<AsBytes, Encoding = Encoding>,
     Encoding: Async + CanConvert<StarknetHeader, Any>,
diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_payload.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_payload.rs
index 1fd00721..d5c1bcc0 100644
--- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_payload.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/update_client_payload.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::HasErrorType;
+use cgp::prelude::HasAsyncErrorType;
 use hermes_chain_components::traits::payload_builders::create_client::CanBuildCreateClientPayload;
 use hermes_chain_components::traits::payload_builders::update_client::UpdateClientPayloadBuilder;
 use hermes_chain_components::traits::types::client_state::HasClientStateType;
@@ -36,7 +36,7 @@ where
         + HasUpdateClientPayloadType<Counterparty, UpdateClientPayload = CometUpdateHeader>
         + HasClientStateType<Counterparty>
         + HasHeightType<Height = CosmosHeight>
-        + HasErrorType,
+        + HasAsyncErrorType,
 {
     async fn build_update_client_payload(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/tx_response.rs b/relayer/crates/starknet-chain-components/src/impls/tx_response.rs
index 9761d56f..106f1a20 100644
--- a/relayer/crates/starknet-chain-components/src/impls/tx_response.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/tx_response.rs
@@ -1,6 +1,6 @@
 use core::time::Duration;
 
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_relayer_components::transaction::impls::poll_tx_response::PollTimeoutGetter;
 use hermes_relayer_components::transaction::traits::query_tx_response::TxResponseQuerier;
 use hermes_relayer_components::transaction::traits::types::tx_hash::HasTransactionHashType;
@@ -21,7 +21,7 @@ where
         + HasTxResponseType<TxResponse = TxResponse>
         + HasStarknetProvider
         + HasRuntime<Runtime: CanSleep>
-        + CanRaiseError<ProviderError>,
+        + CanRaiseAsyncError<ProviderError>,
 {
     async fn query_tx_response(
         chain: &Chain,
diff --git a/relayer/crates/starknet-chain-components/src/impls/types/height.rs b/relayer/crates/starknet-chain-components/src/impls/types/height.rs
index cfe143cf..35def92b 100644
--- a/relayer/crates/starknet-chain-components/src/impls/types/height.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/types/height.rs
@@ -1,5 +1,5 @@
 use cgp::core::Async;
-use cgp::prelude::CanRaiseError;
+use cgp::prelude::CanRaiseAsyncError;
 use hermes_chain_components::traits::types::height::HeightIncrementer;
 use hermes_relayer_components::chain::traits::types::height::{
     HasHeightType, HeightFieldGetter, ProvideHeightType,
@@ -26,7 +26,7 @@ where
 
 impl<Chain> HeightIncrementer<Chain> for ProvideStarknetHeight
 where
-    Chain: HasHeightType<Height = u64> + CanRaiseError<&'static str>,
+    Chain: HasHeightType<Height = u64> + CanRaiseAsyncError<&'static str>,
 {
     fn increment_height(height: &u64) -> Result<u64, Chain::Error> {
         height
diff --git a/relayer/crates/starknet-chain-components/src/traits/account.rs b/relayer/crates/starknet-chain-components/src/traits/account.rs
index dcd5dbe0..32b2ca02 100644
--- a/relayer/crates/starknet-chain-components/src/traits/account.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/account.rs
@@ -21,14 +21,14 @@ pub trait HasStarknetAccount: HasStarknetAccountType {
 
 pub trait CanRaiseAccountErrors:
     HasStarknetAccountType
-    + CanRaiseError<<Self::Account as Account>::SignError>
-    + CanRaiseError<AccountError<<Self::Account as Account>::SignError>>
+    + CanRaiseAsyncError<<Self::Account as Account>::SignError>
+    + CanRaiseAsyncError<AccountError<<Self::Account as Account>::SignError>>
 {
 }
 
 impl<Chain> CanRaiseAccountErrors for Chain where
     Chain: HasStarknetAccountType
-        + CanRaiseError<<Chain::Account as Account>::SignError>
-        + CanRaiseError<AccountError<<Self::Account as Account>::SignError>>
+        + CanRaiseAsyncError<<Chain::Account as Account>::SignError>
+        + CanRaiseAsyncError<AccountError<<Self::Account as Account>::SignError>>
 {
 }
diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs
index 7221b2a8..37c998cc 100644
--- a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs
@@ -10,7 +10,7 @@ use crate::traits::types::method::HasSelectorType;
   context: Chain,
 }]
 #[async_trait]
-pub trait CanCallContract: HasAddressType + HasSelectorType + HasBlobType + HasErrorType {
+pub trait CanCallContract: HasAddressType + HasSelectorType + HasBlobType + HasAsyncErrorType {
     async fn call_contract(
         &self,
         contract_address: &Self::Address,
diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/declare.rs b/relayer/crates/starknet-chain-components/src/traits/contract/declare.rs
index d22d88cd..add5f22f 100644
--- a/relayer/crates/starknet-chain-components/src/traits/contract/declare.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/contract/declare.rs
@@ -9,7 +9,7 @@ use crate::traits::types::contract_class::{HasContractClassHashType, HasContract
 }]
 #[async_trait]
 pub trait CanDeclareContract:
-    HasContractClassType + HasContractClassHashType + HasErrorType
+    HasContractClassType + HasContractClassHashType + HasAsyncErrorType
 {
     async fn declare_contract(
         &self,
diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs b/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs
index 0d131166..883ffa1e 100644
--- a/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs
@@ -11,7 +11,7 @@ use crate::traits::types::contract_class::HasContractClassHashType;
 }]
 #[async_trait]
 pub trait CanDeployContract:
-    HasContractClassHashType + HasBlobType + HasAddressType + HasErrorType
+    HasContractClassHashType + HasBlobType + HasAddressType + HasAsyncErrorType
 {
     async fn deploy_contract(
         &self,
diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs b/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs
index d7c65447..1bcef5a2 100644
--- a/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs
@@ -12,7 +12,7 @@ use crate::traits::types::method::HasSelectorType;
 }]
 #[async_trait]
 pub trait CanInvokeContract:
-    HasAddressType + HasSelectorType + HasBlobType + HasMessageResponseType + HasErrorType
+    HasAddressType + HasSelectorType + HasBlobType + HasMessageResponseType + HasAsyncErrorType
 {
     async fn invoke_contract(
         &self,
diff --git a/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs b/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs
index f0e12cf1..4c4f16f1 100644
--- a/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs
@@ -9,7 +9,7 @@ use hermes_test_components::chain::traits::types::amount::HasAmountType;
   context: Chain,
 }]
 pub trait CanBuildTransferTokenMessage:
-    HasAddressType + HasAmountType + HasMessageType + HasErrorType
+    HasAddressType + HasAmountType + HasMessageType + HasAsyncErrorType
 {
     fn build_transfer_token_message(
         &self,
diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/address.rs
index a2eaa015..dc57a275 100644
--- a/relayer/crates/starknet-chain-components/src/traits/queries/address.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/queries/address.rs
@@ -9,7 +9,7 @@ use hermes_chain_type_components::traits::types::address::HasAddressType;
   context: Chain,
 }]
 #[async_trait]
-pub trait CanQueryContractAddress<Tag: Async>: HasAddressType + HasErrorType {
+pub trait CanQueryContractAddress<Tag: Async>: HasAddressType + HasAsyncErrorType {
     async fn query_contract_address(
         &self,
         tag: PhantomData<Tag>,
diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/token_balance.rs b/relayer/crates/starknet-chain-components/src/traits/queries/token_balance.rs
index c1e6c2f1..e68702b7 100644
--- a/relayer/crates/starknet-chain-components/src/traits/queries/token_balance.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/queries/token_balance.rs
@@ -8,7 +8,7 @@ use hermes_test_components::chain::traits::types::amount::HasAmountType;
   context: Chain,
 }]
 #[async_trait]
-pub trait CanQueryTokenBalance: HasAddressType + HasAmountType + HasErrorType {
+pub trait CanQueryTokenBalance: HasAddressType + HasAmountType + HasAsyncErrorType {
     async fn query_token_balance(
         &self,
         token_address: &Self::Address,
diff --git a/relayer/crates/starknet-chain-components/src/traits/transfer.rs b/relayer/crates/starknet-chain-components/src/traits/transfer.rs
index b2d72af2..59e9f955 100644
--- a/relayer/crates/starknet-chain-components/src/traits/transfer.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/transfer.rs
@@ -8,7 +8,7 @@ use hermes_test_components::chain::traits::types::amount::HasAmountType;
   context: Chain,
 }]
 #[async_trait]
-pub trait CanTransferToken: HasAddressType + HasAmountType + HasErrorType {
+pub trait CanTransferToken: HasAddressType + HasAmountType + HasAsyncErrorType {
     async fn transfer_token(
         &self,
         recipient: &Self::Address,
diff --git a/relayer/crates/starknet-chain-components/src/types/consensus_state.rs b/relayer/crates/starknet-chain-components/src/types/consensus_state.rs
index 25e3a10b..d477355d 100644
--- a/relayer/crates/starknet-chain-components/src/types/consensus_state.rs
+++ b/relayer/crates/starknet-chain-components/src/types/consensus_state.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::HasErrorType;
+use cgp::prelude::HasAsyncErrorType;
 use hermes_encoding_components::traits::convert::Converter;
 use hermes_wasm_encoding_components::impls::strategies::consensus_state::{
     DecodeViaWasmConsensusState, EncodeViaWasmConsensusState,
@@ -16,7 +16,7 @@ pub struct ConvertWasmStarknetConsensusState;
 impl<Encoding> Converter<Encoding, WasmStarknetConsensusState, Any>
     for ConvertWasmStarknetConsensusState
 where
-    Encoding: HasErrorType,
+    Encoding: HasAsyncErrorType,
     EncodeViaWasmConsensusState: Converter<Encoding, StarknetConsensusState, Any>,
 {
     fn convert(
@@ -30,7 +30,7 @@ where
 impl<Encoding> Converter<Encoding, Any, WasmStarknetConsensusState>
     for ConvertWasmStarknetConsensusState
 where
-    Encoding: HasErrorType,
+    Encoding: HasAsyncErrorType,
     DecodeViaWasmConsensusState: Converter<Encoding, Any, StarknetConsensusState>,
 {
     fn convert(
diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/client_state.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/client_state.rs
index 97e15133..c2735958 100644
--- a/relayer/crates/starknet-chain-components/src/types/cosmos/client_state.rs
+++ b/relayer/crates/starknet-chain-components/src/types/cosmos/client_state.rs
@@ -1,7 +1,7 @@
 use core::time::Duration;
 
 use cgp::core::component::UseContext;
-use cgp::core::types::impls::WithType;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom;
 use hermes_chain_components::traits::types::chain_id::HasChainIdType;
@@ -201,7 +201,7 @@ where
 
 impl<Encoding, Strategy> MutDecoder<Encoding, Strategy, ChainId> for EncodeChainId
 where
-    Encoding: CanDecodeMut<Strategy, String> + CanRaiseError<&'static str>,
+    Encoding: CanDecodeMut<Strategy, String> + CanRaiseAsyncError<&'static str>,
 {
     fn decode_mut<'a>(
         encoding: &Encoding,
diff --git a/relayer/crates/starknet-chain-components/src/types/events/channel.rs b/relayer/crates/starknet-chain-components/src/types/events/channel.rs
index 98cc132a..94bc6b25 100644
--- a/relayer/crates/starknet-chain-components/src/types/events/channel.rs
+++ b/relayer/crates/starknet-chain-components/src/types/events/channel.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::{CanRaiseError, *};
+use cgp::prelude::{CanRaiseAsyncError, *};
 use hermes_cairo_encoding_components::strategy::ViaCairo;
 use hermes_cairo_encoding_components::types::as_felt::AsFelt;
 use hermes_encoding_components::traits::decode::{CanDecode, Decoder};
@@ -67,7 +67,7 @@ where
         + CanDecode<Strategy, ChanOpenTryEvent>
         + CanDecode<Strategy, ChanOpenAckEvent>
         + CanDecode<Strategy, ChanOpenConfirmEvent>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
 {
     fn decode(
         encoding: &Encoding,
@@ -96,8 +96,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ch
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![PortId, ChannelId, PortId, ConnectionId, AppVersion]>,
 {
@@ -136,8 +136,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ch
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<
             ViaCairo,
@@ -188,8 +188,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ch
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![PortId, ChannelId, PortId, ChannelId, ConnectionId]>,
 {
@@ -228,8 +228,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ch
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![PortId, ChannelId, PortId, ChannelId, ConnectionId]>,
 {
diff --git a/relayer/crates/starknet-chain-components/src/types/events/connection.rs b/relayer/crates/starknet-chain-components/src/types/events/connection.rs
index ad5f47b3..6647ab65 100644
--- a/relayer/crates/starknet-chain-components/src/types/events/connection.rs
+++ b/relayer/crates/starknet-chain-components/src/types/events/connection.rs
@@ -60,7 +60,7 @@ where
         + CanDecode<Strategy, ConnOpenTryEvent>
         + CanDecode<Strategy, ConnOpenAckEvent>
         + CanDecode<Strategy, ConnOpenConfirmEvent>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
 {
     fn decode(
         encoding: &Encoding,
@@ -89,8 +89,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Co
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![ClientId, ConnectionId, ClientId]>,
 {
@@ -121,8 +121,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Co
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![ClientId, ConnectionId, ClientId, ConnectionId]>,
 {
@@ -159,8 +159,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Co
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![ClientId, ConnectionId, ClientId, ConnectionId]>,
 {
@@ -197,8 +197,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Co
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![ClientId, ConnectionId, ClientId, ConnectionId]>,
 {
diff --git a/relayer/crates/starknet-chain-components/src/types/events/erc20.rs b/relayer/crates/starknet-chain-components/src/types/events/erc20.rs
index 05faea6e..c3c9503b 100644
--- a/relayer/crates/starknet-chain-components/src/types/events/erc20.rs
+++ b/relayer/crates/starknet-chain-components/src/types/events/erc20.rs
@@ -36,7 +36,7 @@ where
     Encoding: HasEncodedType<Encoded = StarknetEvent>
         + CanDecode<Strategy, TransferEvent>
         + CanDecode<Strategy, ApprovalEvent>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
 {
     fn decode(encoding: &Encoding, event: &StarknetEvent) -> Result<Erc20Event, Encoding::Error> {
         let selector = event
@@ -58,7 +58,7 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Tr
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Felt, Felt]>
         + CanDecode<ViaCairo, U256>,
@@ -86,7 +86,7 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ap
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Felt, Felt]>
         + CanDecode<ViaCairo, U256>,
diff --git a/relayer/crates/starknet-chain-components/src/types/events/ics20.rs b/relayer/crates/starknet-chain-components/src/types/events/ics20.rs
index 9fa7d97b..103d55cf 100644
--- a/relayer/crates/starknet-chain-components/src/types/events/ics20.rs
+++ b/relayer/crates/starknet-chain-components/src/types/events/ics20.rs
@@ -85,7 +85,7 @@ where
         + CanDecode<Strategy, AckStatusIbcTransferEvent>
         + CanDecode<Strategy, TimeoutIbcTransferEvent>
         + CanDecode<Strategy, CreateIbcTokenEvent>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
 {
     fn decode(
         encoding: &Encoding,
@@ -118,7 +118,7 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Se
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Participant, Participant, PrefixedDenom]>
         + CanDecode<ViaCairo, Product![U256, String]>,
@@ -152,7 +152,7 @@ impl<EventEncoding, CairoEncoding, Strategy>
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Participant, Participant, PrefixedDenom]>
         + CanDecode<ViaCairo, Product![U256, String, bool]>,
@@ -187,7 +187,7 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ac
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Participant, Participant, PrefixedDenom]>
         + CanDecode<ViaCairo, Product![U256, String, Acknowledgement]>,
@@ -222,8 +222,8 @@ impl<EventEncoding, CairoEncoding, Strategy>
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>> + CanDecode<ViaCairo, Product![AckStatus]>,
 {
     fn decode(
@@ -249,7 +249,7 @@ impl<EventEncoding, CairoEncoding, Strategy>
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Participant, PrefixedDenom]>
         + CanDecode<ViaCairo, Product![U256, String]>,
@@ -282,7 +282,7 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Cr
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>,
+        + CanRaiseAsyncError<CairoEncoding::Error>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![String, String, Felt]>
         + CanDecode<ViaCairo, Product![U256]>,
diff --git a/relayer/crates/starknet-chain-components/src/types/events/packet.rs b/relayer/crates/starknet-chain-components/src/types/events/packet.rs
index 13b1671b..38c559d5 100644
--- a/relayer/crates/starknet-chain-components/src/types/events/packet.rs
+++ b/relayer/crates/starknet-chain-components/src/types/events/packet.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::{CanRaiseError, *};
+use cgp::prelude::{CanRaiseAsyncError, *};
 use hermes_cairo_encoding_components::strategy::ViaCairo;
 use hermes_cairo_encoding_components::types::as_felt::AsFelt;
 use hermes_encoding_components::traits::decode::{CanDecode, Decoder};
@@ -97,7 +97,7 @@ where
         + CanDecode<Strategy, WriteAcknowledgementEvent>
         + CanDecode<Strategy, AcknowledgePacketEvent>
         + CanDecode<Strategy, TimeoutPacketEvent>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
 {
     fn decode(
         encoding: &Encoding,
@@ -130,8 +130,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Se
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<
             ViaCairo,
@@ -189,8 +189,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Re
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<
             ViaCairo,
@@ -248,8 +248,8 @@ impl<EventEncoding, CairoEncoding, Strategy>
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<ViaCairo, Product![Sequence, PortId, ChannelId, PortId, ChannelId]>
         + CanDecode<ViaCairo, Product![Vec<Felt>, Acknowledgement]>,
@@ -291,8 +291,8 @@ impl<EventEncoding, CairoEncoding, Strategy>
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<
             ViaCairo,
@@ -349,8 +349,8 @@ impl<EventEncoding, CairoEncoding, Strategy> Decoder<EventEncoding, Strategy, Ti
 where
     EventEncoding: HasEncodedType<Encoded = StarknetEvent>
         + HasEncoding<AsFelt, Encoding = CairoEncoding>
-        + CanRaiseError<CairoEncoding::Error>
-        + for<'a> CanRaiseError<UnknownEvent<'a>>,
+        + CanRaiseAsyncError<CairoEncoding::Error>
+        + for<'a> CanRaiseAsyncError<UnknownEvent<'a>>,
     CairoEncoding: HasEncodedType<Encoded = Vec<Felt>>
         + CanDecode<
             ViaCairo,
diff --git a/relayer/crates/starknet-chain-components/src/types/messages/erc20/transfer.rs b/relayer/crates/starknet-chain-components/src/types/messages/erc20/transfer.rs
index 4925bee0..c8daa46a 100644
--- a/relayer/crates/starknet-chain-components/src/types/messages/erc20/transfer.rs
+++ b/relayer/crates/starknet-chain-components/src/types/messages/erc20/transfer.rs
@@ -44,7 +44,7 @@ where
         + HasSelectorType<Selector = Felt>
         + HasMessageType<Message = StarknetMessage>
         + HasEncoding<AsFelt, Encoding = Encoding>
-        + CanRaiseError<Encoding::Error>,
+        + CanRaiseAsyncError<Encoding::Error>,
     Encoding: CanEncode<ViaCairo, TransferErc20TokenMessage, Encoded = Vec<Felt>>,
 {
     fn build_transfer_token_message(
diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs
index 10d987d3..0927e91a 100644
--- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs
+++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs
@@ -2,8 +2,8 @@ use std::sync::Arc;
 
 use cgp::core::component::UseDelegate;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::WithField;
-use cgp::core::types::impls::WithType;
+use cgp::core::field::WithField;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cairo_encoding_components::types::as_felt::AsFelt;
 use hermes_chain_type_components::traits::fields::chain_id::HasChainId;
diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs
index c7fa9caf..67d0bdad 100644
--- a/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs
+++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs
@@ -102,7 +102,7 @@ where
 }
 
 pub trait CanUseCairoEncoding:
-    HasErrorType<Error = HermesError>
+    HasAsyncErrorType<Error = HermesError>
     + HasEncodedType<Encoded = Vec<Felt>>
     + HasEncodeBufferType<EncodeBuffer = Vec<Felt>>
     + for<'a> HasDecodeBufferType<DecodeBuffer<'a> = Peekable<Iter<'a, Felt>>>
diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs
index 807d9975..7271e7a0 100644
--- a/relayer/crates/starknet-cli/src/contexts/app.rs
+++ b/relayer/crates/starknet-cli/src/contexts/app.rs
@@ -2,8 +2,8 @@ use std::path::PathBuf;
 
 use cgp::core::component::UseDelegate;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::WithField;
-use cgp::core::types::impls::WithType;
+use cgp::core::field::WithField;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cli_components::impls::commands::bootstrap::chain::RunBootstrapChainCommand;
 use hermes_cli_components::impls::commands::client::update::{
diff --git a/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs b/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs
index e5f2be54..88830699 100644
--- a/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs
+++ b/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs
@@ -22,7 +22,7 @@ impl<App> BootstrapLoader<App, BootstrapStarknetChainArgs> for LoadStarknetBoots
 where
     App: HasBootstrapType<Bootstrap = StarknetBootstrap>
         + HasRuntime<Runtime = HermesRuntime>
-        + HasErrorType,
+        + HasAsyncErrorType,
 {
     async fn load_bootstrap(
         app: &App,
diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs
index 9a5c266c..1d993ac8 100644
--- a/relayer/crates/starknet-cli/src/impls/build.rs
+++ b/relayer/crates/starknet-cli/src/impls/build.rs
@@ -1,4 +1,4 @@
-use cgp::prelude::CanRaiseError;
+use cgp::prelude::CanRaiseAsyncError;
 use hermes_cli_components::traits::build::{BuilderLoader, HasBuilderType};
 use hermes_cli_components::traits::config::load_config::CanLoadConfig;
 use hermes_cli_components::traits::types::config::HasConfigType;
@@ -16,7 +16,7 @@ where
         + HasConfigType<Config = StarknetRelayerConfig>
         + HasRuntime<Runtime = HermesRuntime>
         + CanLoadConfig
-        + CanRaiseError<&'static str>,
+        + CanRaiseAsyncError<&'static str>,
 {
     async fn load_builder(app: &App) -> Result<App::Builder, App::Error> {
         let runtime = app.runtime().clone();
diff --git a/relayer/crates/starknet-cli/src/impls/error.rs b/relayer/crates/starknet-cli/src/impls/error.rs
index e2ee3d49..bf6c99dd 100644
--- a/relayer/crates/starknet-cli/src/impls/error.rs
+++ b/relayer/crates/starknet-cli/src/impls/error.rs
@@ -24,12 +24,12 @@ pub struct CliErrorHandlers;
 
 pub trait CanHandleCliError<Context>: ErrorRaiser<Context, TokioRuntimeError>
 where
-    Context: HasErrorType<Error = Error>,
+    Context: HasAsyncErrorType<Error = Error>,
 {
 }
 
 impl<Context> CanHandleCliError<Context> for ProvideCliError where
-    Context: HasErrorType<Error = Error>
+    Context: HasAsyncErrorType<Error = Error>
 {
 }
 
diff --git a/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs
index 010252e1..e6ecf5bc 100644
--- a/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs
+++ b/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs
@@ -4,8 +4,8 @@ use std::sync::Arc;
 
 use cgp::core::component::UseDelegate;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::WithField;
-use cgp::core::types::impls::WithType;
+use cgp::core::field::WithField;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cosmos_test_components::bootstrap::components::cosmos_sdk::{
     ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent,
diff --git a/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs
index 9a5ce730..b3802ecb 100644
--- a/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs
+++ b/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs
@@ -2,8 +2,8 @@ use std::collections::BTreeMap;
 
 use cgp::core::component::UseDelegate;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::WithField;
-use cgp::core::types::impls::WithType;
+use cgp::core::field::WithField;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_error::impls::ProvideHermesError;
 use hermes_runtime::types::runtime::HermesRuntime;
diff --git a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs
index 679fa7f1..90f82477 100644
--- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs
+++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs
@@ -2,8 +2,8 @@ use std::path::PathBuf;
 
 use cgp::core::component::UseContext;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::WithField;
-use cgp::core::types::impls::WithType;
+use cgp::core::field::WithField;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cosmos_chain_components::types::config::gas::dynamic_gas_config::DynamicGasConfig;
 use hermes_cosmos_integration_tests::impls::bootstrap::build_cosmos_chain::BuildCosmosChainWithNodeConfig;
diff --git a/relayer/crates/starknet-relayer/src/build/components/relay/build.rs b/relayer/crates/starknet-relayer/src/build/components/relay/build.rs
index 2e02cc33..0305dba5 100644
--- a/relayer/crates/starknet-relayer/src/build/components/relay/build.rs
+++ b/relayer/crates/starknet-relayer/src/build/components/relay/build.rs
@@ -2,7 +2,7 @@ use core::marker::PhantomData;
 
 use hermes_error::HermesError;
 use hermes_relayer_components::build::traits::builders::relay_builder::RelayBuilder;
-use hermes_relayer_components::multi::types::index::Index;
+use cgp::core::field::Index;
 use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId;
 use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId};
 
diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs
index b5fe66dc..3698d409 100644
--- a/relayer/crates/starknet-relayer/src/contexts/builder.rs
+++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs
@@ -4,8 +4,8 @@ use core::ops::Deref;
 
 use cgp::core::component::UseDelegate;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::WithField;
-use cgp::core::types::impls::WithType;
+use cgp::core::field::WithField;
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cosmos_relayer::contexts::build::CosmosBuilder;
 use hermes_cosmos_relayer::contexts::chain::CosmosChain;
@@ -17,7 +17,7 @@ use hermes_relayer_components::build::traits::builders::chain_builder::{
 };
 use hermes_relayer_components::multi::traits::chain_at::ChainTypeAtComponent;
 use hermes_relayer_components::multi::traits::relay_at::RelayTypeAtComponent;
-use hermes_relayer_components::multi::types::index::Index;
+use cgp::core::field::Index;
 use hermes_runtime::types::runtime::HermesRuntime;
 use hermes_runtime_components::traits::runtime::{RuntimeGetterComponent, RuntimeTypeComponent};
 use hermes_starknet_chain_components::impls::types::config::StarknetChainConfig;
diff --git a/relayer/crates/starknet-relayer/src/presets/relay.rs b/relayer/crates/starknet-relayer/src/presets/relay.rs
index 4b6e15b5..e4176929 100644
--- a/relayer/crates/starknet-relayer/src/presets/relay.rs
+++ b/relayer/crates/starknet-relayer/src/presets/relay.rs
@@ -1,7 +1,7 @@
 use cgp::core::component::UseDelegate;
 pub use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::impls::use_field::{UseField, WithField};
-use cgp::core::types::impls::WithType;
+use cgp::core::field::{UseField, WithField};
+use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cosmos_relayer::contexts::chain::CosmosChain;
 use hermes_error::impls::ProvideHermesError;
@@ -14,7 +14,7 @@ pub use hermes_relayer_components::multi::traits::chain_at::{
     ChainGetterAtComponent, ChainTypeAtComponent,
 };
 pub use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent;
-use hermes_relayer_components::multi::types::index::Index;
+use cgp::core::field::Index;
 use hermes_relayer_components::relay::impls::packet_lock::PacketMutexGetterComponent;
 use hermes_runtime::types::runtime::HermesRuntime;
 pub use hermes_runtime_components::traits::runtime::{
diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap/bootstrap_chain.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap/bootstrap_chain.rs
index b3f0821f..43911229 100644
--- a/relayer/crates/starknet-test-components/src/impls/bootstrap/bootstrap_chain.rs
+++ b/relayer/crates/starknet-test-components/src/impls/bootstrap/bootstrap_chain.rs
@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::CanBuildChainDriver;
 use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::CanStartChainFullNode;
 use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::HasChainStoreDir;
@@ -32,7 +32,7 @@ where
         + CanBuildChainDriver
         + CanStartChainFullNode
         + HasChainStoreDir
-        + CanRaiseError<Runtime::Error>,
+        + CanRaiseAsyncError<Runtime::Error>,
     Runtime: HasChildProcessType
         + CanReserveTcpPort
         + HasFilePathType
diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap/start_chain.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap/start_chain.rs
index ff2d8532..17462107 100644
--- a/relayer/crates/starknet-test-components/src/impls/bootstrap/start_chain.rs
+++ b/relayer/crates/starknet-test-components/src/impls/bootstrap/start_chain.rs
@@ -1,4 +1,4 @@
-use cgp::core::error::CanRaiseError;
+use cgp::core::error::CanRaiseAsyncError;
 use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::ChainFullNodeStarter;
 use hermes_cosmos_test_components::bootstrap::traits::fields::chain_command_path::HasChainCommandPath;
 use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType;
@@ -18,7 +18,7 @@ where
         + HasChainNodeConfigType<ChainNodeConfig = StarknetNodeConfig>
         + HasChainGenesisConfigType<ChainGenesisConfig = StarknetGenesisConfig>
         + HasChainCommandPath
-        + CanRaiseError<Runtime::Error>,
+        + CanRaiseAsyncError<Runtime::Error>,
     Runtime: CanStartChildProcess + HasFilePathType,
 {
     async fn start_chain_full_node(

From 0d2be2bf36a67f22c10d72c37261e7f50a5c23c0 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 16:53:18 +0000
Subject: [PATCH 02/11] Update crate dependencies

---
 light-client/Cargo.lock |  62 +++---
 relayer/Cargo.lock      | 408 ++++++++++++++++++++++++----------------
 2 files changed, 275 insertions(+), 195 deletions(-)

diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock
index 5a50f061..3f42e78d 100644
--- a/light-client/Cargo.lock
+++ b/light-client/Cargo.lock
@@ -22,9 +22,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anyhow"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "ark-bls12-381"
@@ -243,9 +243,9 @@ checksum = "3e31ea183f6ee62ac8b8a8cf7feddd766317adfb13ff469de57ce033efd6a790"
 
 [[package]]
 name = "borsh"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
+checksum = "9fb65153674e51d3a42c8f27b05b9508cea85edfaade8aa46bc8fc18cecdfef3"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -253,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
+checksum = "a396e17ad94059c650db3d253bb6e25927f1eb462eede7e7a153bb6e75dce0a7"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -281,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.4"
+version = "1.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
 dependencies = [
  "shlex",
 ]
@@ -1664,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
@@ -1709,9 +1709,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "memchr"
@@ -1785,9 +1785,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1861,9 +1861,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -1885,7 +1885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "syn 2.0.96",
@@ -2059,9 +2059,9 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2086,9 +2086,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2108,9 +2108,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
  "itoa",
  "memchr",
@@ -2240,9 +2240,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d513ce7f9e41c67ab2dd3d554ef65f36fbcc61745af1e1f93eafdeefa1ce37"
+checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2"
 dependencies = [
  "bytes",
  "digest 0.10.7",
@@ -2268,9 +2268,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-light-client-verifier"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7affc5fffe9df158185e15bce3e47fc3a0c901e6708f3b7d33f0867d7aef8ce1"
+checksum = "f0cda4a449fc70985a95f892a67286f13afa4e048d90b8d04a2bf6341e88d1c2"
 dependencies = [
  "derive_more 0.99.18",
  "flex-error",
@@ -2281,9 +2281,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-proto"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c81ba1b023ec00763c3bc4f4376c67c0047f185cccf95c416c7a2f16272c4cbb"
+checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb"
 dependencies = [
  "borsh",
  "bytes",
@@ -2407,9 +2407,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
 dependencies = [
  "memchr",
 ]
diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock
index cf405eb2..be514e82 100644
--- a/relayer/Cargo.lock
+++ b/relayer/Cargo.lock
@@ -117,19 +117,20 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
+ "once_cell",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arrayref"
@@ -193,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -227,9 +228,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "auto_impl"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
+checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -399,9 +400,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bitvec"
@@ -457,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
+checksum = "9fb65153674e51d3a42c8f27b05b9508cea85edfaade8aa46bc8fc18cecdfef3"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -467,9 +468,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
+checksum = "a396e17ad94059c650db3d253bb6e25927f1eb462eede7e7a153bb6e75dce0a7"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -659,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.4"
+version = "1.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
 dependencies = [
  "shlex",
 ]
@@ -904,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.23"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -914,9 +915,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.23"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
 dependencies = [
  "anstream",
  "anstyle",
@@ -926,9 +927,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1179,9 +1180,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
 
 [[package]]
 name = "der"
@@ -1454,9 +1455,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1524,7 +1525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.1",
+ "miniz_oxide 0.8.3",
 ]
 
 [[package]]
@@ -1543,6 +1544,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1660,6 +1667,19 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "generator"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1692,9 +1712,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "good_lp"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97630e1e456d7081c524488a87d8f8f7ed0fd3100ba10c55e3cfa7add5ce05c6"
+checksum = "10efcd6c7d6f84cb5b4f9155248e0675deab9cfb92d0edbcb25cb81490b65ae7"
 dependencies = [
  "fnv",
  "microlp",
@@ -1934,7 +1954,7 @@ dependencies = [
  "num-rational",
  "prost",
  "prost-types",
- "reqwest 0.12.9",
+ "reqwest 0.12.12",
  "ripemd",
  "secp256k1",
  "serde",
@@ -2036,7 +2056,7 @@ dependencies = [
  "opentelemetry",
  "prost",
  "prost-types",
- "reqwest 0.12.9",
+ "reqwest 0.12.12",
  "secp256k1",
  "serde",
  "serde_derive",
@@ -2658,15 +2678,15 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http 1.2.0",
  "hyper 1.5.2",
  "hyper-util",
- "rustls 0.23.20",
+ "rustls 0.23.21",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.1",
@@ -2732,7 +2752,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -3591,9 +3611,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -3681,9 +3701,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libredox"
@@ -3691,15 +3711,15 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "libc",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "litemap"
@@ -3719,9 +3739,22 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
 
 [[package]]
 name = "matchers"
@@ -3756,9 +3789,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "microlp"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e0c5664f9959f1c3970d523a22f0319024282cb754358c2afc7e1d45280ae3"
+checksum = "54df3293c9060b47f9953c8785e5c96e3d3c29e48afaf215f3f335ffc7007304"
 dependencies = [
  "log",
  "sprs",
@@ -3781,9 +3814,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef2593ffb6958c941575cee70c8e257438749971869c4ae5acf6f91a168a61"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
  "adler2",
 ]
@@ -3801,26 +3834,24 @@ dependencies = [
 
 [[package]]
 name = "moka"
-version = "0.12.7"
+version = "0.12.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e0d88686dc561d743b40de8269b26eaf0dc58781bde087b0984646602021d08"
+checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926"
 dependencies = [
  "async-lock",
- "async-trait",
  "crossbeam-channel",
  "crossbeam-epoch",
  "crossbeam-utils",
  "event-listener",
  "futures-util",
- "once_cell",
+ "loom",
  "parking_lot",
- "quanta",
+ "portable-atomic",
  "rustc_version",
  "smallvec",
  "tagptr",
  "thiserror",
- "triomphe",
- "uuid 1.11.0",
+ "uuid 1.12.0",
 ]
 
 [[package]]
@@ -3969,7 +4000,7 @@ version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -4164,18 +4195,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4184,9 +4215,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -4300,9 +4331,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -4339,21 +4370,6 @@ dependencies = [
  "prost",
 ]
 
-[[package]]
-name = "quanta"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773ce68d0bb9bc7ef20be3536ffe94e223e1f365bd374108b2659fac0c65cfe6"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -4399,15 +4415,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "11.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
-dependencies = [
- "bitflags 2.6.0",
-]
-
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -4420,7 +4427,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
@@ -4522,9 +4529,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4536,7 +4543,7 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.5.2",
- "hyper-rustls 0.27.3",
+ "hyper-rustls 0.27.5",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -4555,6 +4562,7 @@ dependencies = [
  "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
+ "tower 0.5.2",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -4665,11 +4673,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4704,9 +4712,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.20"
+version = "0.23.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8"
 dependencies = [
  "log",
  "once_cell",
@@ -4751,7 +4759,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.0.1",
+ "security-framework 3.2.0",
 ]
 
 [[package]]
@@ -4801,9 +4809,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "ryu"
@@ -4887,6 +4895,12 @@ dependencies = [
  "syn 2.0.96",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -4955,7 +4969,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -4964,11 +4978,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.0.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
@@ -4977,9 +4991,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4993,9 +5007,9 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -5030,9 +5044,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5052,9 +5066,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
  "itoa",
  "memchr",
@@ -5123,9 +5137,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -5133,7 +5147,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with_macros 3.11.0",
+ "serde_with_macros 3.12.0",
  "time",
 ]
 
@@ -5151,9 +5165,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -5391,28 +5405,43 @@ dependencies = [
 
 [[package]]
 name = "starknet-core"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538240cbe6663c673fe77465f294da707080f39678dd7066761554899e46100"
+checksum = "37abf0af45a3b866dd108880ace9949ae7830f6830adb8963024302ae9e82c24"
 dependencies = [
  "base64 0.21.7",
  "crypto-bigint",
  "flate2",
+ "foldhash",
  "hex",
+ "indexmap 2.7.0",
+ "num-traits",
  "serde",
  "serde_json",
  "serde_json_pythonic",
- "serde_with 3.11.0",
+ "serde_with 3.12.0",
  "sha3",
+ "starknet-core-derive",
  "starknet-crypto",
  "starknet-types-core",
 ]
 
+[[package]]
+name = "starknet-core-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b08520b7d80eda7bf1a223e8db4f9bb5779a12846f15ebf8f8d76667eca7f5ad"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "starknet-crypto"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded22ccf4cb9e572ce3f77de6066af53560cd2520d508876c83bb1e6b29d5cbc"
+checksum = "039a3bad70806b494c9e6b21c5238a6c8a373d66a26071859deb0ccca6f93634"
 dependencies = [
  "crypto-bigint",
  "hex",
@@ -5442,7 +5471,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8986a940af916fc0a034f4e42c6ba76d94f1e97216d75447693dfd7aefaf3ef2"
 dependencies = [
- "starknet-core 0.12.0",
+ "starknet-core 0.12.1",
  "syn 2.0.96",
 ]
 
@@ -5610,7 +5639,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
@@ -5649,12 +5678,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -5662,9 +5692,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d513ce7f9e41c67ab2dd3d554ef65f36fbcc61745af1e1f93eafdeefa1ce37"
+checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2"
 dependencies = [
  "bytes",
  "digest 0.10.7",
@@ -5692,9 +5722,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-config"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de4e66e78c6bfb768993e69c4fc5333dbc863f6d54ebd7a5d08d91556768087"
+checksum = "89cc3ea9a39b7ee34eefcff771cc067ecaa0c988c1c5ac08defd878471a06f76"
 dependencies = [
  "flex-error",
  "serde",
@@ -5706,9 +5736,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-light-client"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e88c08a112db05101396a79f71c017d7dbf548dc21614f82251f17ecbe5d5e8"
+checksum = "a803ff14b11827772f696ba3a1873a5f24598121872c924a764011fc58fc22a0"
 dependencies = [
  "contracts",
  "crossbeam-channel",
@@ -5731,9 +5761,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-light-client-verifier"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7affc5fffe9df158185e15bce3e47fc3a0c901e6708f3b7d33f0867d7aef8ce1"
+checksum = "f0cda4a449fc70985a95f892a67286f13afa4e048d90b8d04a2bf6341e88d1c2"
 dependencies = [
  "derive_more 0.99.18",
  "flex-error",
@@ -5744,9 +5774,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-proto"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c81ba1b023ec00763c3bc4f4376c67c0047f185cccf95c416c7a2f16272c4cbb"
+checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb"
 dependencies = [
  "borsh",
  "bytes",
@@ -5763,9 +5793,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-rpc"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3ec9d6a266cb079a44272189b5a033227d058ab28659722557c1f7fed6b83c"
+checksum = "835a52aa504c63ec05519e31348d3f4ba2fe79493c588e2cad5323d5e81b161a"
 dependencies = [
  "async-trait",
  "async-tungstenite",
@@ -5791,7 +5821,7 @@ dependencies = [
  "tokio",
  "tracing",
  "url",
- "uuid 1.11.0",
+ "uuid 1.12.0",
  "walkdir",
 ]
 
@@ -5907,9 +5937,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -5922,9 +5952,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5940,9 +5970,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5986,7 +6016,7 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls 0.23.20",
+ "rustls 0.23.21",
  "tokio",
 ]
 
@@ -6111,6 +6141,7 @@ dependencies = [
  "futures-util",
  "pin-project-lite",
  "sync_wrapper 1.0.2",
+ "tokio",
  "tower-layer",
  "tower-service",
 ]
@@ -6335,9 +6366,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
 dependencies = [
  "getrandom",
 ]
@@ -6387,20 +6418,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
@@ -6412,9 +6444,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6425,9 +6457,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6435,9 +6467,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6448,15 +6480,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6499,6 +6534,16 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -6508,6 +6553,41 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -6688,9 +6768,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
 dependencies = [
  "memchr",
 ]

From 8933e3b5fa8788639a3e70205d84f895b90ff6d6 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 16:57:22 +0000
Subject: [PATCH 03/11] Fix Nix build

---
 nix/ibc-starknet-cw.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/ibc-starknet-cw.nix b/nix/ibc-starknet-cw.nix
index 84dcc29c..f49ae323 100644
--- a/nix/ibc-starknet-cw.nix
+++ b/nix/ibc-starknet-cw.nix
@@ -10,7 +10,7 @@ let
     cargoLock = {
       lockFile = ./../light-client/Cargo.lock;
       outputHashes = {
-        "hermes-cosmos-encoding-components-0.1.0" = "sha256-Lkk0bxna5bhXuOifLgMqNHaJO65bFg7oMoLBTIOVhYE=";
+        "hermes-cosmos-encoding-components-0.1.0" = "sha256-V1TlMnVHBwlSBJmB9gSJV/BgUTy7S0yhrtn3anZyorU=";
       };
     };
 

From 617a0eb1649940cba5beac9e99922fcd6c72f6ae Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 16:57:50 +0000
Subject: [PATCH 04/11] Fix formatting

---
 .../starknet-chain-components/src/traits/contract/call.rs     | 4 +++-
 .../starknet-relayer/src/build/components/relay/build.rs      | 2 +-
 relayer/crates/starknet-relayer/src/contexts/builder.rs       | 3 +--
 relayer/crates/starknet-relayer/src/presets/relay.rs          | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs
index 37c998cc..39e46567 100644
--- a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs
+++ b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs
@@ -10,7 +10,9 @@ use crate::traits::types::method::HasSelectorType;
   context: Chain,
 }]
 #[async_trait]
-pub trait CanCallContract: HasAddressType + HasSelectorType + HasBlobType + HasAsyncErrorType {
+pub trait CanCallContract:
+    HasAddressType + HasSelectorType + HasBlobType + HasAsyncErrorType
+{
     async fn call_contract(
         &self,
         contract_address: &Self::Address,
diff --git a/relayer/crates/starknet-relayer/src/build/components/relay/build.rs b/relayer/crates/starknet-relayer/src/build/components/relay/build.rs
index 0305dba5..e9dbbbc3 100644
--- a/relayer/crates/starknet-relayer/src/build/components/relay/build.rs
+++ b/relayer/crates/starknet-relayer/src/build/components/relay/build.rs
@@ -1,8 +1,8 @@
 use core::marker::PhantomData;
 
+use cgp::core::field::Index;
 use hermes_error::HermesError;
 use hermes_relayer_components::build::traits::builders::relay_builder::RelayBuilder;
-use cgp::core::field::Index;
 use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId;
 use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId};
 
diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs
index 3698d409..61a81fbc 100644
--- a/relayer/crates/starknet-relayer/src/contexts/builder.rs
+++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs
@@ -4,7 +4,7 @@ use core::ops::Deref;
 
 use cgp::core::component::UseDelegate;
 use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::WithField;
+use cgp::core::field::{Index, WithField};
 use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cosmos_relayer::contexts::build::CosmosBuilder;
@@ -17,7 +17,6 @@ use hermes_relayer_components::build::traits::builders::chain_builder::{
 };
 use hermes_relayer_components::multi::traits::chain_at::ChainTypeAtComponent;
 use hermes_relayer_components::multi::traits::relay_at::RelayTypeAtComponent;
-use cgp::core::field::Index;
 use hermes_runtime::types::runtime::HermesRuntime;
 use hermes_runtime_components::traits::runtime::{RuntimeGetterComponent, RuntimeTypeComponent};
 use hermes_starknet_chain_components::impls::types::config::StarknetChainConfig;
diff --git a/relayer/crates/starknet-relayer/src/presets/relay.rs b/relayer/crates/starknet-relayer/src/presets/relay.rs
index e4176929..bdae79ad 100644
--- a/relayer/crates/starknet-relayer/src/presets/relay.rs
+++ b/relayer/crates/starknet-relayer/src/presets/relay.rs
@@ -1,6 +1,6 @@
 use cgp::core::component::UseDelegate;
 pub use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
-use cgp::core::field::{UseField, WithField};
+use cgp::core::field::{Index, UseField, WithField};
 use cgp::core::types::WithType;
 use cgp::prelude::*;
 use hermes_cosmos_relayer::contexts::chain::CosmosChain;
@@ -14,7 +14,6 @@ pub use hermes_relayer_components::multi::traits::chain_at::{
     ChainGetterAtComponent, ChainTypeAtComponent,
 };
 pub use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent;
-use cgp::core::field::Index;
 use hermes_relayer_components::relay::impls::packet_lock::PacketMutexGetterComponent;
 use hermes_runtime::types::runtime::HermesRuntime;
 pub use hermes_runtime_components::traits::runtime::{

From 01a5dd3d75f5154a131866c9c95f301dc90f7311 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 17:14:41 +0000
Subject: [PATCH 05/11] Update Rust version in Nix

---
 .github/workflows/hermes.yaml |  5 ++++-
 flake.lock                    | 18 +++++++++---------
 rust-toolchain-stable.toml    |  2 +-
 rust-toolchain-wasm.toml      |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/hermes.yaml b/.github/workflows/hermes.yaml
index d2f99cc7..d34e6d96 100644
--- a/.github/workflows/hermes.yaml
+++ b/.github/workflows/hermes.yaml
@@ -39,7 +39,10 @@ jobs:
             scarb build -p starknet_ibc_contracts
 
       - name: Build Starknet Wasm light client
-        run: nix build .#ibc-starknet-cw
+        working-directory: ./light-client
+        run: |
+          nix shell ..#rust-wasm -c \
+            cargo build --release -p ibc-client-starknet-cw --target wasm32-unknown-unknown
 
       - name: Run Integration Tests
         env:
diff --git a/flake.lock b/flake.lock
index 8e3af8ac..42af3571 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1555,11 +1555,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1733097829,
-        "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=",
+        "lastModified": 1736943799,
+        "narHash": "sha256-BYsp8PA1j691FupfrLVOQzm4CaYaKtkh4U+KuGMnBWw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a",
+        "rev": "ae2fb9f1fb5fcf17fb59f25c2a881c170c501d6f",
         "type": "github"
       },
       "original": {
@@ -1571,11 +1571,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "lastModified": 1736320768,
+        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
         "type": "github"
       },
       "original": {
@@ -1735,11 +1735,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1733279627,
-        "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=",
+        "lastModified": 1736994333,
+        "narHash": "sha256-v4Jrok5yXsZ6dwj2+2uo5cSyUi9fBTurHqHvNHLT1XA=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96",
+        "rev": "848db855cb9e88785996e961951659570fc58814",
         "type": "github"
       },
       "original": {
diff --git a/rust-toolchain-stable.toml b/rust-toolchain-stable.toml
index 6cc20eae..88d2c653 100644
--- a/rust-toolchain-stable.toml
+++ b/rust-toolchain-stable.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.83.0"
+channel = "1.84"
 profile = "default"
diff --git a/rust-toolchain-wasm.toml b/rust-toolchain-wasm.toml
index 91945493..5f7a8f90 100644
--- a/rust-toolchain-wasm.toml
+++ b/rust-toolchain-wasm.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.81"
+channel = "1.84"
 profile = "default"
 targets = ["wasm32-unknown-unknown"]
\ No newline at end of file

From d0549edca4e5af322c5184641906571d83ba9b3d Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 17:27:38 +0000
Subject: [PATCH 06/11] Fix Nix fmt

---
 flake.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index d16924a0..b4d7064b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,17 +125,20 @@
           shell-deps = (builtins.attrValues starknet-pkgs) ++ (builtins.attrValues tools) ++ mac-deps;
         in
         {
-          packages = {
-            inherit
-              starknet-devnet
-              cairo
-              scarb
-              rust
-              rust-nightly
-              rust-wasm
-              ibc-starknet-cw
-              ;
-          } // tools // starknet-pkgs;
+          packages =
+            {
+              inherit
+                starknet-devnet
+                cairo
+                scarb
+                rust
+                rust-nightly
+                rust-wasm
+                ibc-starknet-cw
+                ;
+            }
+            // tools
+            // starknet-pkgs;
 
           devShells = {
             default = nixpkgs.mkShell { buildInputs = shell-deps; };

From 70035b6a50a22982b0e6aa6b2e8f9b1e40e3762f Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 18:09:50 +0000
Subject: [PATCH 07/11] Use back main branch

---
 light-client/Cargo.lock |  6 ++---
 light-client/Cargo.toml |  6 ++---
 relayer/Cargo.lock      | 58 ++++++++++++++++++++---------------------
 relayer/Cargo.toml      | 58 ++++++++++++++++++++---------------------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock
index 3f42e78d..889266ea 100644
--- a/light-client/Cargo.lock
+++ b/light-client/Cargo.lock
@@ -1062,7 +1062,7 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 [[package]]
 name = "hermes-cosmos-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -1076,7 +1076,7 @@ dependencies = [
 [[package]]
 name = "hermes-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
 ]
@@ -1084,7 +1084,7 @@ dependencies = [
 [[package]]
 name = "hermes-protobuf-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
index 1a7956a8..24af0adc 100644
--- a/light-client/Cargo.toml
+++ b/light-client/Cargo.toml
@@ -77,6 +77,6 @@ ibc-client-starknet-types = { path = "./ibc-client-starknet-types" }
 # cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
 # cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
 
-hermes-encoding-components          = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-encoding-components   = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-encoding-components          = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-encoding-components   = { git = "https://github.com/informalsystems/hermes-sdk.git" }
diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock
index be514e82..7ab1b93a 100644
--- a/relayer/Cargo.lock
+++ b/relayer/Cargo.lock
@@ -1822,7 +1822,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "hermes-any-counterparty"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-cosmos-chain-components",
@@ -1839,7 +1839,7 @@ dependencies = [
 [[package]]
 name = "hermes-async-runtime-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "async-trait",
  "cgp",
@@ -1862,7 +1862,7 @@ dependencies = [
 [[package]]
 name = "hermes-chain-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -1873,7 +1873,7 @@ dependencies = [
 [[package]]
 name = "hermes-chain-type-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
 ]
@@ -1881,7 +1881,7 @@ dependencies = [
 [[package]]
 name = "hermes-cli-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "clap",
@@ -1899,7 +1899,7 @@ dependencies = [
 [[package]]
 name = "hermes-comet-light-client-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -1908,7 +1908,7 @@ dependencies = [
 [[package]]
 name = "hermes-comet-light-client-context"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "eyre",
@@ -1924,7 +1924,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-chain-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "bech32 0.9.1",
  "bitcoin",
@@ -1977,7 +1977,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -1991,7 +1991,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-integration-tests"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "eyre",
@@ -2024,7 +2024,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-relayer"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "dirs-next",
@@ -2073,7 +2073,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-test-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hdpath",
@@ -2100,7 +2100,7 @@ dependencies = [
 [[package]]
 name = "hermes-cosmos-wasm-relayer"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "eyre",
@@ -2149,7 +2149,7 @@ dependencies = [
 [[package]]
 name = "hermes-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
 ]
@@ -2157,7 +2157,7 @@ dependencies = [
 [[package]]
 name = "hermes-error"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "eyre",
@@ -2167,7 +2167,7 @@ dependencies = [
 [[package]]
 name = "hermes-ibc-test-suite"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-logging-components",
@@ -2178,7 +2178,7 @@ dependencies = [
 [[package]]
 name = "hermes-logger"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-logging-components",
@@ -2190,7 +2190,7 @@ dependencies = [
 [[package]]
 name = "hermes-logging-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
 ]
@@ -2198,7 +2198,7 @@ dependencies = [
 [[package]]
 name = "hermes-protobuf-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-encoding-components",
@@ -2209,7 +2209,7 @@ dependencies = [
 [[package]]
 name = "hermes-relayer-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-chain-components",
@@ -2222,7 +2222,7 @@ dependencies = [
 [[package]]
 name = "hermes-relayer-components-extra"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -2234,7 +2234,7 @@ dependencies = [
 [[package]]
 name = "hermes-runtime"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-async-runtime-components",
@@ -2246,7 +2246,7 @@ dependencies = [
 [[package]]
 name = "hermes-runtime-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
 ]
@@ -2429,7 +2429,7 @@ dependencies = [
 [[package]]
 name = "hermes-test-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
@@ -2441,7 +2441,7 @@ dependencies = [
 [[package]]
 name = "hermes-tokio-runtime-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "futures",
@@ -2455,7 +2455,7 @@ dependencies = [
 [[package]]
 name = "hermes-tracing-logging-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-logging-components",
@@ -2467,7 +2467,7 @@ dependencies = [
 [[package]]
 name = "hermes-wasm-client-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-cosmos-chain-components",
@@ -2486,7 +2486,7 @@ dependencies = [
 [[package]]
 name = "hermes-wasm-encoding-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-cosmos-encoding-components",
@@ -2500,7 +2500,7 @@ dependencies = [
 [[package]]
 name = "hermes-wasm-test-components"
 version = "0.1.0"
-source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/v0.3.1#95177e262bf55a3e912f8af8b278b7a890640b4b"
+source = "git+https://github.com/informalsystems/hermes-sdk.git#4414c1237b35c171c4232ff84dfd844e5b458f45"
 dependencies = [
  "cgp",
  "hermes-chain-type-components",
diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
index 8e1b5fe5..97aba73e 100644
--- a/relayer/Cargo.toml
+++ b/relayer/Cargo.toml
@@ -134,32 +134,32 @@ poseidon = { path = "./crates/poseidon" }
 # cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
 # cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
 
-hermes-chain-components              = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-chain-type-components         = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-relayer-components            = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-relayer-components-extra      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-runtime-components            = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-async-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-tokio-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-runtime                       = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-error                         = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-encoding-components           = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-protobuf-encoding-components  = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-logging-components            = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-tracing-logging-components    = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-logger                        = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-test-components               = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-ibc-test-suite                = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-any-counterparty              = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-chain-components       = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-relayer                = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-wasm-relayer           = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-test-components        = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-encoding-components    = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cosmos-integration-tests      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-comet-light-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-comet-light-client-context    = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-wasm-test-components          = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-wasm-client-components        = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-wasm-encoding-components      = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
-hermes-cli-components                = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/v0.3.1" }
+hermes-chain-components              = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-chain-type-components         = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-relayer-components            = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-relayer-components-extra      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-runtime-components            = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-async-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-tokio-runtime-components      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-runtime                       = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-error                         = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-encoding-components           = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-protobuf-encoding-components  = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-logging-components            = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-tracing-logging-components    = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-logger                        = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-test-components               = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-ibc-test-suite                = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-any-counterparty              = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-chain-components       = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-relayer                = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-wasm-relayer           = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-test-components        = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-encoding-components    = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cosmos-integration-tests      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-comet-light-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-comet-light-client-context    = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-wasm-test-components          = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-wasm-client-components        = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-wasm-encoding-components      = { git = "https://github.com/informalsystems/hermes-sdk.git" }
+hermes-cli-components                = { git = "https://github.com/informalsystems/hermes-sdk.git" }

From 33498f871bf7c43a0efc2e8366462159b0e4f743 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 18:53:13 +0000
Subject: [PATCH 08/11] Use Nix to build Wasm contract again

---
 .github/workflows/hermes.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/hermes.yaml b/.github/workflows/hermes.yaml
index d34e6d96..d2f99cc7 100644
--- a/.github/workflows/hermes.yaml
+++ b/.github/workflows/hermes.yaml
@@ -39,10 +39,7 @@ jobs:
             scarb build -p starknet_ibc_contracts
 
       - name: Build Starknet Wasm light client
-        working-directory: ./light-client
-        run: |
-          nix shell ..#rust-wasm -c \
-            cargo build --release -p ibc-client-starknet-cw --target wasm32-unknown-unknown
+        run: nix build .#ibc-starknet-cw
 
       - name: Run Integration Tests
         env:

From f6742ba5eb05ae9daf74c0dca9ed126973091b19 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 19:57:12 +0000
Subject: [PATCH 09/11] Use back Rust v1.81 on Wasm client

---
 light-client/Cargo.lock                       | 45 +++++++------------
 light-client/Cargo.toml                       | 30 ++++++-------
 .../ibc-client-starknet-cw/Cargo.toml         |  2 +-
 rust-toolchain-wasm.toml                      |  2 +-
 4 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock
index 889266ea..1abf8e30 100644
--- a/light-client/Cargo.lock
+++ b/light-client/Cargo.lock
@@ -303,8 +303,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "cgp"
 version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea80431b9e73ebb8b04657c3890f80b40b987f505f91a65659614d397ec89c5"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-async",
  "cgp-core",
@@ -314,8 +313,7 @@ dependencies = [
 [[package]]
 name = "cgp-async"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cca3a368634ced2b77f1e00e7ebb0872402a1d8fd6dbf05880329b0a001b37e"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-async-macro",
  "cgp-sync",
@@ -324,8 +322,7 @@ dependencies = [
 [[package]]
 name = "cgp-async-macro"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1656912abbbf7ff2fe11c9680ae5883afe79cac6f2f51bd486d04a3fbba9426"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -335,14 +332,12 @@ dependencies = [
 [[package]]
 name = "cgp-component"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12793289566a983f8a3151448cb8820bcc4704c34a0a9cf19bb1ed48e0844e81"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 
 [[package]]
 name = "cgp-component-macro"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37331b62cbb29d159d2c3bc3c21bdc885576d9c024d0e9ea4cb3e7513138897"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-component-macro-lib",
  "syn 2.0.96",
@@ -351,8 +346,7 @@ dependencies = [
 [[package]]
 name = "cgp-component-macro-lib"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29461124d295bf42c48106e81cb0f89a4eb64132752b916d5ec5df9875d03d58"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "itertools 0.14.0",
  "prettyplease",
@@ -364,8 +358,7 @@ dependencies = [
 [[package]]
 name = "cgp-core"
 version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc9ec022a14d652748da1cfb4a880a9046fe9b0fddbe20faf4955e3237dd51a"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-async",
  "cgp-component",
@@ -379,8 +372,7 @@ dependencies = [
 [[package]]
 name = "cgp-error"
 version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed10c471f0af57e4f5a196e21af4f95c7ba3fb6d990d623eb3f47a0f75b4d385"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-async",
  "cgp-component",
@@ -400,8 +392,7 @@ dependencies = [
 [[package]]
 name = "cgp-extra"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04a67b3e5c5fd4420c0fd16c1e93a9e28a7e10f9aa911b66d7a2b9588fbb11c4"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-error-extra",
  "cgp-inner",
@@ -412,8 +403,7 @@ dependencies = [
 [[package]]
 name = "cgp-field"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193dec7508c4b4efd6a1ef5eac6789eb0a297561e55dcb8cd377a904f055a176"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-component",
  "cgp-type",
@@ -422,8 +412,7 @@ dependencies = [
 [[package]]
 name = "cgp-field-macro"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7853451aedcc73c0edf67d44ca9652a7b1ba8a18ac0499f4fced1ac845b7711"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-field-macro-lib",
  "proc-macro2",
@@ -432,8 +421,7 @@ dependencies = [
 [[package]]
 name = "cgp-field-macro-lib"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "785d154b6d17929919e3bee306c515c7d78e420303605829e48116fcef2ccf9e"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "prettyplease",
  "proc-macro2",
@@ -444,8 +432,7 @@ dependencies = [
 [[package]]
 name = "cgp-inner"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4e35f1ad7bfb5df01c9f263d054ba53ff87c3d1da20cb5c0872191df904583"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-component",
  "cgp-component-macro",
@@ -454,8 +441,7 @@ dependencies = [
 [[package]]
 name = "cgp-run"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec7009079ecfd0a5db07a5dda0e7cece70b1774ead842a42919a93b4662eb96"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-async",
  "cgp-component",
@@ -484,8 +470,7 @@ dependencies = [
 [[package]]
 name = "cgp-type"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a4638c888a38fbb1c88406c224c38d7b9e230a306e7b07f796280b89f5baa54"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-component",
  "cgp-component-macro",
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
index 24af0adc..a156d11f 100644
--- a/light-client/Cargo.toml
+++ b/light-client/Cargo.toml
@@ -61,21 +61,21 @@ ibc-client-starknet       = { path = "./ibc-client-starknet" }
 ibc-client-starknet-cw    = { path = "./ibc-client-starknet-cw" }
 ibc-client-starknet-types = { path = "./ibc-client-starknet-types" }
 
-# cgp                     = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-core                = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-extra               = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-async               = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-async-macro         = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-component           = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-component-macro     = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-component-macro-lib = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-type                = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-field               = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-field-macro         = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-field-macro-lib     = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-error               = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
-# cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp                     = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-core                = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-extra               = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-async               = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-async-macro         = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-component           = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-component-macro     = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-component-macro-lib = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-type                = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-field               = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-field-macro         = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-field-macro-lib     = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-error               = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
 
 hermes-encoding-components          = { git = "https://github.com/informalsystems/hermes-sdk.git" }
 hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
diff --git a/light-client/ibc-client-starknet-cw/Cargo.toml b/light-client/ibc-client-starknet-cw/Cargo.toml
index 067d02b2..7c56ba8d 100644
--- a/light-client/ibc-client-starknet-cw/Cargo.toml
+++ b/light-client/ibc-client-starknet-cw/Cargo.toml
@@ -20,7 +20,7 @@ ibc-client-cw       = { workspace = true }
 ibc-client-starknet = { workspace = true }
 
 # cosmwasm dependencies
-cosmwasm-std = "2.1.0"
+cosmwasm-std = "2.2.0"
 
 [features]
 default = [ "std" ]
diff --git a/rust-toolchain-wasm.toml b/rust-toolchain-wasm.toml
index 5f7a8f90..91945493 100644
--- a/rust-toolchain-wasm.toml
+++ b/rust-toolchain-wasm.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.84"
+channel = "1.81"
 profile = "default"
 targets = ["wasm32-unknown-unknown"]
\ No newline at end of file

From d932f6ade7750219d9ba6bd6868640666b2bc3e5 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 21:08:28 +0000
Subject: [PATCH 10/11] Fix missing hash

---
 nix/ibc-starknet-cw.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nix/ibc-starknet-cw.nix b/nix/ibc-starknet-cw.nix
index f49ae323..4a611fbd 100644
--- a/nix/ibc-starknet-cw.nix
+++ b/nix/ibc-starknet-cw.nix
@@ -11,6 +11,7 @@ let
       lockFile = ./../light-client/Cargo.lock;
       outputHashes = {
         "hermes-cosmos-encoding-components-0.1.0" = "sha256-V1TlMnVHBwlSBJmB9gSJV/BgUTy7S0yhrtn3anZyorU=";
+        "cgp-0.3.1" = "sha256-AOQ+WVQWPlF2ZfYYc5Eq3t7XAljd5P2qExWLYZWNnd8=";
       };
     };
 

From dc03486b11fd79e2fa6628d3bbe550c3a335c6b0 Mon Sep 17 00:00:00 2001
From: Soares Chen <soares.chen@maybevoid.com>
Date: Thu, 16 Jan 2025 21:14:08 +0000
Subject: [PATCH 11/11] Fix cargo patch

---
 light-client/Cargo.lock | 9 +++------
 light-client/Cargo.toml | 3 +++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock
index 1abf8e30..4742030c 100644
--- a/light-client/Cargo.lock
+++ b/light-client/Cargo.lock
@@ -383,8 +383,7 @@ dependencies = [
 [[package]]
 name = "cgp-error-extra"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb44c5e45fb8de9d5e8d77a4736c01d09fdee2f4e822b5ea5a3b6243ddbdd9c"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-error",
 ]
@@ -452,8 +451,7 @@ dependencies = [
 [[package]]
 name = "cgp-runtime"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332d92088b07754adbde9ecdf894b8c3b9303b287c8d82d11f8886a394121925"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-core",
 ]
@@ -461,8 +459,7 @@ dependencies = [
 [[package]]
 name = "cgp-sync"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb37ca18a65f3603aaa307ba76d92f64025db56160143a0e96466b5855d61a29"
+source = "git+https://github.com/contextgeneric/cgp.git#ee19ad1775997b0bc83cd71bd24dac0b0381307b"
 dependencies = [
  "cgp-async-macro",
 ]
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
index a156d11f..bcba8d96 100644
--- a/light-client/Cargo.toml
+++ b/light-client/Cargo.toml
@@ -74,7 +74,10 @@ cgp-field               = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-field-macro         = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-field-macro-lib     = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-error               = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-error-extra         = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-run                 = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-runtime             = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-sync                = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-inner               = { git = "https://github.com/contextgeneric/cgp.git" }
 
 hermes-encoding-components          = { git = "https://github.com/informalsystems/hermes-sdk.git" }