From 40798806830a76973c4ef3cf87a841337790dfb3 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 20:12:58 +0000 Subject: [PATCH 01/13] Update hermes-sdk with new export convention --- light-client/Cargo.lock | 58 +++- light-client/Cargo.toml | 15 +- .../src/encoding/components.rs | 23 +- .../src/encoding/impls/client_state.rs | 16 +- .../src/encoding/impls/consensus_state.rs | 13 +- .../src/encoding/impls/header.rs | 14 +- .../src/client_state/execution.rs | 7 +- .../src/client_state/mod.rs | 2 +- .../src/consensus_state.rs | 2 +- .../src/encoding/context.rs | 12 +- relayer/Cargo.lock | 291 +++++++++--------- relayer/Cargo.toml | 68 ++-- .../src/components/encoding.rs | 13 +- .../src/impls/encode/buffer.rs | 10 +- .../src/impls/encode_mut/array.rs | 7 +- .../src/impls/encode_mut/bool.rs | 7 +- .../src/impls/encode_mut/byte_array.rs | 7 +- .../src/impls/encode_mut/cons.rs | 8 +- .../src/impls/encode_mut/display.rs | 7 +- .../src/impls/encode_mut/end.rs | 3 +- .../src/impls/encode_mut/enum_fields.rs | 8 +- .../src/impls/encode_mut/felt.rs | 8 +- .../src/impls/encode_mut/from.rs | 8 +- .../src/impls/encode_mut/from_felt.rs | 4 +- .../src/impls/encode_mut/from_i128.rs | 7 +- .../src/impls/encode_mut/from_u128.rs | 7 +- .../src/impls/encode_mut/i128.rs | 7 +- .../src/impls/encode_mut/iter.rs | 4 +- .../src/impls/encode_mut/option.rs | 6 +- .../src/impls/encode_mut/pair.rs | 8 +- .../src/impls/encode_mut/reference.rs | 4 +- .../src/impls/encode_mut/string.rs | 6 +- .../src/impls/encode_mut/u128.rs | 5 +- .../src/impls/encode_mut/u256.rs | 7 +- .../src/impls/encode_mut/unit.rs | 8 +- .../src/impls/encode_mut/variant.rs | 9 +- .../src/impls/encode_mut/variant_from.rs | 9 +- .../src/impls/encode_mut/vec.rs | 7 +- .../src/impls/types/decode_buffer.rs | 11 +- .../src/impls/types/encode_buffer.rs | 5 +- .../src/impls/types/encoded.rs | 4 +- .../starknet-chain-components/Cargo.toml | 3 + .../src/components/chain.rs | 260 +++++----------- .../src/components/encoding/cairo.rs | 19 +- .../src/components/encoding/event.rs | 6 +- .../src/components/encoding/protobuf.rs | 35 +-- .../src/components/starknet_to_cosmos.rs | 61 ++-- .../src/components/types.rs | 7 +- .../src/impls/assert/assert_duration.rs | 2 +- .../src/impls/commitment_prefix.rs | 2 +- .../src/impls/commitment_proof.rs | 2 +- .../src/impls/contract/call.rs | 4 +- .../src/impls/contract/declare.rs | 3 +- .../src/impls/contract/deploy.rs | 5 +- .../src/impls/contract/invoke.rs | 2 +- .../src/impls/contract/message.rs | 4 +- .../src/impls/counterparty_message_height.rs | 7 +- .../src/impls/encoding/class_hash.rs | 2 +- .../src/impls/encoding/contract_address.rs | 2 +- .../src/impls/encoding/events.rs | 3 +- .../src/impls/events/ack.rs | 17 +- .../src/impls/events/channel.rs | 15 +- .../src/impls/events/connection_id.rs | 17 +- .../src/impls/events/create_client.rs | 15 +- .../src/impls/events/send_packet.rs | 16 +- .../src/impls/ibc_amount.rs | 10 +- .../src/impls/json_rpc.rs | 4 +- .../src/impls/messages/channel.rs | 26 +- .../src/impls/messages/connection.rs | 28 +- .../src/impls/messages/create_client.rs | 15 +- .../src/impls/messages/ibc_transfer.rs | 20 +- .../src/impls/messages/packet.rs | 27 +- .../src/impls/messages/update_client.rs | 15 +- .../src/impls/packet_fields.rs | 7 +- .../src/impls/packet_filter.rs | 9 +- .../impls/payload_builders/create_client.rs | 14 +- .../impls/payload_builders/update_client.rs | 15 +- .../src/impls/queries/ack_commitment.rs | 19 +- .../src/impls/queries/balance.rs | 11 +- .../src/impls/queries/block.rs | 8 +- .../src/impls/queries/block_events.rs | 8 +- .../src/impls/queries/channel_end.rs | 21 +- .../src/impls/queries/client_state.rs | 20 +- .../src/impls/queries/connection_end.rs | 21 +- .../src/impls/queries/consensus_state.rs | 21 +- .../src/impls/queries/contract_address.rs | 2 +- .../impls/queries/counterparty_chain_id.rs | 17 +- .../src/impls/queries/nonce.rs | 6 +- .../src/impls/queries/packet_commitment.rs | 21 +- .../src/impls/queries/packet_receipt.rs | 21 +- .../src/impls/queries/packet_received.rs | 16 +- .../src/impls/queries/status.rs | 7 +- .../src/impls/queries/storage_proof.rs | 8 +- .../src/impls/queries/token_address/create.rs | 10 +- .../src/impls/queries/token_address/get.rs | 7 +- .../queries/token_address/get_or_create.rs | 2 +- .../src/impls/queries/token_balance.rs | 6 +- .../src/impls/send_message.rs | 16 +- .../starknet_to_cosmos/connection_message.rs | 34 +- .../counterparty_message_height.rs | 10 +- .../create_client_message.rs | 20 +- .../impls/starknet_to_cosmos/ibc_amount.rs | 12 +- .../impls/starknet_to_cosmos/packet_fields.rs | 8 +- .../query_consensus_state_height.rs | 10 +- .../update_client_message.rs | 17 +- .../src/impls/transfer.rs | 13 +- .../src/impls/tx_response.rs | 9 +- .../src/impls/types/amount.rs | 20 +- .../src/impls/types/block.rs | 2 +- .../src/impls/types/client.rs | 14 +- .../src/impls/types/commitment_proof.rs | 5 +- .../src/impls/types/config.rs | 2 +- .../src/impls/types/denom.rs | 4 +- .../src/impls/types/height.rs | 4 +- .../src/impls/types/payloads.rs | 8 +- .../src/impls/types/status.rs | 9 +- .../src/impls/types/timestamp.rs | 2 +- .../src/impls/types/wallet.rs | 6 +- .../src/traits/account.rs | 2 +- .../src/traits/commitment_proof.rs | 2 +- .../src/traits/contract/call.rs | 3 +- .../src/traits/contract/deploy.rs | 2 +- .../src/traits/contract/invoke.rs | 3 +- .../src/traits/contract/message.rs | 4 +- .../src/traits/messages/transfer.rs | 5 +- .../src/traits/queries/contract_address.rs | 2 +- .../src/traits/queries/storage_proof.rs | 4 +- .../src/traits/queries/token_address.rs | 2 +- .../src/traits/queries/token_balance.rs | 3 +- .../src/traits/signer.rs | 2 +- .../src/traits/transfer.rs | 3 +- .../src/types/channel_id.rs | 7 +- .../src/types/client_id.rs | 7 +- .../src/types/client_state.rs | 9 +- .../src/types/connection_id.rs | 9 +- .../src/types/consensus_state.rs | 4 +- .../src/types/cosmos/client_state.rs | 15 +- .../src/types/cosmos/height.rs | 8 +- .../src/types/cosmos/timestamp.rs | 7 +- .../src/types/cosmos/update.rs | 9 +- .../src/types/events/channel.rs | 6 +- .../src/types/events/connection.rs | 6 +- .../src/types/events/erc20.rs | 6 +- .../src/types/events/ics20.rs | 6 +- .../src/types/events/packet.rs | 6 +- .../src/types/message_response.rs | 10 +- .../src/types/messages/erc20/transfer.rs | 8 +- .../src/types/messages/ibc/channel.rs | 6 +- .../src/types/messages/ibc/connection.rs | 7 +- .../src/types/messages/ibc/packet.rs | 13 +- .../src/types/status.rs | 2 +- .../crates/starknet-chain-context/Cargo.toml | 3 + .../src/contexts/chain.rs | 200 ++++-------- .../src/contexts/encoding/cairo.rs | 16 +- .../src/contexts/encoding/event.rs | 8 +- .../src/contexts/encoding/protobuf.rs | 9 +- .../src/impls/build_account.rs | 4 +- .../starknet-chain-context/src/impls/error.rs | 36 +-- .../starknet-cli/bin/hermes_starknet.rs | 2 +- .../starknet-cli/examples/bootstrap_ibc.rs | 25 +- .../crates/starknet-cli/src/commands/all.rs | 4 +- .../starknet-cli/src/commands/bootstrap.rs | 4 +- .../src/commands/create/subcommand.rs | 9 +- .../src/commands/query/subcommand.rs | 9 +- .../crates/starknet-cli/src/commands/start.rs | 5 +- .../src/commands/update/subcommand.rs | 6 +- .../crates/starknet-cli/src/contexts/app.rs | 70 ++--- .../src/impls/bootstrap/osmosis_chain.rs | 9 +- .../src/impls/bootstrap/starknet_chain.rs | 7 +- .../crates/starknet-cli/src/impls/build.rs | 10 +- .../starknet-cli/src/impls/create_client.rs | 10 +- .../crates/starknet-cli/src/impls/error.rs | 5 +- .../starknet-integration-tests/Cargo.toml | 3 + .../src/contexts/chain_driver.rs | 24 +- .../contexts/cosmos_starknet_relay_driver.rs | 6 +- .../src/contexts/osmosis_bootstrap.rs | 75 ++--- .../src/contexts/setup.rs | 44 +-- .../src/contexts/starknet_bootstrap.rs | 26 +- .../contexts/starknet_cosmos_relay_driver.rs | 6 +- .../src/contexts/test_driver.rs | 26 +- .../src/impls/build_bootstrap.rs | 20 +- .../src/tests/erc20.rs | 8 +- .../src/tests/timeout_packet.rs | 25 +- .../src/tests/update_client.rs | 19 +- .../src/utils/init_bootstrap.rs | 7 +- .../src/utils/init_setup.rs | 2 +- .../crates/starknet-madara-tests/Cargo.toml | 2 + .../src/contexts/bootstrap.rs | 26 +- .../src/contexts/chain.rs | 30 +- .../src/contexts/chain_driver.rs | 24 +- .../src/impls/build_account.rs | 4 +- .../src/impls/build_chain_driver.rs | 20 +- .../src/impls/contract/call.rs | 4 +- .../src/impls/contract/declare.rs | 3 +- .../src/impls/contract/deploy.rs | 5 +- .../src/impls/error/handler.rs | 36 +-- .../src/impls/init_bootstrap.rs | 2 +- .../impls/payload_builders/update_client.rs | 15 +- .../src/impls/queries/block.rs | 8 +- .../src/impls/queries/block_events.rs | 8 +- .../src/impls/queries/nonce.rs | 6 +- .../src/impls/queries/status.rs | 7 +- .../src/impls/queries/tx_response.rs | 9 +- .../src/impls/send_message.rs | 16 +- .../starknet-madara-tests/src/tests/erc20.rs | 12 +- .../src/tests/raw_storage.rs | 8 +- relayer/crates/starknet-relayer/Cargo.toml | 2 + .../starknet-relayer/src/contexts/builder.rs | 10 +- .../src/contexts/cosmos_starknet_birelay.rs | 12 +- .../src/contexts/cosmos_to_starknet_relay.rs | 39 +-- .../src/contexts/starknet_cosmos_birelay.rs | 12 +- .../src/contexts/starknet_to_cosmos_relay.rs | 36 +-- .../starknet-relayer/src/impls/error.rs | 22 +- .../starknet-relayer/src/presets/relay.rs | 15 +- .../starknet-test-components/Cargo.toml | 2 + .../src/impls/bootstrap/bootstrap_chain.rs | 27 +- .../src/impls/bootstrap/deploy_contracts.rs | 28 +- .../src/impls/bootstrap/start_chain.rs | 12 +- .../impls/bootstrap_madara/bootstrap_chain.rs | 27 +- .../src/impls/bootstrap_madara/start_all.rs | 11 +- .../src/impls/bootstrap_madara/start_anvil.rs | 11 +- .../impls/bootstrap_madara/start_madara.rs | 12 +- .../bootstrap_madara/start_pathfinder.rs | 11 +- .../src/impls/types/genesis_config.rs | 2 +- .../src/impls/types/node_config.rs | 2 +- .../src/traits/deploy_contracts.rs | 2 +- relayer/crates/tools/bin/main.rs | 2 +- .../tools/src/commands/starknet/subcommand.rs | 4 +- .../src/commands/starknet/transfer_args.rs | 9 +- .../crates/tools/src/commands/subcommand.rs | 4 +- relayer/crates/tools/src/contexts/app.rs | 31 +- 231 files changed, 1350 insertions(+), 2071 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index 47c3a7015..0ad28c371 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -1024,10 +1024,11 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#cc0d85a5285e81c2a4516342454ce9c1c3f3a4c4" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc", "ibc-proto", @@ -1038,18 +1039,29 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#cc0d85a5285e81c2a4516342454ce9c1c3f3a4c4" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-prelude", +] + +[[package]] +name = "hermes-prelude" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +dependencies = [ + "cgp", + "cgp-async", ] [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#cc0d85a5285e81c2a4516342454ce9c1c3f3a4c4" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-encoding-components", + "hermes-prelude", "prost", "prost-types", ] @@ -2382,3 +2394,43 @@ dependencies = [ "quote", "syn 2.0.98", ] + +[[patch.unused]] +name = "hermes-chain-components" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-chain-type-components" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-core" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-logging-components" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-relayer-components" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-relayer-components-extra" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-runtime-components" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" + +[[patch.unused]] +name = "hermes-test-components" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml index 063301825..cb6bae505 100644 --- a/light-client/Cargo.toml +++ b/light-client/Cargo.toml @@ -95,6 +95,15 @@ 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" } -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-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-relayer-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-relayer-components-extra = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-chain-type-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } diff --git a/light-client/ibc-client-starknet-types/src/encoding/components.rs b/light-client/ibc-client-starknet-types/src/encoding/components.rs index 16da34952..ae96fe43e 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/components.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/components.rs @@ -3,23 +3,16 @@ mod preset { use cgp::core::component::{UseContext, UseDelegate}; use cgp::prelude::*; use hermes_cosmos_encoding_components::components::CosmosEncodingComponents; - use hermes_encoding_components::traits::convert::ConverterComponent; - use hermes_encoding_components::traits::decode::DecoderComponent; - use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; - use hermes_encoding_components::traits::encode::EncoderComponent; - use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; - use hermes_encoding_components::traits::schema::SchemaGetterComponent; - use hermes_encoding_components::traits::types::decode_buffer::DecodeBufferTypeComponent; - use hermes_encoding_components::traits::types::encode_buffer::EncodeBufferTypeComponent; - use hermes_encoding_components::traits::types::encoded::EncodedTypeComponent; - use hermes_encoding_components::traits::types::schema::SchemaTypeComponent; + use hermes_encoding_components::traits::{ + ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, + EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, + SchemaGetterComponent, SchemaTypeComponent, + }; use hermes_protobuf_encoding_components::impl_type_url; - use hermes_protobuf_encoding_components::impls::any::{ - DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, + use hermes_protobuf_encoding_components::impls::{ + DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, EncodeProtoWithMutBuffer, EncodeViaAny, }; - use hermes_protobuf_encoding_components::impls::encode::buffer::EncodeProtoWithMutBuffer; - use hermes_protobuf_encoding_components::impls::via_any::EncodeViaAny; - use hermes_protobuf_encoding_components::traits::length::EncodedLengthGetterComponent; + use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use ibc_core::client::types::Height; diff --git a/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs b/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs index 325955eea..626af91ca 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs @@ -1,15 +1,11 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_cosmos_encoding_components::impls::chain_id::EncodeChainIdField; -use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders; -use hermes_encoding_components::impls::encode_mut::field::EncodeField; -use hermes_encoding_components::impls::encode_mut::from::DecodeFrom; -use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::transform::Transformer; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField; +use hermes_cosmos_encoding_components::impls::EncodeChainIdField; +use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_protobuf_encoding_components::impls::{ + DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField, +}; use ibc_core::client::types::Height; use ibc_core::host::types::identifiers::ChainId; diff --git a/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs b/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs index 5d32189d0..8e74be963 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs @@ -1,13 +1,10 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders; -use hermes_encoding_components::impls::encode_mut::field::EncodeField; -use hermes_encoding_components::impls::encode_mut::from::DecodeFrom; -use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::transform::Transformer; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField; +use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_protobuf_encoding_components::impls::{ + DecodeRequiredProtoField, EncodeLengthDelimitedProtoField, +}; use ibc_core::commitment_types::commitment::CommitmentRoot; use ibc_core::primitives::Timestamp; diff --git a/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs b/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs index 71f0166d7..817f4e788 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs @@ -1,14 +1,10 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders; -use hermes_encoding_components::impls::encode_mut::field::EncodeField; -use hermes_encoding_components::impls::encode_mut::from::DecodeFrom; -use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::transform::Transformer; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField; +use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_protobuf_encoding_components::impls::{ + DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField, +}; use ibc_core::client::types::Height; use crate::header::{SignedStarknetHeader, StarknetHeader}; diff --git a/light-client/ibc-client-starknet/src/client_state/execution.rs b/light-client/ibc-client-starknet/src/client_state/execution.rs index 657a07c9f..f658927bf 100644 --- a/light-client/ibc-client-starknet/src/client_state/execution.rs +++ b/light-client/ibc-client-starknet/src/client_state/execution.rs @@ -1,8 +1,7 @@ use cgp::core::component::UseContext; -use hermes_cosmos_encoding_components::impls::any::ConvertIbcAny; -use hermes_encoding_components::impls::convert::ConvertVia; -use hermes_encoding_components::traits::convert::Converter; -use hermes_encoding_components::traits::decode::CanDecode; +use hermes_cosmos_encoding_components::impls::ConvertIbcAny; +use hermes_encoding_components::impls::ConvertVia; +use hermes_encoding_components::traits::{CanDecode, Converter}; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc_client_cw::context::client_ctx::CwClientExecution; use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader}; diff --git a/light-client/ibc-client-starknet/src/client_state/mod.rs b/light-client/ibc-client-starknet/src/client_state/mod.rs index ed3a4e3d1..e5f618058 100644 --- a/light-client/ibc-client-starknet/src/client_state/mod.rs +++ b/light-client/ibc-client-starknet/src/client_state/mod.rs @@ -3,7 +3,7 @@ pub mod cw; pub mod execution; pub mod validation; -use hermes_encoding_components::traits::convert::CanConvert; +use hermes_encoding_components::traits::CanConvert; use ibc_client_starknet_types::StarknetClientState as ClientStateType; use ibc_core::client::types::error::ClientError; use ibc_core::primitives::proto::{Any, Protobuf}; diff --git a/light-client/ibc-client-starknet/src/consensus_state.rs b/light-client/ibc-client-starknet/src/consensus_state.rs index 18c88849d..cc7280dfa 100644 --- a/light-client/ibc-client-starknet/src/consensus_state.rs +++ b/light-client/ibc-client-starknet/src/consensus_state.rs @@ -1,4 +1,4 @@ -use hermes_encoding_components::traits::convert::CanConvert; +use hermes_encoding_components::traits::CanConvert; use ibc_client_starknet_types::StarknetConsensusState as ConsensusStateType; use ibc_core::client::context::consensus_state::ConsensusState as ConsensusStateTrait; use ibc_core::client::types::error::ClientError; diff --git a/light-client/ibc-client-starknet/src/encoding/context.rs b/light-client/ibc-client-starknet/src/encoding/context.rs index a75596965..fd9f57ade 100644 --- a/light-client/ibc-client-starknet/src/encoding/context.rs +++ b/light-client/ibc-client-starknet/src/encoding/context.rs @@ -7,14 +7,12 @@ use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProvider, ErrorTypeProviderComponent, }; use cgp::prelude::*; -use hermes_encoding_components::traits::convert::{CanConvert, CanConvertBothWays}; -use hermes_encoding_components::traits::encode_and_decode::CanEncodeAndDecode; -use hermes_encoding_components::traits::encode_and_decode_mut::CanEncodeAndDecodeMut; -use hermes_protobuf_encoding_components::impls::any::TypeUrlMismatchError; -use hermes_protobuf_encoding_components::impls::encode_mut::chunk::{ - InvalidWireType, UnsupportedWireType, +use hermes_encoding_components::traits::{ + CanConvert, CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, +}; +use hermes_protobuf_encoding_components::impls::{ + InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::RequiredFieldTagNotFound; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use ibc_client_starknet_types::encoding::components::*; diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index c2785c97b..119a2f1ae 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -939,17 +939,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "contracts" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d1429e3bd78171c65aa010eabcdf8f863ba3254728dbfb0ad4b1545beac15c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "convert_case" version = "0.4.0" @@ -1766,12 +1755,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1814,13 +1797,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermes-any-counterparty" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", "hermes-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "ibc", @@ -1832,13 +1817,14 @@ dependencies = [ [[package]] name = "hermes-async-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "async-trait", "cgp", "futures-channel", "futures-core", "futures-util", + "hermes-prelude", "hermes-runtime-components", ] @@ -1855,26 +1841,28 @@ dependencies = [ [[package]] name = "hermes-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-chain-type-components", "hermes-encoding-components", + "hermes-prelude", "hermes-runtime-components", ] [[package]] name = "hermes-chain-type-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] name = "hermes-cli" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "clap", @@ -1883,24 +1871,13 @@ dependencies = [ "futures", "hdpath", "hermes-any-counterparty", - "hermes-chain-components", "hermes-cli-components", "hermes-cli-framework", - "hermes-cosmos-chain-components", - "hermes-cosmos-integration-tests", - "hermes-cosmos-relayer", - "hermes-cosmos-test-components", - "hermes-encoding-components", - "hermes-error", - "hermes-logging-components", - "hermes-protobuf-encoding-components", - "hermes-relayer-components", - "hermes-runtime", - "hermes-runtime-components", - "hermes-tracing-logging-components", + "hermes-core", + "hermes-cosmos-core", + "hermes-prelude", "http 1.3.1", "humantime", - "ibc", "prost", "serde", "serde_json", @@ -1912,16 +1889,12 @@ dependencies = [ [[package]] name = "hermes-cli-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "clap", - "hermes-encoding-components", - "hermes-error", - "hermes-logging-components", - "hermes-relayer-components", - "hermes-runtime-components", - "hermes-test-components", + "hermes-core", + "hermes-prelude", "http 1.3.1", "humantime", "ibc", @@ -1932,13 +1905,14 @@ dependencies = [ [[package]] name = "hermes-cli-framework" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "clap", "eyre", "hermes-cosmos-relayer", "hermes-error", + "hermes-prelude", "hermes-runtime", "serde", "serde_json", @@ -1951,16 +1925,17 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-chain-type-components", + "hermes-prelude", ] [[package]] name = "hermes-comet-light-client-context" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "eyre", @@ -1968,15 +1943,33 @@ dependencies = [ "hermes-chain-type-components", "hermes-comet-light-client-components", "hermes-error", + "hermes-prelude", "tendermint", "tendermint-light-client-verifier", "tendermint-rpc", ] +[[package]] +name = "hermes-core" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +dependencies = [ + "cgp", + "hermes-chain-components", + "hermes-chain-type-components", + "hermes-encoding-components", + "hermes-logging-components", + "hermes-prelude", + "hermes-relayer-components", + "hermes-relayer-components-extra", + "hermes-runtime-components", + "hermes-test-components", +] + [[package]] name = "hermes-cosmos-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "bech32 0.9.1", "bitcoin", @@ -1987,16 +1980,13 @@ dependencies = [ "futures", "generic-array", "hdpath", - "hermes-chain-type-components", "hermes-comet-light-client-components", "hermes-comet-light-client-context", + "hermes-core", "hermes-cosmos-encoding-components", - "hermes-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", - "hermes-relayer-components", - "hermes-relayer-components-extra", - "hermes-runtime-components", "http 1.3.1", "ibc", "ibc-client-tendermint", @@ -2016,8 +2006,6 @@ dependencies = [ "sha2 0.10.8", "subtle-encoding", "tendermint", - "tendermint-light-client", - "tendermint-light-client-verifier", "tendermint-proto", "tendermint-rpc", "time", @@ -2030,25 +2018,52 @@ dependencies = [ [[package]] name = "hermes-cosmos-chain-preset" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", - "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-test-components", - "hermes-relayer-components", + "hermes-prelude", +] + +[[package]] +name = "hermes-cosmos-core" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +dependencies = [ + "hermes-comet-light-client-components", + "hermes-comet-light-client-context", + "hermes-core", + "hermes-cosmos-chain-components", + "hermes-cosmos-chain-preset", + "hermes-cosmos-encoding-components", + "hermes-cosmos-integration-tests", + "hermes-cosmos-relayer", + "hermes-cosmos-test-components", + "hermes-cosmos-wasm-relayer", + "hermes-error", + "hermes-protobuf-encoding-components", "hermes-runtime", - "hermes-runtime-components", - "hermes-test-components", + "hermes-tracing-logging-components", + "hermes-wasm-client-components", + "hermes-wasm-encoding-components", + "hermes-wasm-test-components", + "ibc", + "ibc-proto", + "tendermint", + "tendermint-proto", + "tendermint-rpc", ] [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc", "ibc-proto", @@ -2059,22 +2074,19 @@ dependencies = [ [[package]] name = "hermes-cosmos-integration-tests" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "eyre", "hermes-async-runtime-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-relayer", "hermes-cosmos-test-components", "hermes-error", "hermes-ibc-test-suite", - "hermes-logging-components", - "hermes-relayer-components", - "hermes-relayer-components-extra", + "hermes-prelude", "hermes-runtime", - "hermes-runtime-components", - "hermes-test-components", "hermes-tracing-logging-components", "hermes-wasm-test-components", "ibc", @@ -2092,7 +2104,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "dirs-next", @@ -2100,19 +2112,14 @@ dependencies = [ "futures", "hermes-any-counterparty", "hermes-async-runtime-components", - "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", "hermes-cosmos-test-components", - "hermes-encoding-components", "hermes-error", - "hermes-logging-components", + "hermes-prelude", "hermes-protobuf-encoding-components", - "hermes-relayer-components", - "hermes-relayer-components-extra", "hermes-runtime", - "hermes-runtime-components", - "hermes-test-components", "hermes-tracing-logging-components", "hermes-wasm-client-components", "hermes-wasm-test-components", @@ -2141,16 +2148,14 @@ dependencies = [ [[package]] name = "hermes-cosmos-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hdpath", - "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", - "hermes-relayer-components", + "hermes-prelude", "hermes-runtime", - "hermes-runtime-components", - "hermes-test-components", "http 1.3.1", "ibc", "ibc-proto", @@ -2169,27 +2174,23 @@ dependencies = [ [[package]] name = "hermes-cosmos-wasm-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "eyre", "futures", "hermes-any-counterparty", "hermes-async-runtime-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-cosmos-test-components", - "hermes-encoding-components", "hermes-error", - "hermes-logging-components", + "hermes-prelude", "hermes-protobuf-encoding-components", - "hermes-relayer-components", - "hermes-relayer-components-extra", "hermes-runtime", - "hermes-runtime-components", - "hermes-test-components", "hermes-tracing-logging-components", "hermes-wasm-client-components", "hermes-wasm-encoding-components", @@ -2218,30 +2219,35 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] name = "hermes-error" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "eyre", + "hermes-core", + "hermes-prelude", "hermes-relayer-components", ] [[package]] name = "hermes-ibc-test-suite" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-chain-components", "hermes-chain-type-components", + "hermes-core", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-test-components", ] @@ -2249,18 +2255,29 @@ dependencies = [ [[package]] name = "hermes-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +dependencies = [ + "cgp", + "hermes-prelude", +] + +[[package]] +name = "hermes-prelude" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "cgp-async", ] [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-encoding-components", + "hermes-prelude", "prost", "prost-types", ] @@ -2268,7 +2285,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "futures", @@ -2276,17 +2293,20 @@ dependencies = [ "hermes-chain-type-components", "hermes-encoding-components", "hermes-logging-components", + "hermes-prelude", "hermes-runtime-components", ] [[package]] name = "hermes-relayer-components-extra" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "futures", "hermes-chain-type-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime-components", ] @@ -2294,11 +2314,12 @@ dependencies = [ [[package]] name = "hermes-runtime" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-async-runtime-components", "hermes-logging-components", + "hermes-prelude", "hermes-runtime-components", "hermes-tokio-runtime-components", "hermes-tracing-logging-components", @@ -2308,9 +2329,10 @@ dependencies = [ [[package]] name = "hermes-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-prelude", ] [[package]] @@ -2326,12 +2348,15 @@ dependencies = [ "hermes-cairo-encoding-components", "hermes-chain-components", "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", + "hermes-cosmos-core", "hermes-cosmos-encoding-components", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-logging-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "hermes-runtime-components", @@ -2372,12 +2397,15 @@ dependencies = [ "hermes-cairo-encoding-components", "hermes-chain-components", "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", + "hermes-cosmos-core", "hermes-cosmos-relayer", "hermes-encoding-components", "hermes-error", "hermes-logging-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "hermes-runtime", @@ -2446,7 +2474,9 @@ dependencies = [ "flate2", "futures", "hermes-chain-components", + "hermes-core", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-cosmos-test-components", @@ -2455,6 +2485,7 @@ dependencies = [ "hermes-error", "hermes-ibc-test-suite", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime", "hermes-runtime-components", @@ -2494,12 +2525,14 @@ dependencies = [ "hermes-cairo-encoding-components", "hermes-chain-components", "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-error", "hermes-ibc-test-suite", "hermes-logging-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "hermes-relayer-components", "hermes-runtime", @@ -2541,11 +2574,13 @@ dependencies = [ "cgp", "eyre", "futures", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-relayer", "hermes-encoding-components", "hermes-error", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime", "hermes-runtime-components", @@ -2566,9 +2601,11 @@ version = "0.1.0" dependencies = [ "cgp", "hermes-cairo-encoding-components", + "hermes-core", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime-components", "hermes-starknet-chain-components", @@ -2611,11 +2648,12 @@ dependencies = [ [[package]] name = "hermes-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "hermes-chain-type-components", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-relayer-components-extra", "hermes-runtime-components", @@ -2624,12 +2662,13 @@ dependencies = [ [[package]] name = "hermes-tokio-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", "futures", "hermes-async-runtime-components", "hermes-logging-components", + "hermes-prelude", "hermes-runtime-components", "itertools", "rand", @@ -2640,10 +2679,12 @@ dependencies = [ [[package]] name = "hermes-tracing-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-core", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-relayer-components-extra", "tracing", @@ -2653,16 +2694,16 @@ dependencies = [ [[package]] name = "hermes-wasm-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", "hermes-cosmos-encoding-components", - "hermes-encoding-components", "hermes-error", + "hermes-prelude", "hermes-protobuf-encoding-components", - "hermes-relayer-components", "hermes-wasm-encoding-components", "ibc", "ibc-proto", @@ -2673,11 +2714,12 @@ dependencies = [ [[package]] name = "hermes-wasm-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", + "hermes-core", "hermes-cosmos-encoding-components", - "hermes-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc", "prost", @@ -2687,15 +2729,13 @@ dependencies = [ [[package]] name = "hermes-wasm-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git#fdaa818a51731ba9a6c51b0121002cfd95ddab49" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" dependencies = [ "cgp", - "hermes-chain-type-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-test-components", - "hermes-relayer-components", - "hermes-runtime-components", - "hermes-test-components", + "hermes-prelude", "ibc", "ibc-proto", "prost", @@ -5209,16 +5249,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.219" @@ -5980,31 +6010,6 @@ dependencies = [ "url", ] -[[package]] -name = "tendermint-light-client" -version = "0.40.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a803ff14b11827772f696ba3a1873a5f24598121872c924a764011fc58fc22a0" -dependencies = [ - "contracts", - "crossbeam-channel", - "derive_more 0.99.19", - "flex-error", - "futures", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "static_assertions", - "tendermint", - "tendermint-light-client-verifier", - "tendermint-rpc", - "time", - "tokio", - "tracing", -] - [[package]] name = "tendermint-light-client-verifier" version = "0.40.1" diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index bd56db4a5..fd2020f35 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -68,6 +68,9 @@ ibc-client-starknet-types = { version = "0.1.0" } tendermint = { version = "0.40" } tendermint-rpc = { version = "0.40" } +hermes-prelude = { version = "0.1.0" } +hermes-core = { version = "0.1.0" } +hermes-cosmos-core = { version = "0.1.0" } hermes-runtime-components = { version = "0.1.0" } hermes-async-runtime-components = { version = "0.1.0" } hermes-tokio-runtime-components = { version = "0.1.0" } @@ -168,34 +171,37 @@ cgp-sync = { git = "https://github.com/contextgeneric/cgp.git" } cgp-inner = { git = "https://github.com/contextgeneric/cgp.git" } cgp-error-eyre = { 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-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-chain-preset = { 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-cli = { git = "https://github.com/informalsystems/hermes-sdk.git" } -hermes-cli-framework = { git = "https://github.com/informalsystems/hermes-sdk.git" } +hermes-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-chain-type-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-relayer-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-relayer-components-extra = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-async-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-tokio-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-runtime = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-error = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-tracing-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-ibc-test-suite = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-any-counterparty = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-chain-preset = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-relayer = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-wasm-relayer = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos-integration-tests = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-comet-light-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-comet-light-client-context = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-wasm-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-wasm-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-wasm-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cli-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cli = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cli-framework = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } diff --git a/relayer/crates/cairo-encoding-components/src/components/encoding.rs b/relayer/crates/cairo-encoding-components/src/components/encoding.rs index ac29f16cb..7073d850d 100644 --- a/relayer/crates/cairo-encoding-components/src/components/encoding.rs +++ b/relayer/crates/cairo-encoding-components/src/components/encoding.rs @@ -1,16 +1,11 @@ #[cgp::re_export_imports] mod preset { use cgp::prelude::*; - use hermes_encoding_components::traits::decode::DecoderComponent; - use hermes_encoding_components::traits::decode_mut::DecodeBufferPeekerComponent; - use hermes_encoding_components::traits::encode::EncoderComponent; - use hermes_encoding_components::traits::types::decode_buffer::{ - DecodeBufferBuilderComponent, DecodeBufferTypeComponent, + use hermes_encoding_components::traits::{ + DecodeBufferBuilderComponent, DecodeBufferPeekerComponent, DecodeBufferTypeComponent, + DecoderComponent, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, + EncodedTypeComponent, EncoderComponent, }; - use hermes_encoding_components::traits::types::encode_buffer::{ - EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, - }; - use hermes_encoding_components::traits::types::encoded::EncodedTypeComponent; use crate::impls::encode::buffer::EncodeWithMutBuffer; use crate::impls::types::decode_buffer::ProvideVecIterDecodeBuffer; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs b/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs index c775a00cd..adb86b21e 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs @@ -1,10 +1,8 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode::{Decoder, DecoderComponent}; -use hermes_encoding_components::traits::decode_mut::{CanDecodeMut, MutDecoder}; -use hermes_encoding_components::traits::encode::{Encoder, EncoderComponent}; -use hermes_encoding_components::traits::encode_mut::CanEncodeMut; -use hermes_encoding_components::traits::types::decode_buffer::CanBuildDecodeBuffer; -use hermes_encoding_components::traits::types::encode_buffer::CanFinalizedEncodeBuffer; +use hermes_encoding_components::traits::{ + CanBuildDecodeBuffer, CanDecodeMut, CanEncodeMut, CanFinalizedEncodeBuffer, Decoder, + DecoderComponent, Encoder, EncoderComponent, MutDecoder, +}; use crate::impls::encode_mut::end::DecodeEnd; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs index e5ca9ada7..bb052e6da 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs @@ -1,11 +1,8 @@ use core::fmt::Debug; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub struct EncodeArray; 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 dce827d1a..baac98181 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,11 +1,8 @@ use core::fmt::Debug; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; use starknet::core::types::Felt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs index b049b081f..6f0601a41 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; use starknet::core::types::{ByteArray, Felt}; 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 f4a7d86ee..1e52ed04e 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 @@ -2,10 +2,10 @@ use core::marker::PhantomData; use cgp::core::error::HasAsyncErrorType; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, +}; pub struct EncoderCons(pub PhantomData<(EncoderA, EncoderB)>); diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs index 45391f917..46b68d177 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs @@ -2,11 +2,8 @@ use core::fmt::Display; use core::str::FromStr; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub struct EncodeDisplay; 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 514efab57..58998d040 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,8 +1,7 @@ use core::fmt::Debug; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; +use hermes_encoding_components::traits::{HasDecodeBufferType, MutDecoder, MutDecoderComponent}; pub struct DecodeEnd; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs index a3d86a3df..89b18d476 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, +}; use crate::impls::encode_mut::variant::SumEncoders; use crate::types::nat::Z; 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 7fc973cd9..bc2f7e222 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,10 +1,10 @@ use core::iter; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, +}; use starknet::core::types::Felt; pub struct EncodeFelt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs index 3115e6636..847dee020 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, +}; pub struct EncodeFrom(pub PhantomData<(Intermediate, InEncoder)>); diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs index 92ff4c719..63d29a1ca 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; +use hermes_encoding_components::traits::{CanEncodeMut, MutEncoder, MutEncoderComponent}; use starknet::core::types::Felt; pub struct EncodeFromFelt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs index d187f4193..1076e270b 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub struct EncodeFromI128; 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 754183c31..cbd1285ff 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,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub struct EncodeFromU128; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs index 373120b53..b6763a113 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; use starknet::core::types::Felt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs index ac7ea9b64..2c01aac03 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; +use hermes_encoding_components::traits::{CanEncodeMut, MutEncoder, MutEncoderComponent}; pub struct EncodeArray; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs index 077d9b8a5..817ce8037 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::transform::{Transformer, TransformerRef}; +use hermes_encoding_components::traits::{ + MutDecoderComponent, MutEncoderComponent, Transformer, TransformerRef, +}; use crate::impls::encode_mut::variant_from::EncodeVariantFrom; 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 8a3fefae1..f3f69fd6a 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,10 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, +}; pub struct EncoderPair(pub PhantomData<(EncoderA, EncoderB)>); diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs index 1c681b8fc..c889e90fa 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs @@ -1,9 +1,7 @@ use core::ops::Deref; use cgp::prelude::*; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; +use hermes_encoding_components::traits::{CanEncodeMut, MutEncoder, MutEncoderComponent}; pub struct EncodeDeref; 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 8e9edf861..2e44bc721 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,9 +1,9 @@ use std::string::FromUtf8Error; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, MutDecoder, MutDecoderComponent, MutEncoderComponent, +}; use crate::impls::encode_mut::byte_array::EncodeByteArray; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs index a42b6254b..a3a85c609 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs @@ -1,8 +1,7 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, MutDecoder, MutDecoderComponent, MutEncoderComponent, }; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; use starknet::core::types::Felt; use crate::impls::encode_mut::from_felt::EncodeFromFelt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs index fa53ea4ab..9d1542f0e 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; use starknet::core::types::U256; 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 7af85ce6c..aed502ee5 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,8 +1,8 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, +}; pub struct EncodeNothing; 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 c3e2b7c13..744058ccd 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,13 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, CanPeekDecodeBuffer, MutDecoder, MutDecoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, CanPeekDecodeBuffer, HasEncodeBufferType, MutDecoder, + MutDecoderComponent, MutEncoder, MutEncoderComponent, }; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; use starknet::core::types::Felt; use crate::impls::encode_mut::felt::UnexpectedEndOfBuffer; 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 0f1e68cf2..41dc5aac1 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,11 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{MutDecoder, MutDecoderComponent}; -use hermes_encoding_components::traits::encode_mut::{MutEncoder, MutEncoderComponent}; -use hermes_encoding_components::traits::transform::{Transformer, TransformerRef}; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; +use hermes_encoding_components::traits::{ + HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, + MutEncoderComponent, Transformer, TransformerRef, +}; use crate::impls::encode_mut::variant::SumEncoders; use crate::types::nat::Z; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs index ea303951d..bf5819505 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub struct EncodeList; diff --git a/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs b/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs index 57dfee94a..4e7a4d20c 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs @@ -3,14 +3,11 @@ use core::ops::Deref; use core::slice::Iter; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - DecodeBufferPeeker, DecodeBufferPeekerComponent, +use hermes_encoding_components::traits::{ + DecodeBufferBuilder, DecodeBufferBuilderComponent, DecodeBufferPeeker, + DecodeBufferPeekerComponent, DecodeBufferTypeComponent, HasDecodeBufferType, HasEncodedType, + ProvideDecodeBufferType, }; -use hermes_encoding_components::traits::types::decode_buffer::{ - DecodeBufferBuilder, DecodeBufferBuilderComponent, DecodeBufferTypeComponent, - HasDecodeBufferType, ProvideDecodeBufferType, -}; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; use starknet::core::types::Felt; pub struct ProvideVecIterDecodeBuffer; diff --git a/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs b/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs index db8cdf992..ec9eb1535 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::types::encode_buffer::{ +use hermes_encoding_components::traits::{ EncodeBufferFinalizer, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, - HasEncodeBufferType, ProvideEncodeBufferType, + HasEncodeBufferType, HasEncodedType, ProvideEncodeBufferType, }; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; use starknet::core::types::Felt; pub struct ProvideVecEncodeBuffer; diff --git a/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs b/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs index 65fb3eca3..c9d2f785e 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::types::encoded::{ - EncodedTypeComponent, ProvideEncodedType, -}; +use hermes_encoding_components::traits::{EncodedTypeComponent, ProvideEncodedType}; use starknet::core::types::Felt; pub struct ProvideVecFeltEncodedType; diff --git a/relayer/crates/starknet-chain-components/Cargo.toml b/relayer/crates/starknet-chain-components/Cargo.toml index cac6421e4..dacb701c3 100644 --- a/relayer/crates/starknet-chain-components/Cargo.toml +++ b/relayer/crates/starknet-chain-components/Cargo.toml @@ -14,6 +14,9 @@ workspace = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-relayer-components = { workspace = true } hermes-test-components = { workspace = true } hermes-runtime-components = { workspace = true } diff --git a/relayer/crates/starknet-chain-components/src/components/chain.rs b/relayer/crates/starknet-chain-components/src/components/chain.rs index af1ed960a..e3dc7c572 100644 --- a/relayer/crates/starknet-chain-components/src/components/chain.rs +++ b/relayer/crates/starknet-chain-components/src/components/chain.rs @@ -2,191 +2,99 @@ mod preset { 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; - use hermes_chain_components::impls::payload_builders::packet::BuildPacketPayloads; - use hermes_chain_components::impls::queries::block_events::{ - RetryQueryBlockEvents, WaitBlockHeightAndQueryEvents, + use hermes_chain_components::impls::{ + BuildChannelHandshakePayload, BuildConnectionHandshakePayload, BuildPacketPayloads, + ProvideBytesPacketCommitment, ProvideBytesPacketReceipt, ProvideChannelPayloadTypes, + ProvideCommitmentPrefixBytes, ProvideConnectionPayloadTypes, ProvidePacketPayloadTypes, + QueryClearedPacketWithEmptyCommitment, QueryConsensusStateHeightsAndFindHeightBefore, + QueryLatestConsensusStateHeightAsHeights, RetryQueryBlockEvents, + WaitBlockHeightAndQueryEvents, }; - use hermes_chain_components::impls::queries::consensus_state_height::QueryConsensusStateHeightsAndFindHeightBefore; - use hermes_chain_components::impls::queries::consensus_state_heights::QueryLatestConsensusStateHeightAsHeights; - use hermes_chain_components::impls::queries::packet_is_cleared::QueryClearedPacketWithEmptyCommitment; - use hermes_chain_components::impls::types::commitment::ProvideBytesPacketCommitment; - use hermes_chain_components::impls::types::commitment_prefix::ProvideCommitmentPrefixBytes; - use hermes_chain_components::impls::types::payloads::channel::ProvideChannelPayloadTypes; - use hermes_chain_components::impls::types::payloads::connection::ProvideConnectionPayloadTypes; - use hermes_chain_components::impls::types::payloads::packet::ProvidePacketPayloadTypes; - use hermes_chain_components::impls::types::receipt::ProvideBytesPacketReceipt; - use hermes_chain_components::traits::commitment_prefix::{ - CommitmentPrefixTypeComponent, IbcCommitmentPrefixGetterComponent, - }; - use hermes_chain_components::traits::extract_data::{ - EventExtractorComponent, MessageResponseExtractorComponent, - }; - use hermes_chain_components::traits::message_builders::ack_packet::AckPacketMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::channel_handshake::{ - ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilderComponent, - ChannelOpenInitMessageBuilderComponent, ChannelOpenTryMessageBuilderComponent, - }; - use hermes_chain_components::traits::message_builders::connection_handshake::{ - ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilderComponent, - ConnectionOpenInitMessageBuilderComponent, ConnectionOpenTryMessageBuilderComponent, - }; - use hermes_chain_components::traits::message_builders::create_client::CreateClientMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::receive_packet::ReceivePacketMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::timeout_unordered_packet::TimeoutUnorderedPacketMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::update_client::UpdateClientMessageBuilderComponent; - use hermes_chain_components::traits::packet::fields::{ - PacketDstChannelIdGetterComponent, PacketDstPortIdGetterComponent, - PacketSequenceGetterComponent, PacketSrcChannelIdGetterComponent, - PacketSrcPortIdGetterComponent, PacketTimeoutHeightGetterComponent, - PacketTimeoutTimestampGetterComponent, - }; - use hermes_chain_components::traits::packet::filter::{ - IncomingPacketFilterComponent, OutgoingPacketFilterComponent, - }; - use hermes_chain_components::traits::packet::from_send_packet::PacketFromSendPacketEventBuilderComponent; - use hermes_chain_components::traits::packet::from_write_ack::PacketFromWriteAckEventBuilderComponent; - use hermes_chain_components::traits::payload_builders::ack_packet::AckPacketPayloadBuilderComponent; - use hermes_chain_components::traits::payload_builders::channel_handshake::{ - ChannelOpenAckPayloadBuilderComponent, ChannelOpenConfirmPayloadBuilderComponent, - ChannelOpenTryPayloadBuilderComponent, - }; - use hermes_chain_components::traits::payload_builders::connection_handshake::{ - ConnectionOpenAckPayloadBuilderComponent, ConnectionOpenConfirmPayloadBuilderComponent, - ConnectionOpenInitPayloadBuilderComponent, ConnectionOpenTryPayloadBuilderComponent, - }; - use hermes_chain_components::traits::payload_builders::create_client::CreateClientPayloadBuilderComponent; - use hermes_chain_components::traits::payload_builders::receive_packet::ReceivePacketPayloadBuilderComponent; - use hermes_chain_components::traits::payload_builders::timeout_unordered_packet::TimeoutUnorderedPacketPayloadBuilderComponent; - use hermes_chain_components::traits::payload_builders::update_client::UpdateClientPayloadBuilderComponent; - use hermes_chain_components::traits::queries::block::BlockQuerierComponent; - use hermes_chain_components::traits::queries::block_events::BlockEventsQuerierComponent; - use hermes_chain_components::traits::queries::channel_end::{ - ChannelEndQuerierComponent, ChannelEndWithProofsQuerierComponent, - }; - use hermes_chain_components::traits::queries::client_state::{ - ClientStateQuerierComponent, ClientStateWithProofsQuerierComponent, - }; - use hermes_chain_components::traits::queries::connection_end::{ - ConnectionEndQuerierComponent, ConnectionEndWithProofsQuerierComponent, - }; - use hermes_chain_components::traits::queries::consensus_state::{ - ConsensusStateQuerierComponent, ConsensusStateWithProofsQuerierComponent, - }; - use hermes_chain_components::traits::queries::consensus_state_height::{ - ConsensusStateHeightQuerierComponent, ConsensusStateHeightsQuerierComponent, - }; - use hermes_chain_components::traits::queries::counterparty_chain_id::CounterpartyChainIdQuerierComponent; - use hermes_chain_components::traits::queries::counterparty_connection_id::CounterpartyConnectionIdQuerierComponent; - use hermes_chain_components::traits::queries::packet_acknowledgement::PacketAckCommitmentQuerierComponent; - use hermes_chain_components::traits::queries::packet_commitment::PacketCommitmentQuerierComponent; - use hermes_chain_components::traits::queries::packet_is_cleared::PacketIsClearedQuerierComponent; - use hermes_chain_components::traits::queries::packet_is_received::PacketIsReceivedQuerierComponent; - use hermes_chain_components::traits::queries::packet_receipt::PacketReceiptQuerierComponent; - use hermes_chain_components::traits::types::block::BlockTypeComponent; - use hermes_chain_components::traits::types::channel::{ - ChannelEndTypeComponent, ChannelOpenAckPayloadTypeComponent, - ChannelOpenConfirmPayloadTypeComponent, ChannelOpenTryPayloadTypeComponent, - InitChannelOptionsTypeComponent, - }; - use hermes_chain_components::traits::types::client_state::ClientStateFieldsComponent; - use hermes_chain_components::traits::types::connection::{ - ConnectionEndTypeComponent, ConnectionOpenAckPayloadTypeComponent, - ConnectionOpenConfirmPayloadTypeComponent, ConnectionOpenInitPayloadTypeComponent, - ConnectionOpenTryPayloadTypeComponent, InitConnectionOptionsTypeComponent, - }; - use hermes_chain_components::traits::types::create_client::{ - CreateClientEventComponent, CreateClientMessageOptionsTypeComponent, + use hermes_chain_components::traits::{ + AckCommitmentHashTypeProviderComponent, AckPacketMessageBuilderComponent, + AckPacketPayloadBuilderComponent, AckPacketPayloadTypeProviderComponent, + AcknowledgementTypeProviderComponent, BlockEventsQuerierComponent, BlockQuerierComponent, + BlockTypeComponent, ChannelEndQuerierComponent, ChannelEndTypeComponent, + ChannelEndWithProofsQuerierComponent, ChannelIdTypeComponent, + ChannelOpenAckMessageBuilderComponent, ChannelOpenAckPayloadBuilderComponent, + ChannelOpenAckPayloadTypeComponent, ChannelOpenConfirmMessageBuilderComponent, + ChannelOpenConfirmPayloadBuilderComponent, ChannelOpenConfirmPayloadTypeComponent, + ChannelOpenInitEventComponent, ChannelOpenInitMessageBuilderComponent, + ChannelOpenTryEventComponent, ChannelOpenTryMessageBuilderComponent, + ChannelOpenTryPayloadBuilderComponent, ChannelOpenTryPayloadTypeComponent, + ClientIdTypeComponent, ClientStateFieldsComponent, ClientStateQuerierComponent, + ClientStateWithProofsQuerierComponent, CommitmentPrefixTypeComponent, + CommitmentProofBytesGetterComponent, CommitmentProofHeightGetterComponent, + CommitmentProofTypeProviderComponent, ConnectionEndQuerierComponent, + ConnectionEndTypeComponent, ConnectionEndWithProofsQuerierComponent, + ConnectionIdTypeComponent, ConnectionOpenAckMessageBuilderComponent, + ConnectionOpenAckPayloadBuilderComponent, ConnectionOpenAckPayloadTypeComponent, + ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenConfirmPayloadBuilderComponent, + ConnectionOpenConfirmPayloadTypeComponent, ConnectionOpenInitEventComponent, + ConnectionOpenInitMessageBuilderComponent, ConnectionOpenInitPayloadBuilderComponent, + ConnectionOpenInitPayloadTypeComponent, ConnectionOpenTryEventComponent, + ConnectionOpenTryMessageBuilderComponent, ConnectionOpenTryPayloadBuilderComponent, + ConnectionOpenTryPayloadTypeComponent, ConsensusStateHeightQuerierComponent, + ConsensusStateHeightsQuerierComponent, ConsensusStateQuerierComponent, + ConsensusStateWithProofsQuerierComponent, CounterpartyChainIdQuerierComponent, + CounterpartyConnectionIdQuerierComponent, CounterpartyMessageHeightGetterComponent, + CreateClientEventComponent, CreateClientMessageBuilderComponent, + CreateClientMessageOptionsTypeComponent, CreateClientPayloadBuilderComponent, CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, + EventExtractorComponent, HeightAdjusterComponent, HeightIncrementerComponent, + IbcCommitmentPrefixGetterComponent, IncomingPacketFilterComponent, + InitChannelOptionsTypeComponent, InitConnectionOptionsTypeComponent, + MessageResponseExtractorComponent, OutgoingPacketFilterComponent, + OutgoingPacketTypeComponent, PacketAckCommitmentQuerierComponent, + PacketCommitmentQuerierComponent, PacketCommitmentTypeComponent, + PacketDstChannelIdGetterComponent, PacketDstPortIdGetterComponent, + PacketFromSendPacketEventBuilderComponent, PacketFromWriteAckEventBuilderComponent, + PacketIsClearedQuerierComponent, PacketIsReceivedQuerierComponent, + PacketReceiptQuerierComponent, PacketReceiptTypeComponent, PacketSequenceGetterComponent, + PacketSrcChannelIdGetterComponent, PacketSrcPortIdGetterComponent, + PacketTimeoutHeightGetterComponent, PacketTimeoutTimestampGetterComponent, + PortIdTypeComponent, ReceivePacketMessageBuilderComponent, + ReceivePacketPayloadBuilderComponent, ReceivePacketPayloadTypeComponent, + SendPacketEventComponent, SequenceTypeComponent, TimeoutTypeComponent, + TimeoutUnorderedPacketMessageBuilderComponent, + TimeoutUnorderedPacketPayloadBuilderComponent, TimeoutUnorderedPacketPayloadTypeComponent, + UpdateClientMessageBuilderComponent, UpdateClientPayloadBuilderComponent, + UpdateClientPayloadTypeComponent, WriteAckEventComponent, }; - use hermes_chain_components::traits::types::height::{ - HeightAdjusterComponent, HeightIncrementerComponent, - }; - use hermes_chain_components::traits::types::ibc::{ - ChannelIdTypeComponent, ClientIdTypeComponent, ConnectionIdTypeComponent, - CounterpartyMessageHeightGetterComponent, PortIdTypeComponent, SequenceTypeComponent, - }; - use hermes_chain_components::traits::types::ibc_events::channel::{ - ChannelOpenInitEventComponent, ChannelOpenTryEventComponent, - }; - use hermes_chain_components::traits::types::ibc_events::connection::{ - ConnectionOpenInitEventComponent, ConnectionOpenTryEventComponent, - }; - use hermes_chain_components::traits::types::ibc_events::send_packet::SendPacketEventComponent; - use hermes_chain_components::traits::types::ibc_events::write_ack::WriteAckEventComponent; - use hermes_chain_components::traits::types::packet::OutgoingPacketTypeComponent; - use hermes_chain_components::traits::types::packets::ack::{ - AckCommitmentHashTypeProviderComponent, AckPacketPayloadTypeProviderComponent, - AcknowledgementTypeProviderComponent, - }; - use hermes_chain_components::traits::types::packets::receive::{ - PacketCommitmentTypeComponent, ReceivePacketPayloadTypeComponent, - }; - use hermes_chain_components::traits::types::packets::timeout::{ - PacketReceiptTypeComponent, TimeoutUnorderedPacketPayloadTypeComponent, + use hermes_chain_type_components::traits::{ + AddressTypeProviderComponent, AmountDenomGetterComponent, AmountTypeProviderComponent, + DenomTypeComponent, MessageResponseEventsGetterComponent, MessageResponseTypeComponent, + TimeTypeComponent, }; - use hermes_chain_components::traits::types::proof::{ - CommitmentProofBytesGetterComponent, CommitmentProofHeightGetterComponent, - CommitmentProofTypeProviderComponent, + use hermes_core::chain_components::traits::{ + ChainIdTypeProviderComponent, ChainStatusQuerierComponent, ChainStatusTypeComponent, + ClientStateTypeComponent, ConsensusStateTypeComponent, EventTypeProviderComponent, + HeightFieldComponent, HeightTypeProviderComponent, MessageSenderComponent, + MessageTypeProviderComponent, }; - use hermes_chain_components::traits::types::timestamp::TimeoutTypeComponent; - use hermes_chain_components::traits::types::update_client::UpdateClientPayloadTypeComponent; - use hermes_chain_type_components::traits::fields::amount::denom::AmountDenomGetterComponent; - use hermes_chain_type_components::traits::fields::message_response_events::MessageResponseEventsGetterComponent; - use hermes_chain_type_components::traits::types::amount::AmountTypeProviderComponent; - use hermes_chain_type_components::traits::types::message_response::MessageResponseTypeComponent; - use hermes_chain_type_components::traits::types::time::TimeTypeComponent; - use hermes_cosmos_chain_components::impls::channel::init_channel_options::ProvideCosmosInitChannelOptionsType; - use hermes_cosmos_chain_components::impls::connection::init_connection_options::ProvideCosmosInitConnectionOptionsType; - use hermes_cosmos_chain_components::impls::packet::packet_fields::CosmosPacketFieldReader; - use hermes_cosmos_chain_components::impls::queries::counterparty_connection_id::QueryCounterpartyConnectionId; - use hermes_cosmos_chain_components::impls::transaction::poll_timeout::FixedPollTimeoutSecs; - use hermes_cosmos_chain_components::impls::types::chain::ProvideCosmosChainTypes; - use hermes_cosmos_chain_components::impls::types::create_client_options::ProvideNoCreateClientMessageOptionsType; - use hermes_relayer_components::chain::traits::queries::chain_status::ChainStatusQuerierComponent; - use hermes_relayer_components::chain::traits::send_message::MessageSenderComponent; - use hermes_relayer_components::chain::traits::types::chain_id::ChainIdTypeProviderComponent; - use hermes_relayer_components::chain::traits::types::client_state::ClientStateTypeComponent; - use hermes_relayer_components::chain::traits::types::consensus_state::ConsensusStateTypeComponent; - use hermes_relayer_components::chain::traits::types::event::EventTypeProviderComponent; - use hermes_relayer_components::chain::traits::types::height::{ - HeightFieldComponent, HeightTypeProviderComponent, + use hermes_cosmos_chain_components::impls::{ + CosmosPacketFieldReader, FixedPollTimeoutSecs, ProvideCosmosChainTypes, + ProvideCosmosInitChannelOptionsType, ProvideCosmosInitConnectionOptionsType, + ProvideNoCreateClientMessageOptionsType, QueryCounterpartyConnectionId, }; - use hermes_relayer_components::chain::traits::types::message::MessageTypeProviderComponent; - use hermes_relayer_components::chain::traits::types::status::ChainStatusTypeComponent; - use hermes_relayer_components::components::default::transaction::DefaultTxComponents; + use hermes_relayer_components::components::default::DefaultTxComponents; use hermes_relayer_components::error::impls::retry::ReturnRetryable; use hermes_relayer_components::error::traits::RetryableErrorComponent; - use hermes_relayer_components::transaction::impls::poll_tx_response::PollTimeoutGetterComponent; - use hermes_relayer_components::transaction::traits::nonce::allocate_nonce::NonceAllocatorComponent; - use hermes_relayer_components::transaction::traits::nonce::query_nonce::NonceQuerierComponent; - use hermes_relayer_components::transaction::traits::parse_events::TxMessageResponseParserComponent; - use hermes_relayer_components::transaction::traits::poll_tx_response::TxResponsePollerComponent; - use hermes_relayer_components::transaction::traits::query_tx_response::TxResponseQuerierComponent; - use hermes_relayer_components::transaction::traits::send_messages_with_signer::MessagesWithSignerSenderComponent; - use hermes_relayer_components::transaction::traits::send_messages_with_signer_and_nonce::MessagesWithSignerAndNonceSenderComponent; - use hermes_relayer_components::transaction::traits::types::nonce::NonceTypeProviderComponent; - use hermes_relayer_components::transaction::traits::types::signer::SignerTypeProviderComponent; - use hermes_relayer_components::transaction::traits::types::tx_hash::TxHashTypeProviderComponent; - use hermes_relayer_components::transaction::traits::types::tx_response::TxResponseTypeProviderComponent; - use hermes_test_components::chain::impls::assert::poll_assert_eventual_amount::PollAssertEventualAmount; - use hermes_test_components::chain::impls::default_memo::ProvideDefaultMemo; - use hermes_test_components::chain::impls::ibc_transfer::SendIbcTransferMessage; - use hermes_test_components::chain::traits::assert::eventual_amount::EventualAmountAsserterComponent; - use hermes_test_components::chain::traits::assert::poll_assert::PollAssertDurationGetterComponent; - use hermes_test_components::chain::traits::messages::ibc_transfer::IbcTokenTransferMessageBuilderComponent; - use hermes_test_components::chain::traits::queries::balance::BalanceQuerierComponent; - use hermes_test_components::chain::traits::transfer::amount::IbcTransferredAmountConverterComponent; - use hermes_test_components::chain::traits::transfer::ibc_transfer::TokenIbcTransferrerComponent; - use hermes_test_components::chain::traits::transfer::timeout::IbcTransferTimeoutCalculatorComponent; - use hermes_test_components::chain::traits::types::address::AddressTypeProviderComponent; - use hermes_test_components::chain::traits::types::amount::AmountMethodsComponent; - use hermes_test_components::chain::traits::types::denom::DenomTypeComponent; - use hermes_test_components::chain::traits::types::memo::{ - DefaultMemoGetterComponent, MemoTypeProviderComponent, + use hermes_relayer_components::transaction::impls::PollTimeoutGetterComponent; + use hermes_relayer_components::transaction::traits::{ + MessagesWithSignerAndNonceSenderComponent, MessagesWithSignerSenderComponent, + NonceAllocatorComponent, NonceQuerierComponent, NonceTypeProviderComponent, + SignerTypeProviderComponent, TxHashTypeProviderComponent, TxMessageResponseParserComponent, + TxResponsePollerComponent, TxResponseQuerierComponent, TxResponseTypeProviderComponent, + }; + use hermes_test_components::chain::impls::{ + PollAssertEventualAmount, ProvideDefaultMemo, SendIbcTransferMessage, }; - use hermes_test_components::chain::traits::types::wallet::{ + use hermes_test_components::chain::traits::{ + AmountMethodsComponent, BalanceQuerierComponent, DefaultMemoGetterComponent, + EventualAmountAsserterComponent, IbcTokenTransferMessageBuilderComponent, + IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, + MemoTypeProviderComponent, PollAssertDurationGetterComponent, TokenIbcTransferrerComponent, WalletSignerComponent, WalletTypeComponent, }; use ibc::core::host::types::identifiers::ChainId; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs index 83d253a2e..980375ced 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs @@ -14,21 +14,12 @@ mod preset { use hermes_cairo_encoding_components::impls::encode_mut::reference::EncodeDeref; use hermes_cairo_encoding_components::impls::encode_mut::vec::EncodeList; use hermes_cairo_encoding_components::strategy::ViaCairo; - use hermes_encoding_components::impls::fields::EncodeFields; - use hermes_encoding_components::impls::tagged::EncodeTaggedField; - use hermes_encoding_components::traits::decode::DecoderComponent; - use hermes_encoding_components::traits::decode_mut::{ - DecodeBufferPeekerComponent, MutDecoderComponent, + use hermes_encoding_components::impls::{EncodeFields, EncodeTaggedField}; + use hermes_encoding_components::traits::{ + DecodeBufferBuilderComponent, DecodeBufferPeekerComponent, DecodeBufferTypeComponent, + DecoderComponent, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, + EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, }; - use hermes_encoding_components::traits::encode::EncoderComponent; - use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; - use hermes_encoding_components::traits::types::decode_buffer::{ - DecodeBufferBuilderComponent, DecodeBufferTypeComponent, - }; - use hermes_encoding_components::traits::types::encode_buffer::{ - EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, - }; - use hermes_encoding_components::traits::types::encoded::EncodedTypeComponent; use ibc::clients::tendermint::types::{Header as TendermintLcHeader, TrustThreshold}; use ibc::core::commitment_types::specs::ProofSpecs; use ibc::core::host::types::identifiers::ChainId; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/event.rs b/relayer/crates/starknet-chain-components/src/components/encoding/event.rs index 6e29bc408..5dd7a863b 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/event.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/event.rs @@ -3,10 +3,8 @@ mod preset { use cgp::core::component::UseDelegate; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; - pub use hermes_encoding_components::traits::decode::DecoderComponent; - use hermes_encoding_components::traits::types::encoded::{ - EncodedTypeComponent, ProvideEncodedType, - }; + pub use hermes_encoding_components::traits::DecoderComponent; + use hermes_encoding_components::traits::{EncodedTypeComponent, ProvideEncodedType}; use crate::impls::encoding::class_hash::DecodeOptionalByClassHash; use crate::impls::encoding::contract_address::DecodeOptionalByContractAddress; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs index 890ea5278..5eb99a915 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs @@ -2,33 +2,24 @@ mod preset { use cgp::core::component::{UseContext, UseDelegate}; use cgp::prelude::*; - use hermes_encoding_components::impls::types::encoded::ProvideEncodedBytes; - use hermes_encoding_components::impls::types::schema::ProvideStringSchema; - use hermes_encoding_components::traits::convert::ConverterComponent; - use hermes_encoding_components::traits::decode::DecoderComponent; - use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; - use hermes_encoding_components::traits::encode::EncoderComponent; - use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; - use hermes_encoding_components::traits::schema::SchemaGetterComponent; - use hermes_encoding_components::traits::types::decode_buffer::DecodeBufferTypeComponent; - use hermes_encoding_components::traits::types::encode_buffer::EncodeBufferTypeComponent; - use hermes_encoding_components::traits::types::encoded::EncodedTypeComponent; - use hermes_encoding_components::traits::types::schema::SchemaTypeComponent; + use hermes_encoding_components::impls::{ProvideEncodedBytes, ProvideStringSchema}; + use hermes_encoding_components::traits::{ + ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, + EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, + SchemaGetterComponent, SchemaTypeComponent, + }; use hermes_protobuf_encoding_components::impl_type_url; - use hermes_protobuf_encoding_components::impls::any::{ - DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, + use hermes_protobuf_encoding_components::impls::{ + DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, ProvideBytesEncodeBuffer, + ProvideProtoChunksDecodeBuffer, }; - use hermes_protobuf_encoding_components::impls::types::decode_buffer::ProvideProtoChunksDecodeBuffer; - use hermes_protobuf_encoding_components::impls::types::encode_buffer::ProvideBytesEncodeBuffer; - use hermes_protobuf_encoding_components::traits::length::EncodedLengthGetterComponent; + use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_wasm_encoding_components::components::WasmEncodingComponents; - use hermes_wasm_encoding_components::impls::convert::client_message::{ - DecodeViaClientMessage, EncodeViaClientMessage, + use hermes_wasm_encoding_components::impls::{DecodeViaClientMessage, EncodeViaClientMessage}; + use hermes_wasm_encoding_components::types::{ + WasmClientMessage, WasmClientState, WasmConsensusState, }; - use hermes_wasm_encoding_components::types::client_message::WasmClientMessage; - use hermes_wasm_encoding_components::types::client_state::WasmClientState; - use hermes_wasm_encoding_components::types::consensus_state::WasmConsensusState; use ibc::clients::wasm_types::client_message::ClientMessage; use ibc::core::client::types::Height; use ibc::core::commitment_types::commitment::CommitmentRoot; 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 0bfeb2bf3..ed1434c8f 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 @@ -2,48 +2,33 @@ mod preset { use cgp::core::types::WithType; use cgp::prelude::*; - use hermes_chain_components::traits::message_builders::ack_packet::AckPacketMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::channel_handshake::{ - ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilderComponent, - ChannelOpenInitMessageBuilderComponent, ChannelOpenTryMessageBuilderComponent, + use hermes_chain_components::traits::{ + AckPacketMessageBuilderComponent, ChannelOpenAckMessageBuilderComponent, + ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilderComponent, + ChannelOpenTryMessageBuilderComponent, ClientStateFieldsComponent, + ClientStateTypeComponent, ConnectionOpenAckMessageBuilderComponent, + ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilderComponent, + ConnectionOpenTryMessageBuilderComponent, ConsensusStateHeightsQuerierComponent, + ConsensusStateTypeComponent, CounterpartyMessageHeightGetterComponent, + CreateClientMessageBuilderComponent, CreateClientMessageOptionsTypeComponent, + CreateClientPayloadBuilderComponent, CreateClientPayloadOptionsTypeComponent, + CreateClientPayloadTypeComponent, PacketDstChannelIdGetterComponent, + PacketDstPortIdGetterComponent, PacketSequenceGetterComponent, + PacketSrcChannelIdGetterComponent, PacketSrcPortIdGetterComponent, + PacketTimeoutHeightGetterComponent, PacketTimeoutTimestampGetterComponent, + ReceivePacketMessageBuilderComponent, TimeoutUnorderedPacketMessageBuilderComponent, + UpdateClientMessageBuilderComponent, UpdateClientPayloadBuilderComponent, + UpdateClientPayloadTypeComponent, }; - use hermes_chain_components::traits::message_builders::connection_handshake::{ - ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilderComponent, - ConnectionOpenInitMessageBuilderComponent, ConnectionOpenTryMessageBuilderComponent, - }; - use hermes_chain_components::traits::message_builders::create_client::CreateClientMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::receive_packet::ReceivePacketMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::timeout_unordered_packet::TimeoutUnorderedPacketMessageBuilderComponent; - use hermes_chain_components::traits::message_builders::update_client::UpdateClientMessageBuilderComponent; - use hermes_chain_components::traits::packet::fields::{ - PacketDstChannelIdGetterComponent, PacketDstPortIdGetterComponent, - PacketSequenceGetterComponent, PacketSrcChannelIdGetterComponent, - PacketSrcPortIdGetterComponent, PacketTimeoutHeightGetterComponent, - PacketTimeoutTimestampGetterComponent, - }; - use hermes_chain_components::traits::payload_builders::create_client::CreateClientPayloadBuilderComponent; - use hermes_chain_components::traits::payload_builders::update_client::UpdateClientPayloadBuilderComponent; - use hermes_chain_components::traits::queries::consensus_state_height::ConsensusStateHeightsQuerierComponent; - use hermes_chain_components::traits::types::client_state::{ - ClientStateFieldsComponent, ClientStateTypeComponent, - }; - use hermes_chain_components::traits::types::consensus_state::ConsensusStateTypeComponent; - use hermes_chain_components::traits::types::create_client::{ - CreateClientMessageOptionsTypeComponent, CreateClientPayloadOptionsTypeComponent, - CreateClientPayloadTypeComponent, - }; - use hermes_chain_components::traits::types::ibc::CounterpartyMessageHeightGetterComponent; - use hermes_chain_components::traits::types::update_client::UpdateClientPayloadTypeComponent; - use hermes_cosmos_chain_components::impls::packet::packet_fields::CosmosPacketFieldReader; - use hermes_cosmos_chain_components::impls::packet::packet_message::BuildCosmosPacketMessages; - use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; - use hermes_relayer_components::chain::traits::queries::client_state::{ + use hermes_core::chain_components::traits::{ ClientStateQuerierComponent, ClientStateWithProofsQuerierComponent, - }; - use hermes_relayer_components::chain::traits::queries::consensus_state::{ ConsensusStateQuerierComponent, ConsensusStateWithProofsQuerierComponent, }; - use hermes_test_components::chain::traits::transfer::amount::IbcTransferredAmountConverterComponent; + use hermes_cosmos_chain_components::impls::{ + BuildCosmosPacketMessages, CosmosPacketFieldReader, + }; + use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; + use hermes_test_components::chain::traits::IbcTransferredAmountConverterComponent; use crate::impls::starknet_to_cosmos::connection_message::BuildStarknetToCosmosConnectionHandshake; use crate::impls::starknet_to_cosmos::counterparty_message_height::GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/components/types.rs b/relayer/crates/starknet-chain-components/src/components/types.rs index b812eac26..88dd8966b 100644 --- a/relayer/crates/starknet-chain-components/src/components/types.rs +++ b/relayer/crates/starknet-chain-components/src/components/types.rs @@ -1,8 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::channel::ChannelEndTypeComponent; -use hermes_chain_components::traits::types::connection::ConnectionEndTypeComponent; -use hermes_chain_components::traits::types::ibc::{ - ChannelIdTypeComponent, ClientIdTypeComponent, ConnectionIdTypeComponent, +use hermes_chain_components::traits::{ + ChannelEndTypeComponent, ChannelIdTypeComponent, ClientIdTypeComponent, + ConnectionEndTypeComponent, ConnectionIdTypeComponent, }; use crate::types::channel_id::{ChannelEnd, ChannelId}; diff --git a/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs b/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs index 83ebb2a11..7194630f4 100644 --- a/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs +++ b/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs @@ -1,7 +1,7 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_test_components::chain::traits::assert::poll_assert::{ +use hermes_test_components::chain::traits::{ PollAssertDurationGetter, PollAssertDurationGetterComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs b/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs index 06168d241..8d7c2e3ed 100644 --- a/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs +++ b/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs @@ -1,7 +1,7 @@ use std::sync::LazyLock; use cgp::prelude::*; -use hermes_chain_components::traits::commitment_prefix::{ +use hermes_chain_components::traits::{ HasCommitmentPrefixType, IbcCommitmentPrefixGetter, IbcCommitmentPrefixGetterComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs index 3f7b40afe..dbedc0e90 100644 --- a/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs @@ -1,7 +1,7 @@ use core::num::TryFromIntError; use cgp::prelude::*; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; use indexmap::IndexMap; use starknet::core::crypto::pedersen_hash; use starknet::core::types::{Felt, MerkleNode, StorageProof}; 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 8adfb5454..7ff3df582 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/call.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/call.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_components::traits::HasHeightType; +use hermes_chain_type_components::traits::HasAddressType; use starknet::core::types::{BlockId, BlockTag, Felt, FunctionCall}; use starknet::providers::{Provider, ProviderError}; 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 89f00f0cd..67bcf2fa0 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs @@ -6,8 +6,7 @@ use cairo_lang_starknet_classes::casm_contract_class::{ use cairo_lang_starknet_classes::contract_class::ContractClass; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::default_signer::HasDefaultSigner; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; +use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use starknet::accounts::Account; use starknet::core::types::contract::{ CompiledClass, ComputeClassHashError, JsonError, SierraClass, 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 92947c658..802f0484d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs @@ -1,7 +1,6 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::default_signer::HasDefaultSigner; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use starknet::contract::ContractFactory; use starknet::core::types::{Felt, RevertedInvocation}; use starknet::macros::felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs b/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs index 33900ecc1..535e41430 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_relayer_components::chain::traits::send_message::CanSendSingleMessage; +use hermes_core::chain_components::traits::CanSendSingleMessage; use crate::traits::contract::invoke::{ContractInvoker, ContractInvokerComponent}; use crate::traits::contract::message::CanBuildInvokeContractMessage; diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/message.rs b/relayer/crates/starknet-chain-components/src/impls/contract/message.rs index 885c81c0e..8567c5b81 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/message.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_components::traits::HasMessageType; use starknet::core::types::Felt; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs index 64b8b0b58..74fd98d88 100644 --- a/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{ - CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, +use hermes_chain_components::traits::{ + CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, + HasMessageType, }; -use hermes_chain_components::traits::types::message::HasMessageType; use ibc::core::client::types::Height; use crate::impls::types::message::StarknetMessage; diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs index f9559df68..e17b4484c 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs @@ -3,7 +3,7 @@ use std::collections::HashSet; use std::sync::OnceLock; use cgp::prelude::*; -use hermes_encoding_components::traits::decode::{CanDecode, Decoder, DecoderComponent}; +use hermes_encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; use starknet::core::types::Felt; use crate::types::event::StarknetEvent; diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs index 075889428..f5ff346a1 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs @@ -3,7 +3,7 @@ use std::collections::HashSet; use std::sync::OnceLock; use cgp::prelude::*; -use hermes_encoding_components::traits::decode::{CanDecode, Decoder, DecoderComponent}; +use hermes_encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; use crate::impls::types::address::StarknetAddress; use crate::types::event::StarknetEvent; 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 ad55b570d..896f193c2 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs @@ -1,7 +1,6 @@ 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; +use hermes_encoding_components::traits::{CanDecode, HasEncodedType}; pub trait CanFilterDecodeEvents: HasEncodedType + HasAsyncErrorType { fn filter_decode_events(&self, encoded: &[Self::Encoded]) -> Result, Self::Error>; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/ack.rs b/relayer/crates/starknet-chain-components/src/impls/events/ack.rs index 6571c9729..86ccf94e8 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/ack.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/ack.rs @@ -5,19 +5,12 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::extract_data::{EventExtractor, EventExtractorComponent}; -use hermes_chain_components::traits::packet::from_write_ack::{ - PacketFromWriteAckEventBuilder, PacketFromWriteAckEventBuilderComponent, +use hermes_chain_components::traits::{ + EventExtractor, EventExtractorComponent, HasAcknowledgementType, HasEventType, + HasOutgoingPacketType, HasWriteAckEvent, PacketFromWriteAckEventBuilder, + PacketFromWriteAckEventBuilderComponent, ProvideWriteAckEvent, WriteAckEventComponent, }; -use hermes_chain_components::traits::types::event::HasEventType; -use hermes_chain_components::traits::types::ibc_events::write_ack::{ - HasWriteAckEvent, ProvideWriteAckEvent, WriteAckEventComponent, -}; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; -use hermes_chain_components::traits::types::packets::ack::HasAcknowledgementType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; use ibc::apps::transfer::types::{Amount, BaseDenom, Memo, PrefixedDenom, TracePath}; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/channel.rs b/relayer/crates/starknet-chain-components/src/impls/events/channel.rs index 42fb2a599..f54615da0 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/channel.rs @@ -3,18 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::extract_data::{ - MessageResponseExtractor, MessageResponseExtractorComponent, -}; -use hermes_chain_components::traits::types::ibc::HasChannelIdType; -use hermes_chain_components::traits::types::ibc_events::channel::{ - ChannelOpenInitEventComponent, ChannelOpenTryEventComponent, ProvideChannelOpenInitEvent, +use hermes_chain_components::traits::{ + ChannelOpenInitEventComponent, ChannelOpenTryEventComponent, HasChannelIdType, + MessageResponseExtractor, MessageResponseExtractorComponent, ProvideChannelOpenInitEvent, ProvideChannelOpenTryEvent, }; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs b/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs index 832372a01..d5587bdff 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs @@ -3,18 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::extract_data::{ - MessageResponseExtractor, MessageResponseExtractorComponent, +use hermes_chain_components::traits::{ + ConnectionOpenInitEventComponent, ConnectionOpenTryEventComponent, HasConnectionIdType, + MessageResponseExtractor, MessageResponseExtractorComponent, ProvideConnectionOpenInitEvent, + ProvideConnectionOpenTryEvent, }; -use hermes_chain_components::traits::types::ibc::HasConnectionIdType; -use hermes_chain_components::traits::types::ibc_events::connection::{ - ConnectionOpenInitEventComponent, ConnectionOpenTryEventComponent, - ProvideConnectionOpenInitEvent, ProvideConnectionOpenTryEvent, -}; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs b/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs index a834a9fa7..193989588 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs @@ -3,17 +3,12 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::extract_data::{ - MessageResponseExtractor, MessageResponseExtractorComponent, +use hermes_chain_components::traits::{ + CreateClientEventComponent, HasClientIdType, MessageResponseExtractor, + MessageResponseExtractorComponent, ProvideCreateClientEvent, }; -use hermes_chain_components::traits::types::create_client::{ - CreateClientEventComponent, ProvideCreateClientEvent, -}; -use hermes_chain_components::traits::types::ibc::HasClientIdType; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs b/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs index bf831eb85..3c51a9283 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs @@ -5,18 +5,12 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::extract_data::{EventExtractor, EventExtractorComponent}; -use hermes_chain_components::traits::packet::from_send_packet::{ - PacketFromSendPacketEventBuilder, PacketFromSendPacketEventBuilderComponent, +use hermes_chain_components::traits::{ + EventExtractor, EventExtractorComponent, HasEventType, HasOutgoingPacketType, + HasSendPacketEvent, PacketFromSendPacketEventBuilder, + PacketFromSendPacketEventBuilderComponent, ProvideSendPacketEvent, SendPacketEventComponent, }; -use hermes_chain_components::traits::types::event::HasEventType; -use hermes_chain_components::traits::types::ibc_events::send_packet::{ - HasSendPacketEvent, ProvideSendPacketEvent, SendPacketEventComponent, -}; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; use ibc::apps::transfer::types::{Amount, BaseDenom, Memo, PrefixedDenom, TracePath}; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; diff --git a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs index 0888d7c12..76bfff920 100644 --- a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs @@ -1,12 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_components::traits::types::ibc::{HasChannelIdType, HasPortIdType}; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_chain_type_components::traits::types::denom::HasDenomType; -use hermes_cosmos_test_components::chain::types::amount::Amount; -use hermes_test_components::chain::traits::transfer::amount::{ +use hermes_chain_components::traits::{HasChannelIdType, HasPortIdType}; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; +use hermes_cosmos_test_components::chain::types::Amount; +use hermes_test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; use ibc::core::host::types::identifiers::{ChannelId, PortId}; diff --git a/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs b/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs index 1cd5790dc..b8d2f7a35 100644 --- a/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs +++ b/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_logging_components::traits::logger::CanLog; -use hermes_logging_components::types::level::LevelTrace; +use hermes_logging_components::traits::CanLog; +use hermes_logging_components::types::LevelTrace; use serde::{Deserialize, Serialize}; use crate::traits::json_rpc::{JsonRpcRequestSender, JsonRpcRequestSenderComponent}; 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 136ffcd9a..ee9377050 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs @@ -3,31 +3,21 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::message_builders::channel_handshake::{ +use hermes_chain_components::traits::{ ChannelOpenAckMessageBuilder, ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilder, ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilder, ChannelOpenInitMessageBuilderComponent, - ChannelOpenTryMessageBuilder, ChannelOpenTryMessageBuilderComponent, + ChannelOpenTryMessageBuilder, ChannelOpenTryMessageBuilderComponent, HasChannelEndType, + HasChannelIdType, HasChannelOpenAckPayloadType, HasChannelOpenConfirmPayloadType, + HasChannelOpenTryPayloadType, HasCommitmentProofType, HasConnectionIdType, HasHeightType, + HasInitChannelOptionsType, HasMessageType, HasPortIdType, }; -use hermes_chain_components::traits::types::channel::{ - HasChannelEndType, HasChannelOpenAckPayloadType, HasChannelOpenConfirmPayloadType, - HasChannelOpenTryPayloadType, HasInitChannelOptionsType, -}; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{ - HasChannelIdType, HasConnectionIdType, HasPortIdType, -}; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; use hermes_chain_components::types::payloads::channel::{ ChannelOpenAckPayload, ChannelOpenConfirmPayload, ChannelOpenTryPayload, }; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_cosmos_chain_components::types::channel::CosmosInitChannelOptions; -use hermes_cosmos_chain_components::types::commitment_proof::CosmosCommitmentProof; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_cosmos_chain_components::types::{CosmosCommitmentProof, CosmosInitChannelOptions}; +use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc::core::channel::types::channel::{ChannelEnd, Order as IbcOrder}; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId as IbcPortId}; 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 7b5c0070f..061c14f0b 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs @@ -6,33 +6,23 @@ use core::time::Duration; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasCommitmentPrefixType; -use hermes_chain_components::traits::message_builders::connection_handshake::{ +use hermes_chain_components::traits::{ ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilder, ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilder, ConnectionOpenInitMessageBuilderComponent, - ConnectionOpenTryMessageBuilder, ConnectionOpenTryMessageBuilderComponent, + ConnectionOpenTryMessageBuilder, ConnectionOpenTryMessageBuilderComponent, HasClientIdType, + HasClientStateType, HasCommitmentPrefixType, HasCommitmentProofType, HasConnectionEndType, + HasConnectionIdType, HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, + HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, HasHeightType, + HasInitConnectionOptionsType, HasMessageType, }; -use hermes_chain_components::traits::types::client_state::HasClientStateType; -use hermes_chain_components::traits::types::connection::{ - HasConnectionEndType, HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, - HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, - HasInitConnectionOptionsType, -}; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{HasClientIdType, HasConnectionIdType}; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; use hermes_chain_components::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, ConnectionOpenTryPayload, }; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_cosmos_chain_components::types::commitment_proof::CosmosCommitmentProof; -use hermes_cosmos_chain_components::types::connection::CosmosInitConnectionOptions; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_cosmos_chain_components::types::{CosmosCommitmentProof, CosmosInitConnectionOptions}; +use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::{ 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 6697a2c85..6d0172f06 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 @@ -3,18 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::message_builders::create_client::{ +use hermes_chain_components::traits::{ CreateClientMessageBuilder, CreateClientMessageBuilderComponent, + HasCreateClientMessageOptionsType, HasCreateClientPayloadType, HasMessageType, }; -use hermes_chain_components::traits::types::create_client::{ - HasCreateClientMessageOptionsType, HasCreateClientPayloadType, -}; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_cosmos_chain_components::types::payloads::client::CosmosCreateClientPayload; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_cosmos_chain_components::types::CosmosCreateClientPayload; +use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use starknet::core::types::Felt; use starknet::macros::{selector, short_string}; diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs b/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs index 6d3c6b8c1..33debd1de 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs @@ -4,20 +4,14 @@ use std::str::FromStr; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::types::height::HasHeightFields; -use hermes_chain_components::traits::types::ibc::{HasChannelIdType, HasPortIdType}; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_components::traits::types::timestamp::HasTimeoutType; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; -use hermes_test_components::chain::traits::messages::ibc_transfer::{ - IbcTokenTransferMessageBuilder, IbcTokenTransferMessageBuilderComponent, +use hermes_chain_components::traits::{ + HasChannelIdType, HasHeightFields, HasMessageType, HasPortIdType, HasTimeoutType, +}; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_test_components::chain::traits::{ + HasMemoType, IbcTokenTransferMessageBuilder, IbcTokenTransferMessageBuilderComponent, }; -use hermes_test_components::chain::traits::types::memo::HasMemoType; use ibc::core::host::types::identifiers::PortId; use ibc::primitives::Timestamp; use starknet::core::types::{Felt, U256}; 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 32d737623..830c72fc3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs @@ -3,32 +3,19 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::message_builders::ack_packet::{ - AckPacketMessageBuilder, AckPacketMessageBuilderComponent, -}; -use hermes_chain_components::traits::message_builders::receive_packet::{ +use hermes_chain_components::traits::{ + AckPacketMessageBuilder, AckPacketMessageBuilderComponent, HasAckPacketPayloadType, + HasAcknowledgementType, HasCommitmentProofType, HasHeightType, HasMessageType, + HasOutgoingPacketType, HasReceivePacketPayloadType, HasTimeoutUnorderedPacketPayloadType, ReceivePacketMessageBuilder, ReceivePacketMessageBuilderComponent, -}; -use hermes_chain_components::traits::message_builders::timeout_unordered_packet::{ TimeoutUnorderedPacketMessageBuilder, TimeoutUnorderedPacketMessageBuilderComponent, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; -use hermes_chain_components::traits::types::packets::ack::{ - HasAckPacketPayloadType, HasAcknowledgementType, -}; -use hermes_chain_components::traits::types::packets::receive::HasReceivePacketPayloadType; -use hermes_chain_components::traits::types::packets::timeout::HasTimeoutUnorderedPacketPayloadType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; use hermes_chain_components::types::payloads::packet::{ AckPacketPayload, ReceivePacketPayload, TimeoutUnorderedPacketPayload, }; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_cosmos_chain_components::types::commitment_proof::CosmosCommitmentProof; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_cosmos_chain_components::types::CosmosCommitmentProof; +use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc::apps::transfer::types::packet::PacketData as IbcIcs20PacketData; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; 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 c752a1d58..eb26ccb37 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 @@ -3,18 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::message_builders::update_client::{ +use hermes_chain_components::traits::{ + HasClientIdType, HasCreateClientMessageOptionsType, HasMessageType, HasUpdateClientPayloadType, UpdateClientMessageBuilder, UpdateClientMessageBuilderComponent, }; -use hermes_chain_components::traits::types::create_client::HasCreateClientMessageOptionsType; -use hermes_chain_components::traits::types::ibc::HasClientIdType; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_components::traits::types::update_client::HasUpdateClientPayloadType; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_cosmos_chain_components::types::payloads::client::CosmosUpdateClientPayload; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_cosmos_chain_components::types::CosmosUpdateClientPayload; +use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader; use ibc_proto::Protobuf; use starknet::core::types::{ByteArray, Felt}; diff --git a/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs b/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs index 229178bec..758d7dba1 100644 --- a/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs +++ b/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::packet::fields::{ - PacketSrcChannelIdGetter, PacketSrcChannelIdGetterComponent, +use hermes_chain_components::traits::{ + HasChannelIdType, HasOutgoingPacketType, PacketSrcChannelIdGetter, + PacketSrcChannelIdGetterComponent, }; -use hermes_chain_components::traits::types::ibc::HasChannelIdType; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; use ibc::core::channel::types::packet::Packet; use crate::types::channel_id::ChannelId; 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 f5fcd443e..eef68857f 100644 --- a/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs +++ b/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs @@ -1,10 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::packet::filter::{ - IncomingPacketFilter, IncomingPacketFilterComponent, OutgoingPacketFilter, - OutgoingPacketFilterComponent, -}; -use hermes_chain_components::traits::types::packet::{ - HasIncomingPacketType, HasOutgoingPacketType, +use hermes_chain_components::traits::{ + HasIncomingPacketType, HasOutgoingPacketType, IncomingPacketFilter, + IncomingPacketFilterComponent, OutgoingPacketFilter, OutgoingPacketFilterComponent, }; pub struct FilterStarknetPackets; 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 1a5fcc2e6..93af59d33 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,13 +1,11 @@ use cgp::prelude::*; -use hermes_chain_components::traits::payload_builders::create_client::CreateClientPayloadBuilderComponent; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::chain_status::CanQueryChainHeight; -use hermes_chain_components::traits::types::chain_id::HasChainId; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_relayer_components::chain::traits::payload_builders::create_client::CreateClientPayloadBuilder; -use hermes_relayer_components::chain::traits::types::create_client::{ - HasCreateClientPayloadOptionsType, HasCreateClientPayloadType, +use hermes_chain_components::traits::{ + CanQueryBlock, CanQueryChainHeight, CreateClientPayloadBuilderComponent, HasChainId, }; +use hermes_core::chain_components::traits::{ + CreateClientPayloadBuilder, HasCreateClientPayloadOptionsType, HasCreateClientPayloadType, +}; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ChainId; 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 044db4922..f8023fa7a 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,15 +1,12 @@ use cgp::prelude::*; -use hermes_chain_components::traits::payload_builders::update_client::UpdateClientPayloadBuilderComponent; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; +use hermes_chain_components::traits::{CanQueryBlock, UpdateClientPayloadBuilderComponent}; +use hermes_core::chain_components::traits::{ + HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, +}; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_encoding_components::types::AsBytes; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; -use hermes_relayer_components::chain::traits::payload_builders::update_client::UpdateClientPayloadBuilder; -use hermes_relayer_components::chain::traits::types::client_state::HasClientStateType; -use hermes_relayer_components::chain::traits::types::height::HasHeightType; -use hermes_relayer_components::chain::traits::types::update_client::HasUpdateClientPayloadType; use ibc::core::client::types::Height; use ibc::primitives::Timestamp; use ibc_client_starknet_types::header::StarknetHeader; 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 963124425..ffd788d30 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 @@ -3,22 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::packet_acknowledgement::{ +use hermes_chain_components::traits::{ + CanQueryBlock, HasAckCommitmentHashType, HasChannelIdType, HasCommitmentProofType, + HasHeightType, HasIbcCommitmentPrefix, HasPortIdType, HasSequenceType, PacketAckCommitmentQuerier, PacketAckCommitmentQuerierComponent, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{ - HasChannelIdType, HasPortIdType, HasSequenceType, -}; -use hermes_chain_components::traits::types::packets::ack::HasAckCommitmentHashType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{AckPath, Path}; use starknet::core::types::Felt; 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 0980e722d..ba38633bc 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs @@ -1,14 +1,9 @@ use cgp::prelude::*; 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; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_chain_type_components::traits::types::denom::HasDenomType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_test_components::chain::traits::queries::balance::{ - BalanceQuerier, BalanceQuerierComponent, -}; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; +use hermes_encoding_components::traits::{CanDecode, HasEncoding}; +use hermes_test_components::chain::traits::{BalanceQuerier, BalanceQuerierComponent}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs index 2478d9c2a..9ea9c3e52 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::queries::block::{BlockQuerier, BlockQuerierComponent}; -use hermes_chain_components::traits::types::block::HasBlockType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_cosmos_chain_components::types::status::Time; +use hermes_chain_components::traits::{ + BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, +}; +use hermes_cosmos_chain_components::types::Time; use starknet::core::types::{BlockId, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs index 997f90efd..a29f382a2 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs @@ -1,12 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_components::traits::queries::block_events::{ - BlockEventsQuerier, BlockEventsQuerierComponent, +use hermes_chain_components::traits::{ + BlockEventsQuerier, BlockEventsQuerierComponent, HasEventType, HasHeightType, }; -use hermes_chain_components::traits::types::event::HasEventType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; use starknet::core::types::{BlockId, EventFilter}; use starknet::providers::{Provider, ProviderError}; 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 a145a673d..0078c33c7 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 @@ -3,22 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::chain_status::CanQueryChainHeight; -use hermes_chain_components::traits::queries::channel_end::{ - ChannelEndQuerier, ChannelEndQuerierComponent, ChannelEndWithProofsQuerier, - ChannelEndWithProofsQuerierComponent, +use hermes_chain_components::traits::{ + CanQueryBlock, CanQueryChainHeight, ChannelEndQuerier, ChannelEndQuerierComponent, + ChannelEndWithProofsQuerier, ChannelEndWithProofsQuerierComponent, HasChannelEndType, + HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, HasPortIdType, }; -use hermes_chain_components::traits::types::channel::HasChannelEndType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{HasChannelIdType, HasPortIdType}; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::path::{ChannelEndPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 22bda1578..b7e180d96 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 @@ -3,21 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::client_state::{ - CanQueryClientState, ClientStateQuerier, ClientStateQuerierComponent, - ClientStateWithProofsQuerier, ClientStateWithProofsQuerierComponent, +use hermes_chain_components::traits::{ + CanQueryBlock, CanQueryClientState, ClientStateQuerier, ClientStateQuerierComponent, + ClientStateWithProofsQuerier, ClientStateWithProofsQuerierComponent, HasClientIdType, + HasClientStateType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, }; -use hermes_chain_components::traits::types::client_state::HasClientStateType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::HasClientIdType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::path::{ClientStatePath, Path}; use starknet::core::types::Felt; use starknet::macros::selector; 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 0684ef6ec..9ccc29701 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 @@ -3,21 +3,14 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::connection_end::{ - ConnectionEndQuerier, ConnectionEndQuerierComponent, ConnectionEndWithProofsQuerier, - ConnectionEndWithProofsQuerierComponent, +use hermes_chain_components::traits::{ + CanQueryBlock, ConnectionEndQuerier, ConnectionEndQuerierComponent, + ConnectionEndWithProofsQuerier, ConnectionEndWithProofsQuerierComponent, + HasCommitmentProofType, HasConnectionEndType, HasConnectionIdType, HasHeightType, + HasIbcCommitmentPrefix, }; -use hermes_chain_components::traits::types::connection::HasConnectionEndType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::HasConnectionIdType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::path::{ConnectionPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 42ab8f29b..9995766d1 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 @@ -3,21 +3,14 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::consensus_state::{ - CanQueryConsensusState, ConsensusStateQuerier, ConsensusStateQuerierComponent, - ConsensusStateWithProofsQuerier, ConsensusStateWithProofsQuerierComponent, +use hermes_chain_components::traits::{ + CanQueryBlock, CanQueryConsensusState, ConsensusStateQuerier, ConsensusStateQuerierComponent, + ConsensusStateWithProofsQuerier, ConsensusStateWithProofsQuerierComponent, HasClientIdType, + HasCommitmentProofType, HasConsensusStateType, HasHeightFields, HasHeightType, + HasIbcCommitmentPrefix, }; -use hermes_chain_components::traits::types::consensus_state::HasConsensusStateType; -use hermes_chain_components::traits::types::height::{HasHeightFields, HasHeightType}; -use hermes_chain_components::traits::types::ibc::HasClientIdType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::client::types::Height as IbcHeight; use ibc::core::host::types::path::{ClientConsensusStatePath, Path}; use starknet::core::types::Felt; 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 6707c8ae4..9ac07ae19 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 @@ -2,7 +2,7 @@ use core::marker::PhantomData; use std::sync::OnceLock; use cgp::prelude::*; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; use crate::traits::queries::contract_address::{ ContractAddressQuerier, ContractAddressQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs b/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs index f780fdef6..42d09113f 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs @@ -1,18 +1,11 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_components::traits::queries::chain_status::CanQueryChainHeight; -use hermes_chain_components::traits::queries::channel_end::CanQueryChannelEnd; -use hermes_chain_components::traits::queries::client_state::CanQueryClientState; -use hermes_chain_components::traits::queries::connection_end::CanQueryConnectionEnd; -use hermes_chain_components::traits::queries::counterparty_chain_id::{ - CounterpartyChainIdQuerier, CounterpartyChainIdQuerierComponent, -}; -use hermes_chain_components::traits::types::channel::HasChannelEndType; -use hermes_chain_components::traits::types::client_state::HasClientStateFields; -use hermes_chain_components::traits::types::connection::HasConnectionEndType; -use hermes_chain_components::traits::types::ibc::{ - HasChannelIdType, HasClientIdType, HasConnectionIdType, HasPortIdType, +use hermes_chain_components::traits::{ + CanQueryChainHeight, CanQueryChannelEnd, CanQueryClientState, CanQueryConnectionEnd, + CounterpartyChainIdQuerier, CounterpartyChainIdQuerierComponent, HasChannelEndType, + HasChannelIdType, HasClientIdType, HasClientStateFields, HasConnectionEndType, + HasConnectionIdType, HasPortIdType, }; use crate::types::channel_id::ChannelEnd; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs b/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs index 8d36fccfd..84ca46605 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs @@ -1,9 +1,7 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::nonce::query_nonce::{ - NonceQuerier, NonceQuerierComponent, +use hermes_relayer_components::transaction::traits::{ + HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; -use hermes_relayer_components::transaction::traits::types::nonce::HasNonceType; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; use starknet::accounts::ConnectedAccount; use starknet::core::types::Felt; use starknet::providers::ProviderError; 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 580e73ca6..f9aea0631 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 @@ -3,22 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::packet_commitment::{ - PacketCommitmentQuerier, PacketCommitmentQuerierComponent, +use hermes_chain_components::traits::{ + CanQueryBlock, HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, + HasPacketCommitmentType, HasPortIdType, HasSequenceType, PacketCommitmentQuerier, + PacketCommitmentQuerierComponent, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{ - HasChannelIdType, HasPortIdType, HasSequenceType, -}; -use hermes_chain_components::traits::types::packets::receive::HasPacketCommitmentType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{CommitmentPath, Path}; use starknet::core::types::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 b3da638f6..5caa6e53e 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 @@ -3,22 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::commitment_prefix::HasIbcCommitmentPrefix; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::packet_receipt::{ - PacketReceiptQuerier, PacketReceiptQuerierComponent, +use hermes_chain_components::traits::{ + CanQueryBlock, HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, + HasPacketReceiptType, HasPortIdType, HasSequenceType, PacketReceiptQuerier, + PacketReceiptQuerierComponent, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{ - HasChannelIdType, HasPortIdType, HasSequenceType, -}; -use hermes_chain_components::traits::types::packets::timeout::HasPacketReceiptType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{Path, ReceiptPath}; use starknet::core::types::Felt; 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 2910de847..66aba8333 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 @@ -3,19 +3,11 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::queries::packet_is_received::{ - PacketIsReceivedQuerier, PacketIsReceivedQuerierComponent, +use hermes_chain_components::traits::{ + HasChannelIdType, HasCommitmentProofType, HasHeightType, HasPacketCommitmentType, + HasPortIdType, HasSequenceType, PacketIsReceivedQuerier, PacketIsReceivedQuerierComponent, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{ - HasChannelIdType, HasPortIdType, HasSequenceType, -}; -use hermes_chain_components::traits::types::packets::receive::HasPacketCommitmentType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use starknet::core::types::Felt; use starknet::macros::selector; 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 647337b01..5d95cfddb 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/status.rs @@ -1,8 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::queries::chain_status::ChainStatusQuerierComponent; -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; +use hermes_chain_components::traits::ChainStatusQuerierComponent; +use hermes_core::chain_components::traits::{ChainStatusQuerier, HasChainStatusType}; +use hermes_cosmos_chain_components::types::Time; use starknet::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs b/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs index a41887787..62d95b3df 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_logging_components::traits::logger::CanLog; -use hermes_logging_components::types::level::LevelTrace; +use hermes_chain_components::traits::HasHeightType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_logging_components::traits::CanLog; +use hermes_logging_components::types::LevelTrace; use serde::de::DeserializeOwned; use serde::Serialize; use starknet::core::types::{Felt, StorageProof}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs index 11351415d..7e5f4f557 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs @@ -3,13 +3,9 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::send_message::CanSendSingleMessage; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_chain_type_components::traits::types::denom::HasDenomType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_components::traits::CanSendSingleMessage; +use hermes_chain_type_components::traits::{HasAddressType, HasDenomType}; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs index b83ab8564..3ac2dd40a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs @@ -3,11 +3,8 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::types::denom::HasDenomType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_chain_type_components::traits::HasDenomType; +use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use poseidon::Poseidon3Hasher; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs index 84e4da79f..ea19d1a11 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::denom::HasDenomType; +use hermes_chain_type_components::traits::HasDenomType; use crate::impls::queries::token_address::{ CreateCosmosTokenAddressOnStarknet, GetCosmosTokenAddressOnStarknet, 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 0eb709eaa..2de91a189 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,10 +1,8 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_encoding_components::traits::{CanDecode, HasEncoding}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 9876693da..b44d888c3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/send_message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/send_message.rs @@ -1,19 +1,13 @@ use core::fmt::Debug; use cgp::prelude::*; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_relayer_components::transaction::traits::parse_events::{ - TxMessageResponseParser, TxMessageResponseParserComponent, -}; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; -use hermes_relayer_components::transaction::traits::send_messages_with_signer_and_nonce::{ +use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_core::chain_components::traits::HasMessageType; +use hermes_relayer_components::transaction::traits::{ + CanPollTxResponse, HasNonceType, HasSignerType, HasTxHashType, HasTxResponseType, MessagesWithSignerAndNonceSender, MessagesWithSignerAndNonceSenderComponent, + TxMessageResponseParser, TxMessageResponseParserComponent, }; -use hermes_relayer_components::transaction::traits::types::nonce::HasNonceType; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; -use hermes_relayer_components::transaction::traits::types::tx_hash::HasTxHashType; -use hermes_relayer_components::transaction::traits::types::tx_response::HasTxResponseType; use starknet::accounts::Account; use starknet::core::types::{ Call, ExecuteInvocation, Felt, FunctionInvocation, RevertedInvocation, TransactionTrace, 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 032d44862..41db7e644 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 @@ -1,35 +1,25 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_chain_components::traits::commitment_prefix::HasCommitmentPrefixType; -use hermes_chain_components::traits::message_builders::connection_handshake::{ - ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, +use hermes_chain_components::traits::{ + CanQueryChainHeight, ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilder, ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilder, ConnectionOpenInitMessageBuilderComponent, - ConnectionOpenTryMessageBuilder, ConnectionOpenTryMessageBuilderComponent, + ConnectionOpenTryMessageBuilder, ConnectionOpenTryMessageBuilderComponent, HasClientIdType, + HasClientStateType, HasCommitmentPrefixType, HasCommitmentProofType, HasConnectionEndType, + HasConnectionIdType, HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, + HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, HasConsensusStateType, + HasHeightType, HasInitConnectionOptionsType, HasMessageType, }; -use hermes_chain_components::traits::queries::chain_status::CanQueryChainHeight; -use hermes_chain_components::traits::types::client_state::HasClientStateType; -use hermes_chain_components::traits::types::connection::{ - HasConnectionEndType, HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, - HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, - HasInitConnectionOptionsType, -}; -use hermes_chain_components::traits::types::consensus_state::HasConsensusStateType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::{HasClientIdType, HasConnectionIdType}; -use hermes_chain_components::traits::types::message::HasMessageType; -use hermes_chain_components::traits::types::proof::HasCommitmentProofType; use hermes_chain_components::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, ConnectionOpenTryPayload, }; -use hermes_cosmos_chain_components::traits::message::{CosmosMessage, ToCosmosMessage}; -use hermes_cosmos_chain_components::types::connection::CosmosInitConnectionOptions; -use hermes_cosmos_chain_components::types::messages::connection::open_ack::CosmosConnectionOpenAckMessage; -use hermes_cosmos_chain_components::types::messages::connection::open_confirm::CosmosConnectionOpenConfirmMessage; -use hermes_cosmos_chain_components::types::messages::connection::open_init::CosmosConnectionOpenInitMessage; -use hermes_cosmos_chain_components::types::messages::connection::open_try::CosmosConnectionOpenTryMessage; +use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_cosmos_chain_components::types::{ + CosmosConnectionOpenAckMessage, CosmosConnectionOpenConfirmMessage, + CosmosConnectionOpenInitMessage, CosmosConnectionOpenTryMessage, CosmosInitConnectionOptions, +}; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as CosmosHeight; use ibc::core::connection::types::version::Version as CosmosConnectionVersion; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs index c15a4e9bb..988d61f4d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::ibc::CounterpartyMessageHeightGetterComponent; -use hermes_cosmos_chain_components::traits::message::CosmosMessage; -use hermes_relayer_components::chain::traits::types::height::HasHeightType; -use hermes_relayer_components::chain::traits::types::ibc::CounterpartyMessageHeightGetter; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; +use hermes_chain_components::traits::CounterpartyMessageHeightGetterComponent; +use hermes_core::chain_components::traits::{ + CounterpartyMessageHeightGetter, HasHeightType, HasMessageType, +}; +use hermes_cosmos_chain_components::traits::CosmosMessage; pub struct GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs index b901bbd9d..719358765 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs @@ -1,17 +1,13 @@ use cgp::prelude::*; -use hermes_chain_components::traits::message_builders::create_client::CreateClientMessageBuilderComponent; -use hermes_cosmos_chain_components::traits::message::{CosmosMessage, ToCosmosMessage}; -use hermes_cosmos_chain_components::types::messages::client::create::CosmosCreateClientMessage; -use hermes_encoding_components::traits::convert::CanConvert; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; -use hermes_encoding_components::types::AsBytes; -use hermes_relayer_components::chain::traits::message_builders::create_client::CreateClientMessageBuilder; -use hermes_relayer_components::chain::traits::types::client_state::HasClientStateType; -use hermes_relayer_components::chain::traits::types::consensus_state::HasConsensusStateType; -use hermes_relayer_components::chain::traits::types::create_client::{ - HasCreateClientMessageOptionsType, HasCreateClientPayloadType, +use hermes_chain_components::traits::CreateClientMessageBuilderComponent; +use hermes_core::chain_components::traits::{ + CreateClientMessageBuilder, HasClientStateType, HasConsensusStateType, + HasCreateClientMessageOptionsType, HasCreateClientPayloadType, HasMessageType, }; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; +use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_cosmos_chain_components::types::CosmosCreateClientMessage; +use hermes_encoding_components::traits::{CanConvert, HasDefaultEncoding}; +use hermes_encoding_components::types::AsBytes; use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs index b6f3b9e98..f7ba3cd83 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs @@ -2,13 +2,11 @@ use core::marker::PhantomData; use std::string::FromUtf8Error; use cgp::prelude::*; -use hermes_chain_components::traits::types::ibc::{HasChannelIdType, HasPortIdType}; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_chain_type_components::traits::types::denom::HasDenomType; -use hermes_cosmos_test_components::chain::impls::transfer::amount::derive_ibc_denom; -use hermes_cosmos_test_components::chain::types::amount::Amount; -use hermes_cosmos_test_components::chain::types::denom::Denom; -use hermes_test_components::chain::traits::transfer::amount::{ +use hermes_chain_components::traits::{HasChannelIdType, HasPortIdType}; +use hermes_chain_type_components::traits::{HasAmountType, HasDenomType}; +use hermes_cosmos_test_components::chain::impls::derive_ibc_denom; +use hermes_cosmos_test_components::chain::types::{Amount, Denom}; +use hermes_test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; use ibc::core::host::types::identifiers::{ChannelId, PortId}; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs index a68a467ad..4b669dede 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs @@ -1,11 +1,9 @@ use cgp::prelude::*; -use hermes_chain_components::traits::packet::fields::{ - PacketDstChannelIdGetter, PacketDstChannelIdGetterComponent, PacketTimeoutHeightGetter, +use hermes_chain_components::traits::{ + HasChannelIdType, HasHeightType, HasOutgoingPacketType, PacketDstChannelIdGetter, + PacketDstChannelIdGetterComponent, PacketTimeoutHeightGetter, PacketTimeoutHeightGetterComponent, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::ibc::HasChannelIdType; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::TimeoutHeight; 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 7d0a096f6..a1c3806f1 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,9 +1,9 @@ use cgp::prelude::*; -use hermes_chain_components::traits::queries::consensus_state_height::ConsensusStateHeightsQuerierComponent; -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; -use hermes_relayer_components::chain::traits::types::ibc::HasIbcChainTypes; +use hermes_chain_components::traits::ConsensusStateHeightsQuerierComponent; +use hermes_core::chain_components::traits::{ + ConsensusStateHeightsQuerier, HasHeightType, HasIbcChainTypes, +}; +use hermes_cosmos_chain_components::traits::HasGrpcAddress; use http::uri::InvalidUri; use http::Uri; use ibc::core::host::types::identifiers::ClientId; 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 5567f5da6..83b0e3428 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 @@ -1,16 +1,13 @@ use cgp::prelude::*; -use hermes_chain_components::traits::message_builders::update_client::UpdateClientMessageBuilderComponent; -use hermes_cosmos_chain_components::traits::message::{CosmosMessage, ToCosmosMessage}; -use hermes_cosmos_chain_components::types::messages::client::update::CosmosUpdateClientMessage; -use hermes_encoding_components::traits::convert::CanConvert; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; +use hermes_chain_components::traits::UpdateClientMessageBuilderComponent; +use hermes_core::chain_components::traits::{ + HasIbcChainTypes, HasMessageType, HasUpdateClientPayloadType, UpdateClientMessageBuilder, +}; +use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_cosmos_chain_components::types::CosmosUpdateClientMessage; +use hermes_encoding_components::traits::{CanConvert, CanEncode, HasDefaultEncoding}; use hermes_encoding_components::types::AsBytes; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; -use hermes_relayer_components::chain::traits::message_builders::update_client::UpdateClientMessageBuilder; -use hermes_relayer_components::chain::traits::types::ibc::HasIbcChainTypes; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_relayer_components::chain::traits::types::update_client::HasUpdateClientPayloadType; use ibc::core::host::types::identifiers::ClientId; use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader}; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/impls/transfer.rs b/relayer/crates/starknet-chain-components/src/impls/transfer.rs index 1812ec74e..538981aa6 100644 --- a/relayer/crates/starknet-chain-components/src/impls/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/transfer.rs @@ -1,15 +1,14 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_cosmos_chain_components::types::status::Time; -use hermes_relayer_components::chain::traits::send_message::CanSendSingleMessage; -use hermes_relayer_components::chain::traits::types::height::HasHeightType; -use hermes_relayer_components::chain::traits::types::timestamp::{HasTimeType, HasTimeoutType}; -use hermes_test_components::chain::traits::transfer::timeout::{ +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::chain_components::traits::{ + CanSendSingleMessage, HasHeightType, HasTimeType, HasTimeoutType, +}; +use hermes_cosmos_chain_components::types::Time; +use hermes_test_components::chain::traits::{ IbcTransferTimeoutCalculator, IbcTransferTimeoutCalculatorComponent, }; -use hermes_test_components::chain::traits::types::address::HasAddressType; use ibc::primitives::Timestamp; use starknet::core::types::Felt; use starknet::macros::selector; 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 75ea23e4b..e5c0c82d3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/tx_response.rs +++ b/relayer/crates/starknet-chain-components/src/impls/tx_response.rs @@ -1,13 +1,10 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::query_tx_response::{ - TxResponseQuerier, TxResponseQuerierComponent, +use hermes_relayer_components::transaction::traits::{ + HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; -use hermes_relayer_components::transaction::traits::types::tx_hash::HasTxHashType; -use hermes_relayer_components::transaction::traits::types::tx_response::HasTxResponseType; -use hermes_runtime_components::traits::runtime::HasRuntime; -use hermes_runtime_components::traits::sleep::CanSleep; +use hermes_runtime_components::traits::{CanSleep, HasRuntime}; use starknet::core::types::{Felt, StarknetError}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/amount.rs b/relayer/crates/starknet-chain-components/src/impls/types/amount.rs index d7753ae03..a58057ae2 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/amount.rs @@ -1,20 +1,14 @@ use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; -use hermes_chain_type_components::traits::fields::amount::denom::{ - AmountDenomGetter, AmountDenomGetterComponent, +use hermes_chain_type_components::traits::{ + AmountDenomGetter, AmountDenomGetterComponent, AmountTypeProviderComponent, HasAmountType, + HasDenomType, }; -use hermes_chain_type_components::traits::types::amount::{ - AmountTypeProviderComponent, HasAmountType, +use hermes_runtime_components::traits::CanGenerateRandom; +use hermes_test_components::chain::traits::{AmountMethodsComponent, ProvideAmountMethods}; +use hermes_test_components::chain_driver::traits::{ + HasChainType, RandomAmountGenerator, RandomAmountGeneratorComponent, }; -use hermes_runtime_components::traits::random::CanGenerateRandom; -use hermes_test_components::chain::traits::types::amount::{ - AmountMethodsComponent, ProvideAmountMethods, -}; -use hermes_test_components::chain::traits::types::denom::HasDenomType; -use hermes_test_components::chain_driver::traits::fields::amount::{ - RandomAmountGenerator, RandomAmountGeneratorComponent, -}; -use hermes_test_components::chain_driver::traits::types::chain::HasChainType; use super::address::StarknetAddress; use crate::types::amount::StarknetAmount; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/block.rs b/relayer/crates/starknet-chain-components/src/impls/types/block.rs index 84363efcb..252855920 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/block.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::block::{BlockTypeComponent, ProvideBlockType}; +use hermes_chain_components::traits::{BlockTypeComponent, ProvideBlockType}; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/client.rs b/relayer/crates/starknet-chain-components/src/impls/types/client.rs index ebc4e711a..1838ed374 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/client.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/client.rs @@ -1,16 +1,14 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_chain_components::traits::types::chain_id::HasChainIdType; -use hermes_chain_components::traits::types::client_state::{ - ClientStateFieldsComponent, ClientStateTypeComponent, +use hermes_chain_components::traits::{ + ClientStateFieldsComponent, ClientStateTypeComponent, ConsensusStateTypeComponent, + HasChainIdType, }; -use hermes_chain_components::traits::types::consensus_state::ConsensusStateTypeComponent; -use hermes_relayer_components::chain::traits::types::client_state::{ - ClientStateFieldsGetter, HasClientStateType, ProvideClientStateType, +use hermes_core::chain_components::traits::{ + ClientStateFieldsGetter, HasClientStateType, HasHeightType, ProvideClientStateType, + ProvideConsensusStateType, }; -use hermes_relayer_components::chain::traits::types::consensus_state::ProvideConsensusStateType; -use hermes_relayer_components::chain::traits::types::height::HasHeightType; use ibc::core::host::types::identifiers::ChainId; use crate::types::client_state::WasmStarknetClientState; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs index 131982612..2f648672a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_components::traits::types::proof::{ +use hermes_chain_components::traits::{ CommitmentProofBytesGetter, CommitmentProofBytesGetterComponent, CommitmentProofHeightGetter, CommitmentProofHeightGetterComponent, CommitmentProofTypeProviderComponent, - HasCommitmentProofType, + HasCommitmentProofType, HasHeightType, }; use crate::types::commitment_proof::StarknetCommitmentProof; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/config.rs b/relayer/crates/starknet-chain-components/src/impls/types/config.rs index b0ce12446..0097e4b22 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/config.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/config.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use hermes_cosmos_chain_components::impls::types::config::CosmosChainConfig; +use hermes_cosmos_chain_components::impls::CosmosChainConfig; use serde::{Deserialize, Serialize}; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/denom.rs b/relayer/crates/starknet-chain-components/src/impls/types/denom.rs index d77e32068..11c93dc8c 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/denom.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/denom.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::denom::DenomTypeComponent; -use hermes_test_components::chain::traits::types::address::HasAddressType; -use hermes_test_components::chain::traits::types::denom::ProvideDenomType; +use hermes_chain_type_components::traits::{DenomTypeComponent, HasAddressType, ProvideDenomType}; pub struct ProvideTokenAddressDenom; 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 762fe4d8b..3b7e7e66d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/height.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::{ +use hermes_chain_components::traits::{ HeightAdjuster, HeightAdjusterComponent, HeightFieldComponent, HeightIncrementer, HeightIncrementerComponent, HeightTypeProviderComponent, }; -use hermes_relayer_components::chain::traits::types::height::{HasHeightType, HeightFieldGetter}; +use hermes_core::chain_components::traits::{HasHeightType, HeightFieldGetter}; pub struct ProvideStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs b/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs index e038bd4c9..59a712f81 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs @@ -1,12 +1,12 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::create_client::{ +use hermes_chain_components::traits::{ CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, + UpdateClientPayloadTypeComponent, }; -use hermes_chain_components::traits::types::update_client::UpdateClientPayloadTypeComponent; -use hermes_relayer_components::chain::traits::types::create_client::{ +use hermes_core::chain_components::traits::{ ProvideCreateClientPayloadOptionsType, ProvideCreateClientPayloadType, + ProvideUpdateClientPayloadType, }; -use hermes_relayer_components::chain::traits::types::update_client::ProvideUpdateClientPayloadType; use crate::types::payloads::client::{ StarknetCreateClientPayload, StarknetCreateClientPayloadOptions, StarknetUpdateClientPayload, diff --git a/relayer/crates/starknet-chain-components/src/impls/types/status.rs b/relayer/crates/starknet-chain-components/src/impls/types/status.rs index 6a38c6537..480209795 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/status.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::status::ChainStatusTypeComponent; -use hermes_chain_type_components::traits::types::time::HasTimeType; -use hermes_cosmos_chain_components::types::status::Time; -use hermes_relayer_components::chain::traits::types::height::HasHeightType; -use hermes_relayer_components::chain::traits::types::status::ProvideChainStatusType; +use hermes_chain_components::traits::ChainStatusTypeComponent; +use hermes_chain_type_components::traits::HasTimeType; +use hermes_core::chain_components::traits::{HasHeightType, ProvideChainStatusType}; +use hermes_cosmos_chain_components::types::Time; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs b/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs index 48506f530..3add602c6 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::time::{ProvideTimeType, TimeTypeComponent}; +use hermes_chain_type_components::traits::{ProvideTimeType, TimeTypeComponent}; pub struct ProvideStarknetTimeType; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs b/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs index 412c611e7..1e66ad4df 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; -use hermes_test_components::chain::traits::types::address::HasAddressType; -use hermes_test_components::chain::traits::types::wallet::{ +use hermes_chain_type_components::traits::HasAddressType; +use hermes_relayer_components::transaction::traits::HasSignerType; +use hermes_test_components::chain::traits::{ HasWalletType, ProvideWalletType, WalletSignerComponent, WalletSignerProvider, WalletTypeComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/traits/account.rs b/relayer/crates/starknet-chain-components/src/traits/account.rs index 206ad93cc..17ac2ca32 100644 --- a/relayer/crates/starknet-chain-components/src/traits/account.rs +++ b/relayer/crates/starknet-chain-components/src/traits/account.rs @@ -1,6 +1,6 @@ use cgp::core::macros::blanket_trait; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; +use hermes_relayer_components::transaction::traits::HasSignerType; use starknet::accounts::{Account, AccountError, ConnectedAccount}; #[cgp_type { diff --git a/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs index a4fb02920..769434e85 100644 --- a/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; use starknet::core::types::Felt; use crate::traits::types::commitment::HasMerkleProofType; 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 592fc7217..08a7843d8 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs @@ -1,6 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::height::HasHeightType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasHeightType}; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; 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 883ffa1e1..9cd20e02a 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; use crate::traits::types::blob::HasBlobType; use crate::traits::types::contract_class::HasContractClassHashType; 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 1bcef5a25..84012bfa7 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs @@ -1,6 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasMessageResponseType}; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/message.rs b/relayer/crates/starknet-chain-components/src/traits/contract/message.rs index 9aabc6712..ea1ec23f6 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/message.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/message.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_components::traits::HasMessageType; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; 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 97b208c2a..3bc04fc55 100644 --- a/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs @@ -1,7 +1,6 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::chain_components::traits::HasMessageType; #[cgp_component { name: TransferTokenMessageBuilderComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs index dc57a275b..9f1044611 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; #[cgp_component { name: ContractAddressQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs b/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs index 9ddbcfb44..1d3d2a736 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_components::traits::HasHeightType; +use hermes_chain_type_components::traits::HasAddressType; use crate::traits::types::storage_proof::{HasStorageKeyType, HasStorageProofType}; diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs index aa127af9b..6a90b8e80 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::denom::HasDenomType; +use hermes_chain_type_components::traits::HasDenomType; use crate::types::messages::ibc::denom::PrefixedDenom; 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 950e02721..4a482031c 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 @@ -1,6 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; #[cgp_component { name: TokenBalanceQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/signer.rs b/relayer/crates/starknet-chain-components/src/traits/signer.rs index f6f9088a3..d3ef62f6f 100644 --- a/relayer/crates/starknet-chain-components/src/traits/signer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/signer.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; +use hermes_relayer_components::transaction::traits::HasSignerType; #[cgp_getter { provider: StarknetSignerGetter, diff --git a/relayer/crates/starknet-chain-components/src/traits/transfer.rs b/relayer/crates/starknet-chain-components/src/traits/transfer.rs index 7bed54e1b..6cd16d4b8 100644 --- a/relayer/crates/starknet-chain-components/src/traits/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/transfer.rs @@ -1,6 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; #[cgp_component { name: TokenTransferComponent, diff --git a/relayer/crates/starknet-chain-components/src/types/channel_id.rs b/relayer/crates/starknet-chain-components/src/types/channel_id.rs index a4a9ac716..9fecaab3c 100644 --- a/relayer/crates/starknet-chain-components/src/types/channel_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/channel_id.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::core::channel::types::channel::{ ChannelEnd, Counterparty as ChannelCounterparty, State as ChannelState, diff --git a/relayer/crates/starknet-chain-components/src/types/client_id.rs b/relayer/crates/starknet-chain-components/src/types/client_id.rs index 29a93987f..50825486e 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_id.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::core::host::types::identifiers::ClientId; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/types/client_state.rs b/relayer/crates/starknet-chain-components/src/types/client_state.rs index e08865981..204c6f293 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_state.rs @@ -1,10 +1,9 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::convert::{CanConvert, Converter, ConverterComponent}; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{ + CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, +}; use hermes_protobuf_encoding_components::types::strategy::ViaAny; -use hermes_wasm_encoding_components::types::client_state::WasmClientState; +use hermes_wasm_encoding_components::types::WasmClientState; pub use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/types/connection_id.rs b/relayer/crates/starknet-chain-components/src/types/connection_id.rs index f9cba939f..4172e7669 100644 --- a/relayer/crates/starknet-chain-components/src/types/connection_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/connection_id.rs @@ -2,13 +2,10 @@ use core::time::Duration; use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, + Transformer, TransformerRef, }; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; -use hermes_encoding_components::traits::transform::{Transformer, TransformerRef}; pub use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; 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 96a4e23c6..818507e33 100644 --- a/relayer/crates/starknet-chain-components/src/types/consensus_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/consensus_state.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::convert::{Converter, ConverterComponent}; -use hermes_wasm_encoding_components::impls::strategies::consensus_state::{ +use hermes_encoding_components::traits::{Converter, ConverterComponent}; +use hermes_wasm_encoding_components::impls::{ DecodeViaWasmConsensusState, EncodeViaWasmConsensusState, }; pub use ibc_client_starknet_types::StarknetConsensusState; 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 8bf646521..10a426954 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 @@ -2,17 +2,12 @@ use core::time::Duration; use cgp::core::types::WithType; use cgp::prelude::*; -use hermes_chain_components::traits::types::chain_id::HasChainIdType; -use hermes_chain_components::traits::types::client_state::{ - ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, - HasClientStateType, +use hermes_chain_components::traits::{ + ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasChainIdType, + HasClientStateType, HasHeightType, }; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; use ibc::clients::tendermint::types::{ AllowUpdate, ClientState as IbcCometClientState, TrustThreshold, diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs index 72de8626e..53bb00342 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs @@ -1,11 +1,7 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders; -use hermes_encoding_components::impls::encode_mut::field::EncodeField; -use hermes_encoding_components::impls::encode_mut::from::DecodeFrom; -use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::transform::Transformer; +use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; #[derive(Debug, Clone, HasField)] pub struct Height { diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs index 0f3d4e04f..c87c27dc9 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs @@ -1,9 +1,6 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::primitives::Timestamp; diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs index 21da9bd19..293d22eda 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs @@ -1,12 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, + Transformer, TransformerRef, }; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; -use hermes_encoding_components::traits::transform::{Transformer, TransformerRef}; use ibc::clients::tendermint::types::Header as TendermintLcHeader; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as IbcHeight; 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 c9a2401b6..d4f4c864a 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/channel.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/channel.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::decode::{CanDecode, Decoder, DecoderComponent}; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{ + CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, +}; use starknet::core::types::Felt; use starknet::macros::selector; 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 a8fb1f3aa..bfeab725a 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/connection.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/connection.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::decode::{CanDecode, Decoder, DecoderComponent}; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{ + CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, +}; use starknet::core::types::Felt; use starknet::macros::selector; 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 95dd6c31c..2b64455e6 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/erc20.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/erc20.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::decode::{CanDecode, Decoder, DecoderComponent}; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{ + CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, +}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 f3830708a..f1100022d 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/ics20.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/ics20.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::decode::{CanDecode, Decoder, DecoderComponent}; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{ + CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, +}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 a99ec5bad..66ed2e814 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/packet.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/packet.rs @@ -1,9 +1,9 @@ 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, DecoderComponent}; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; +use hermes_encoding_components::traits::{ + CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, +}; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/types/message_response.rs b/relayer/crates/starknet-chain-components/src/types/message_response.rs index 2b4cc4e07..2c441b7fd 100644 --- a/relayer/crates/starknet-chain-components/src/types/message_response.rs +++ b/relayer/crates/starknet-chain-components/src/types/message_response.rs @@ -1,10 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::event::HasEventType; -use hermes_chain_type_components::traits::fields::message_response_events::{ - MessageResponseEventsGetter, MessageResponseEventsGetterComponent, -}; -use hermes_chain_type_components::traits::types::message_response::{ - HasMessageResponseType, MessageResponseTypeComponent, ProvideMessageResponseType, +use hermes_chain_components::traits::HasEventType; +use hermes_chain_type_components::traits::{ + HasMessageResponseType, MessageResponseEventsGetter, MessageResponseEventsGetterComponent, + MessageResponseTypeComponent, ProvideMessageResponseType, }; use starknet::core::types::Felt; 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 11cb82aa3..460114560 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 @@ -1,11 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_test_components::chain::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::chain_components::traits::HasMessageType; +use hermes_encoding_components::traits::{CanEncode, HasEncoding}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs index 2edfdca49..6675c52c9 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; -use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; -use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; -use hermes_encoding_components::traits::transform::{Transformer, TransformerRef}; +use hermes_encoding_components::traits::{ + MutDecoderComponent, MutEncoderComponent, Transformer, TransformerRef, +}; pub use ibc::core::channel::types::channel::Order as ChannelOrdering; pub use ibc::core::channel::types::Version as AppVersion; pub use ibc::core::host::types::identifiers::PortId; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs index d6c222170..85fc6b729 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs @@ -1,11 +1,8 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, -}; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::core::commitment_types::commitment::CommitmentPrefix as BasePrefix; pub use ibc::core::connection::types::version::Version as ConnectionVersion; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs index 4fc852035..fa8aaa679 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs @@ -1,15 +1,10 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders; -use hermes_encoding_components::impls::encode_mut::field::EncodeField; -use hermes_encoding_components::impls::encode_mut::from::DecodeFrom; -use hermes_encoding_components::traits::decode_mut::{ - CanDecodeMut, MutDecoder, MutDecoderComponent, +use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_encoding_components::traits::{ + CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, + Transformer, }; -use hermes_encoding_components::traits::encode_mut::{ - CanEncodeMut, MutEncoder, MutEncoderComponent, -}; -use hermes_encoding_components::traits::transform::Transformer; pub use ibc::core::host::types::identifiers::Sequence; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/types/status.rs b/relayer/crates/starknet-chain-components/src/types/status.rs index 13147be09..6e0cb9f25 100644 --- a/relayer/crates/starknet-chain-components/src/types/status.rs +++ b/relayer/crates/starknet-chain-components/src/types/status.rs @@ -1,6 +1,6 @@ use core::fmt::{Display, Formatter, Result}; -use hermes_cosmos_chain_components::types::status::Time; +use hermes_cosmos_chain_components::types::Time; use serde::Serialize; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-context/Cargo.toml b/relayer/crates/starknet-chain-context/Cargo.toml index 47d5c881a..a36771bda 100644 --- a/relayer/crates/starknet-chain-context/Cargo.toml +++ b/relayer/crates/starknet-chain-context/Cargo.toml @@ -14,6 +14,9 @@ workspace = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } ibc = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index bab6ff95e..a907840e4 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -9,144 +9,69 @@ use cgp::prelude::*; use futures::lock::Mutex; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::queries::block::{BlockQuerierComponent, CanQueryBlock}; -use hermes_chain_components::traits::queries::block_events::BlockEventsQuerierComponent; -use hermes_chain_components::traits::queries::block_time::{ - BlockTimeQuerierComponent, CanQueryBlockTime, +use hermes_chain_components::traits::{ + BlockEventsQuerierComponent, BlockQuerierComponent, BlockTimeQuerierComponent, CanQueryBlock, + CanQueryBlockTime, CanQueryPacketAckCommitment, ChainStatusQuerierComponent, HasBlockType, + HasChainStatusType, HasInitChannelOptionsType, HasTimeoutType, PollIntervalGetterComponent, +}; +use hermes_chain_type_components::traits::{ + ChainIdGetterComponent, HasAddressType, HasChainId, HasCommitmentProofType, HasHeightType, + HasMessageResponseType, HasTimeType, +}; +use hermes_core::chain_components::traits::{ + CanBuildAckPacketMessage, CanBuildAckPacketPayload, CanBuildChannelOpenAckMessage, + CanBuildChannelOpenAckPayload, CanBuildChannelOpenConfirmMessage, + CanBuildChannelOpenConfirmPayload, CanBuildChannelOpenInitMessage, + CanBuildChannelOpenTryMessage, CanBuildChannelOpenTryPayload, CanBuildConnectionOpenAckMessage, + CanBuildConnectionOpenAckPayload, CanBuildConnectionOpenConfirmMessage, + CanBuildConnectionOpenConfirmPayload, CanBuildConnectionOpenInitMessage, + CanBuildConnectionOpenInitPayload, CanBuildConnectionOpenTryMessage, + CanBuildConnectionOpenTryPayload, CanBuildCreateClientMessage, CanBuildCreateClientPayload, + CanBuildPacketFromWriteAck, CanBuildReceivePacketMessage, CanBuildReceivePacketPayload, + CanBuildTimeoutUnorderedPacketMessage, CanBuildTimeoutUnorderedPacketPayload, + CanBuildUpdateClientMessage, CanBuildUpdateClientPayload, CanExtractFromEvent, + CanExtractFromMessageResponse, CanFilterIncomingPacket, CanFilterOutgoingPacket, + CanQueryBlockEvents, CanQueryChainHeight, CanQueryChainStatus, CanQueryChannelEnd, + CanQueryChannelEndWithProofs, CanQueryClientState, CanQueryClientStateWithLatestHeight, + CanQueryClientStateWithProofs, CanQueryConnectionEnd, CanQueryConnectionEndWithProofs, + CanQueryConsensusState, CanQueryConsensusStateHeight, CanQueryConsensusStateHeights, + CanQueryConsensusStateWithProofs, CanQueryCounterpartyChainId, CanQueryPacketCommitment, + CanQueryPacketIsReceived, CanQueryPacketReceipt, CanSendMessages, CanSendSingleMessage, + HasAcknowledgementType, HasChannelEndType, HasChannelIdType, HasChannelOpenTryEvent, + HasClientIdType, HasClientStateFields, HasClientStateType, HasCommitmentPrefixType, + HasConnectionEndType, HasConnectionIdType, HasConnectionOpenAckPayloadType, + HasConnectionOpenConfirmPayloadType, HasConnectionOpenInitPayloadType, + HasConnectionOpenTryEvent, HasConnectionOpenTryPayloadType, HasConsensusStateType, + HasCounterpartyMessageHeight, HasCreateClientEvent, HasCreateClientMessageOptionsType, + HasCreateClientPayloadOptionsType, HasEventType, HasIbcCommitmentPrefix, + HasInitConnectionOptionsType, HasOutgoingPacketType, HasPacketCommitmentType, + HasPacketDstChannelId, HasPacketDstPortId, HasPacketReceiptType, HasPacketSequence, + HasPacketSrcChannelId, HasPacketSrcPortId, HasPacketTimeoutHeight, HasPacketTimeoutTimestamp, + HasPortIdType, HasSendPacketEvent, HasSequenceType, HasUpdateClientPayloadType, + HasWriteAckEvent, PacketCommitmentQuerierComponent, +}; +use hermes_cosmos_chain_components::types::{ + CosmosInitChannelOptions, CosmosInitConnectionOptions, CosmosUpdateClientPayload, + Secp256k1KeyPair, Time, }; -use hermes_chain_components::traits::queries::chain_status::ChainStatusQuerierComponent; -use hermes_chain_components::traits::queries::packet_acknowledgement::CanQueryPacketAckCommitment; -use hermes_chain_components::traits::types::block::HasBlockType; -use hermes_chain_components::traits::types::channel::HasInitChannelOptionsType; -use hermes_chain_components::traits::types::poll_interval::PollIntervalGetterComponent; -use hermes_chain_components::traits::types::status::HasChainStatusType; -use hermes_chain_components::traits::types::timestamp::HasTimeoutType; -use hermes_chain_type_components::traits::fields::chain_id::{ChainIdGetterComponent, HasChainId}; -use hermes_chain_type_components::traits::types::commitment_proof::HasCommitmentProofType; -use hermes_chain_type_components::traits::types::height::HasHeightType; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_chain_type_components::traits::types::time::HasTimeType; -use hermes_cosmos_chain_components::types::channel::CosmosInitChannelOptions; -use hermes_cosmos_chain_components::types::connection::CosmosInitConnectionOptions; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_cosmos_chain_components::types::payloads::client::CosmosUpdateClientPayload; -use hermes_cosmos_chain_components::types::status::Time; use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_encoding_components::traits::has_encoding::{ +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_encoding_components::traits::{ DefaultEncodingGetter, DefaultEncodingGetterComponent, EncodingGetter, EncodingGetterComponent, EncodingTypeProviderComponent, HasDefaultEncoding, }; use hermes_encoding_components::types::AsBytes; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; -use hermes_relayer_components::chain::traits::commitment_prefix::{ - HasCommitmentPrefixType, HasIbcCommitmentPrefix, -}; -use hermes_relayer_components::chain::traits::extract_data::{ - CanExtractFromEvent, CanExtractFromMessageResponse, -}; -use hermes_relayer_components::chain::traits::message_builders::ack_packet::CanBuildAckPacketMessage; -use hermes_relayer_components::chain::traits::message_builders::channel_handshake::{ - CanBuildChannelOpenAckMessage, CanBuildChannelOpenConfirmMessage, - CanBuildChannelOpenInitMessage, CanBuildChannelOpenTryMessage, -}; -use hermes_relayer_components::chain::traits::message_builders::connection_handshake::{ - CanBuildConnectionOpenAckMessage, CanBuildConnectionOpenConfirmMessage, - CanBuildConnectionOpenInitMessage, CanBuildConnectionOpenTryMessage, -}; -use hermes_relayer_components::chain::traits::message_builders::create_client::CanBuildCreateClientMessage; -use hermes_relayer_components::chain::traits::message_builders::receive_packet::CanBuildReceivePacketMessage; -use hermes_relayer_components::chain::traits::message_builders::timeout_unordered_packet::CanBuildTimeoutUnorderedPacketMessage; -use hermes_relayer_components::chain::traits::message_builders::update_client::CanBuildUpdateClientMessage; -use hermes_relayer_components::chain::traits::packet::fields::{ - HasPacketDstChannelId, HasPacketDstPortId, HasPacketSequence, HasPacketSrcChannelId, - HasPacketSrcPortId, HasPacketTimeoutHeight, HasPacketTimeoutTimestamp, -}; -use hermes_relayer_components::chain::traits::packet::filter::{ - CanFilterIncomingPacket, CanFilterOutgoingPacket, -}; -use hermes_relayer_components::chain::traits::packet::from_write_ack::CanBuildPacketFromWriteAck; -use hermes_relayer_components::chain::traits::payload_builders::ack_packet::CanBuildAckPacketPayload; -use hermes_relayer_components::chain::traits::payload_builders::channel_handshake::{ - CanBuildChannelOpenAckPayload, CanBuildChannelOpenConfirmPayload, CanBuildChannelOpenTryPayload, -}; -use hermes_relayer_components::chain::traits::payload_builders::connection_handshake::{ - CanBuildConnectionOpenAckPayload, CanBuildConnectionOpenConfirmPayload, - CanBuildConnectionOpenInitPayload, CanBuildConnectionOpenTryPayload, -}; -use hermes_relayer_components::chain::traits::payload_builders::create_client::CanBuildCreateClientPayload; -use hermes_relayer_components::chain::traits::payload_builders::receive_packet::CanBuildReceivePacketPayload; -use hermes_relayer_components::chain::traits::payload_builders::timeout_unordered_packet::CanBuildTimeoutUnorderedPacketPayload; -use hermes_relayer_components::chain::traits::payload_builders::update_client::CanBuildUpdateClientPayload; -use hermes_relayer_components::chain::traits::queries::block_events::CanQueryBlockEvents; -use hermes_relayer_components::chain::traits::queries::chain_status::{ - CanQueryChainHeight, CanQueryChainStatus, -}; -use hermes_relayer_components::chain::traits::queries::channel_end::{ - CanQueryChannelEnd, CanQueryChannelEndWithProofs, -}; -use hermes_relayer_components::chain::traits::queries::client_state::{ - CanQueryClientState, CanQueryClientStateWithLatestHeight, CanQueryClientStateWithProofs, -}; -use hermes_relayer_components::chain::traits::queries::connection_end::{ - CanQueryConnectionEnd, CanQueryConnectionEndWithProofs, -}; -use hermes_relayer_components::chain::traits::queries::consensus_state::{ - CanQueryConsensusState, CanQueryConsensusStateWithProofs, -}; -use hermes_relayer_components::chain::traits::queries::consensus_state_height::{ - CanQueryConsensusStateHeight, CanQueryConsensusStateHeights, -}; -use hermes_relayer_components::chain::traits::queries::counterparty_chain_id::CanQueryCounterpartyChainId; -use hermes_relayer_components::chain::traits::queries::packet_commitment::{ - CanQueryPacketCommitment, PacketCommitmentQuerierComponent, -}; -use hermes_relayer_components::chain::traits::queries::packet_is_received::CanQueryPacketIsReceived; -use hermes_relayer_components::chain::traits::queries::packet_receipt::CanQueryPacketReceipt; -use hermes_relayer_components::chain::traits::send_message::{ - CanSendMessages, CanSendSingleMessage, -}; -use hermes_relayer_components::chain::traits::types::channel::HasChannelEndType; -use hermes_relayer_components::chain::traits::types::client_state::{ - HasClientStateFields, HasClientStateType, -}; -use hermes_relayer_components::chain::traits::types::connection::{ - HasConnectionEndType, HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, - HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, - HasInitConnectionOptionsType, -}; -use hermes_relayer_components::chain::traits::types::consensus_state::HasConsensusStateType; -use hermes_relayer_components::chain::traits::types::create_client::{ - HasCreateClientEvent, HasCreateClientMessageOptionsType, HasCreateClientPayloadOptionsType, -}; -use hermes_relayer_components::chain::traits::types::event::HasEventType; -use hermes_relayer_components::chain::traits::types::ibc::{ - HasChannelIdType, HasClientIdType, HasConnectionIdType, HasCounterpartyMessageHeight, - HasPortIdType, HasSequenceType, -}; -use hermes_relayer_components::chain::traits::types::ibc_events::channel::HasChannelOpenTryEvent; -use hermes_relayer_components::chain::traits::types::ibc_events::connection::HasConnectionOpenTryEvent; -use hermes_relayer_components::chain::traits::types::ibc_events::send_packet::HasSendPacketEvent; -use hermes_relayer_components::chain::traits::types::ibc_events::write_ack::HasWriteAckEvent; -use hermes_relayer_components::chain::traits::types::packet::HasOutgoingPacketType; -use hermes_relayer_components::chain::traits::types::packets::ack::HasAcknowledgementType; -use hermes_relayer_components::chain::traits::types::packets::receive::HasPacketCommitmentType; -use hermes_relayer_components::chain::traits::types::packets::timeout::HasPacketReceiptType; -use hermes_relayer_components::chain::traits::types::update_client::HasUpdateClientPayloadType; +use hermes_logging_components::traits::LoggerComponent; use hermes_relayer_components::error::traits::HasRetryableError; -use hermes_relayer_components::transaction::impls::global_nonce_mutex::GetGlobalNonceMutex; -use hermes_relayer_components::transaction::traits::default_signer::DefaultSignerGetterComponent; -use hermes_relayer_components::transaction::traits::nonce::allocate_nonce::CanAllocateNonce; -use hermes_relayer_components::transaction::traits::nonce::nonce_mutex::NonceAllocationMutexGetterComponent; -use hermes_relayer_components::transaction::traits::nonce::query_nonce::CanQueryNonce; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; -use hermes_relayer_components::transaction::traits::query_tx_response::CanQueryTxResponse; -use hermes_relayer_components::transaction::traits::send_messages_with_signer::CanSendMessagesWithSigner; -use hermes_relayer_components::transaction::traits::send_messages_with_signer_and_nonce::CanSendMessagesWithSignerAndNonce; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; +use hermes_relayer_components::transaction::impls::GetGlobalNonceMutex; +use hermes_relayer_components::transaction::traits::{ + CanAllocateNonce, CanPollTxResponse, CanQueryNonce, CanQueryTxResponse, + CanSendMessagesWithSigner, CanSendMessagesWithSignerAndNonce, DefaultSignerGetterComponent, + HasSignerType, NonceAllocationMutexGetterComponent, +}; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ +use hermes_runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; @@ -189,19 +114,12 @@ use hermes_starknet_chain_components::types::payloads::client::{ }; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_test_components::chain::traits::assert::eventual_amount::CanAssertEventualAmount; -use hermes_test_components::chain::traits::messages::ibc_transfer::CanBuildIbcTokenTransferMessages; -use hermes_test_components::chain::traits::queries::balance::CanQueryBalance; -use hermes_test_components::chain::traits::transfer::amount::{ - CanConvertIbcTransferredAmount, IbcTransferredAmountConverterComponent, -}; -use hermes_test_components::chain::traits::transfer::ibc_transfer::CanIbcTransferToken; -use hermes_test_components::chain::traits::transfer::timeout::{ - CanCalculateIbcTransferTimeout, IbcTransferTimeoutCalculatorComponent, +use hermes_test_components::chain::traits::{ + CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanCalculateIbcTransferTimeout, + CanConvertIbcTransferredAmount, CanIbcTransferToken, CanQueryBalance, HasMemoType, + IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, }; -use hermes_test_components::chain::traits::types::address::HasAddressType; -use hermes_test_components::chain::traits::types::memo::HasMemoType; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::channel::types::packet::Packet; use ibc::core::host::types::identifiers::{ChainId, PortId as IbcPortId, Sequence}; use ibc::primitives::Timestamp; 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 5466c9ed8..1e5d82796 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs @@ -7,18 +7,12 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::impls::default_encoding::GetDefaultEncoding; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::decode_mut::CanPeekDecodeBuffer; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::encode_and_decode::CanEncodeAndDecode; -use hermes_encoding_components::traits::has_encoding::{ - DefaultEncodingGetter, DefaultEncodingGetterComponent, EncodingGetterComponent, - EncodingTypeProviderComponent, HasEncodingType, +use hermes_encoding_components::impls::GetDefaultEncoding; +use hermes_encoding_components::traits::{ + CanDecode, CanEncode, CanEncodeAndDecode, CanPeekDecodeBuffer, DefaultEncodingGetter, + DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, + HasDecodeBufferType, HasEncodeBufferType, HasEncodedType, HasEncodingType, }; -use hermes_encoding_components::traits::types::decode_buffer::HasDecodeBufferType; -use hermes_encoding_components::traits::types::encode_buffer::HasEncodeBufferType; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; use hermes_error::impls::UseHermesError; use hermes_error::types::HermesError; use hermes_starknet_chain_components::components::encoding::cairo::*; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs index c959520c2..a180c5301 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs @@ -6,12 +6,10 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::decode::CanDecode; -use hermes_encoding_components::traits::has_encoding::{ - DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, - HasEncoding, +use hermes_encoding_components::traits::{ + CanDecode, DefaultEncodingGetterComponent, EncodingGetterComponent, + EncodingTypeProviderComponent, HasEncodedType, HasEncoding, }; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::components::encoding::event::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index f5a18b851..7fa1cb1d2 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -1,9 +1,9 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; -use hermes_encoding_components::traits::convert::CanConvertBothWays; -use hermes_encoding_components::traits::encode_and_decode::CanEncodeAndDecode; -use hermes_encoding_components::traits::encode_and_decode_mut::CanEncodeAndDecodeMut; +use hermes_encoding_components::traits::{ + CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, +}; use hermes_error::impls::UseHermesError; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; @@ -14,8 +14,7 @@ use hermes_starknet_chain_components::types::client_state::{ use hermes_starknet_chain_components::types::consensus_state::{ StarknetConsensusState, WasmStarknetConsensusState, }; -use hermes_wasm_encoding_components::types::client_state::WasmClientState; -use hermes_wasm_encoding_components::types::consensus_state::WasmConsensusState; +use hermes_wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use ibc::clients::wasm_types::client_message::ClientMessage; use ibc::core::commitment_types::commitment::CommitmentRoot; use ibc::primitives::Timestamp; diff --git a/relayer/crates/starknet-chain-context/src/impls/build_account.rs b/relayer/crates/starknet-chain-context/src/impls/build_account.rs index fec119741..19383fb10 100644 --- a/relayer/crates/starknet-chain-context/src/impls/build_account.rs +++ b/relayer/crates/starknet-chain-context/src/impls/build_account.rs @@ -2,8 +2,8 @@ use core::str::FromStr; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_components::traits::types::chain_id::HasChainId; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; +use hermes_chain_components::traits::HasChainId; +use hermes_relayer_components::transaction::traits::HasSignerType; use hermes_starknet_chain_components::traits::account::{ AccountFromSignerBuilder, AccountFromSignerBuilderComponent, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-chain-context/src/impls/error.rs b/relayer/crates/starknet-chain-context/src/impls/error.rs index 55661e5f6..be92c5841 100644 --- a/relayer/crates/starknet-chain-context/src/impls/error.rs +++ b/relayer/crates/starknet-chain-context/src/impls/error.rs @@ -11,27 +11,20 @@ use hermes_cairo_encoding_components::impls::encode_mut::bool::DecodeBoolError; use hermes_cairo_encoding_components::impls::encode_mut::end::NonEmptyBuffer; use hermes_cairo_encoding_components::impls::encode_mut::felt::UnexpectedEndOfBuffer; use hermes_cairo_encoding_components::impls::encode_mut::variant::VariantIndexOutOfBound; -use hermes_chain_components::impls::payload_builders::packet::InvalidTimeoutReceipt; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_chain_type_components::traits::types::height::HasHeightType; -use hermes_error::handlers::debug::DebugError; -use hermes_error::handlers::display::DisplayError; -use hermes_error::handlers::identity::ReturnError; -use hermes_error::handlers::infallible::HandleInfallible; -use hermes_error::handlers::report::ReportError; +use hermes_chain_components::impls::InvalidTimeoutReceipt; +use hermes_chain_components::traits::HasOutgoingPacketType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasHeightType}; +use hermes_core::chain_components::traits::{EmptyMessageResponse, HasClientIdType}; +use hermes_error::handlers::{ + DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, +}; use hermes_error::types::Error; -use hermes_protobuf_encoding_components::impls::any::TypeUrlMismatchError; -use hermes_protobuf_encoding_components::impls::encode_mut::chunk::{ - InvalidWireType, UnsupportedWireType, +use hermes_protobuf_encoding_components::impls::{ + InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::RequiredFieldTagNotFound; -use hermes_relayer_components::chain::impls::queries::consensus_state_height::NoConsensusStateAtLessThanHeight; -use hermes_relayer_components::chain::traits::send_message::EmptyMessageResponse; -use hermes_relayer_components::chain::traits::types::ibc::HasClientIdType; -use hermes_relayer_components::transaction::impls::poll_tx_response::TxNoResponseError; -use hermes_relayer_components::transaction::traits::types::tx_hash::HasTxHashType; +use hermes_relayer_components::chain::impls::NoConsensusStateAtLessThanHeight; +use hermes_relayer_components::transaction::impls::TxNoResponseError; +use hermes_relayer_components::transaction::traits::HasTxHashType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::error::account::RaiseAccountError; use hermes_starknet_chain_components::impls::error::provider::RaiseProviderError; @@ -40,8 +33,9 @@ use hermes_starknet_chain_components::impls::queries::consensus_state::Consensus use hermes_starknet_chain_components::impls::queries::contract_address::ContractAddressNotFound; use hermes_starknet_chain_components::impls::send_message::UnexpectedTransactionTraceType; use hermes_starknet_chain_components::types::event::UnknownEvent; -use hermes_test_components::chain::impls::assert::poll_assert_eventual_amount::EventualAmountTimeoutError; -use hermes_test_components::chain::impls::ibc_transfer::MissingSendPacketEventError; +use hermes_test_components::chain::impls::{ + EventualAmountTimeoutError, MissingSendPacketEventError, +}; use ibc::core::channel::types::error::ChannelError; use ibc::core::client::types::error::ClientError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-cli/bin/hermes_starknet.rs b/relayer/crates/starknet-cli/bin/hermes_starknet.rs index 24d3f8a1e..b6906c5c0 100644 --- a/relayer/crates/starknet-cli/bin/hermes_starknet.rs +++ b/relayer/crates/starknet-cli/bin/hermes_starknet.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use clap::Parser; use eyre::{eyre, Error}; -use hermes_cli_components::traits::command::CanRunCommand; +use hermes_cli_components::traits::CanRunCommand; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_cli::commands::all::AllSubCommands; use hermes_starknet_cli::contexts::app::StarknetApp; diff --git a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs index 123221152..254c78fbe 100644 --- a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs +++ b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs @@ -5,23 +5,18 @@ use core::time::Duration; use std::sync::Arc; use cgp::extra::run::CanRun; -use hermes_chain_components::traits::queries::chain_status::{ - CanQueryChainHeight, CanQueryChainStatus, +use hermes_chain_components::traits::{ + CanQueryChainHeight, CanQueryChainStatus, CanQueryChannelEnd, + CanQueryClientStateWithLatestHeight, CanQueryConnectionEnd, HasChainId, }; -use hermes_chain_components::traits::queries::channel_end::CanQueryChannelEnd; -use hermes_chain_components::traits::queries::client_state::CanQueryClientStateWithLatestHeight; -use hermes_chain_components::traits::queries::connection_end::CanQueryConnectionEnd; -use hermes_chain_components::traits::types::chain_id::HasChainId; -use hermes_cli_components::traits::build::CanLoadBuilder; -use hermes_cosmos_chain_components::types::channel::CosmosInitChannelOptions; -use hermes_cosmos_chain_components::types::connection::CosmosInitConnectionOptions; -use hermes_cosmos_chain_components::types::payloads::client::CosmosCreateClientOptions; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cli_components::traits::CanLoadBuilder; +use hermes_cosmos_chain_components::types::{ + CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, +}; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::Error; -use hermes_relayer_components::relay::impls::channel::bootstrap::CanBootstrapChannel; -use hermes_relayer_components::relay::impls::connection::bootstrap::CanBootstrapConnection; -use hermes_relayer_components::relay::traits::client_creator::CanCreateClient; -use hermes_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget}; +use hermes_relayer_components::relay::impls::{CanBootstrapChannel, CanBootstrapConnection}; +use hermes_relayer_components::relay::traits::{CanCreateClient, DestinationTarget, SourceTarget}; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-cli/src/commands/all.rs b/relayer/crates/starknet-cli/src/commands/all.rs index b1bdf51be..184929b25 100644 --- a/relayer/crates/starknet-cli/src/commands/all.rs +++ b/relayer/crates/starknet-cli/src/commands/all.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, -}; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; use crate::commands::bootstrap::BootstrapSubCommand; use crate::commands::create::subcommand::CreateSubCommand; diff --git a/relayer/crates/starknet-cli/src/commands/bootstrap.rs b/relayer/crates/starknet-cli/src/commands/bootstrap.rs index b45c41ecf..3e2397d7a 100644 --- a/relayer/crates/starknet-cli/src/commands/bootstrap.rs +++ b/relayer/crates/starknet-cli/src/commands/bootstrap.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, -}; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; use crate::impls::bootstrap::osmosis_chain::BootstrapOsmosisChainArgs; use crate::impls::bootstrap::starknet_chain::BootstrapStarknetChainArgs; diff --git a/relayer/crates/starknet-cli/src/commands/create/subcommand.rs b/relayer/crates/starknet-cli/src/commands/create/subcommand.rs index 7c830498f..05bf8ee1d 100644 --- a/relayer/crates/starknet-cli/src/commands/create/subcommand.rs +++ b/relayer/crates/starknet-cli/src/commands/create/subcommand.rs @@ -1,10 +1,7 @@ use cgp::prelude::*; -use hermes_cli::commands::channel::CreateChannelArgs; -use hermes_cli::commands::client::create::CreateCosmosClientArgs; -use hermes_cli_components::impls::commands::connection::create::CreateConnectionArgs; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, -}; +use hermes_cli::commands::{CreateChannelArgs, CreateCosmosClientArgs}; +use hermes_cli_components::impls::CreateConnectionArgs; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; use crate::impls::create_client::CreateStarknetClientArgs; diff --git a/relayer/crates/starknet-cli/src/commands/query/subcommand.rs b/relayer/crates/starknet-cli/src/commands/query/subcommand.rs index e63b2e3ba..e173060de 100644 --- a/relayer/crates/starknet-cli/src/commands/query/subcommand.rs +++ b/relayer/crates/starknet-cli/src/commands/query/subcommand.rs @@ -1,11 +1,8 @@ use cgp::prelude::*; -use hermes_cli_components::impls::commands::queries::balance::QueryBalanceArgs; -use hermes_cli_components::impls::commands::queries::chain_status::QueryChainStatusArgs; -use hermes_cli_components::impls::commands::queries::client_state::QueryClientStateArgs; -use hermes_cli_components::impls::commands::queries::consensus_state::QueryConsensusStateArgs; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, +use hermes_cli_components::impls::{ + QueryBalanceArgs, QueryChainStatusArgs, QueryClientStateArgs, QueryConsensusStateArgs, }; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; #[derive(Debug, clap::Subcommand)] pub enum QuerySubCommand { diff --git a/relayer/crates/starknet-cli/src/commands/start.rs b/relayer/crates/starknet-cli/src/commands/start.rs index 770788754..cc402ffa2 100644 --- a/relayer/crates/starknet-cli/src/commands/start.rs +++ b/relayer/crates/starknet-cli/src/commands/start.rs @@ -1,8 +1,7 @@ use cgp::core::field::Index; use cgp::prelude::*; -use hermes_cli_components::impls::commands::start::{RunStartRelayerCommand, StartRelayerArgs}; -use hermes_cli_components::traits::command::{CommandRunner, CommandRunnerComponent}; -use hermes_cli_components::traits::output::HasOutputType; +use hermes_cli_components::impls::{RunStartRelayerCommand, StartRelayerArgs}; +use hermes_cli_components::traits::{CommandRunner, CommandRunnerComponent, HasOutputType}; #[derive(Debug, clap::Subcommand)] pub enum StartSubCommand { diff --git a/relayer/crates/starknet-cli/src/commands/update/subcommand.rs b/relayer/crates/starknet-cli/src/commands/update/subcommand.rs index 28d56098d..9b5f28702 100644 --- a/relayer/crates/starknet-cli/src/commands/update/subcommand.rs +++ b/relayer/crates/starknet-cli/src/commands/update/subcommand.rs @@ -1,8 +1,6 @@ use cgp::prelude::*; -use hermes_cli_components::impls::commands::client::update::UpdateClientArgs; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, -}; +use hermes_cli_components::impls::UpdateClientArgs; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; #[derive(Debug, clap::Subcommand)] pub enum UpdateSubCommand { diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index 26db4f2e5..72943d027 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -5,58 +5,30 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWr use cgp::core::field::Index; use cgp::core::types::WithType; use cgp::prelude::*; -use hermes_cli::commands::channel::CreateChannelArgs; -use hermes_cli::commands::client::create::CreateCosmosClientArgs; -use hermes_cli::impls::parse::ParseInitCosmosChannelOptions; -use hermes_cli_components::impls::commands::bootstrap::chain::RunBootstrapChainCommand; -use hermes_cli_components::impls::commands::channel::create::RunCreateChannelCommand; -use hermes_cli_components::impls::commands::client::create::RunCreateClientCommand; -use hermes_cli_components::impls::commands::client::update::{ - RunUpdateClientCommand, UpdateClientArgs, +use hermes_cli::commands::{CreateChannelArgs, CreateCosmosClientArgs}; +use hermes_cli::impls::ParseInitCosmosChannelOptions; +use hermes_cli_components::impls::{ + CreateConnectionArgs, GetDefaultConfigField, LoadTomlConfig, ParseFromOptionalString, + ParseFromString, QueryBalanceArgs, QueryChainStatusArgs, QueryClientStateArgs, + QueryConsensusStateArgs, RunBootstrapChainCommand, RunCreateChannelCommand, + RunCreateClientCommand, RunCreateConnectionCommand, RunQueryBalanceCommand, + RunQueryChainStatusCommand, RunQueryClientStateCommand, RunQueryConsensusStateCommand, + RunStartRelayerCommand, RunUpdateClientCommand, StartRelayerArgs, UpdateClientArgs, + WriteTomlConfig, }; -use hermes_cli_components::impls::commands::connection::create::{ - CreateConnectionArgs, RunCreateConnectionCommand, +use hermes_cli_components::traits::{ + AnyCounterpartyTypeProviderComponent, ArgParserComponent, BootstrapLoaderComponent, + BootstrapTypeProviderComponent, BuilderLoaderComponent, BuilderTypeComponent, + CommandRunnerComponent, ConfigLoaderComponent, ConfigPathGetterComponent, ConfigTypeComponent, + ConfigWriterComponent, OutputProducer, OutputProducerComponent, OutputTypeComponent, }; -use hermes_cli_components::impls::commands::queries::balance::{ - QueryBalanceArgs, RunQueryBalanceCommand, -}; -use hermes_cli_components::impls::commands::queries::chain_status::{ - QueryChainStatusArgs, RunQueryChainStatusCommand, -}; -use hermes_cli_components::impls::commands::queries::client_state::{ - QueryClientStateArgs, RunQueryClientStateCommand, -}; -use hermes_cli_components::impls::commands::queries::consensus_state::{ - QueryConsensusStateArgs, RunQueryConsensusStateCommand, -}; -use hermes_cli_components::impls::commands::start::{RunStartRelayerCommand, StartRelayerArgs}; -use hermes_cli_components::impls::config::get_config_path::GetDefaultConfigField; -use hermes_cli_components::impls::config::load_toml_config::LoadTomlConfig; -use hermes_cli_components::impls::config::save_toml_config::WriteTomlConfig; -use hermes_cli_components::impls::parse::string::{ParseFromOptionalString, ParseFromString}; -use hermes_cli_components::traits::any_counterparty::AnyCounterpartyTypeProviderComponent; -use hermes_cli_components::traits::bootstrap::{ - BootstrapLoaderComponent, BootstrapTypeProviderComponent, -}; -use hermes_cli_components::traits::build::{BuilderLoaderComponent, BuilderTypeComponent}; -use hermes_cli_components::traits::command::CommandRunnerComponent; -use hermes_cli_components::traits::config::config_path::ConfigPathGetterComponent; -use hermes_cli_components::traits::config::load_config::ConfigLoaderComponent; -use hermes_cli_components::traits::config::write_config::ConfigWriterComponent; -use hermes_cli_components::traits::output::{ - OutputProducer, OutputProducerComponent, OutputTypeComponent, -}; -use hermes_cli_components::traits::parse::ArgParserComponent; -use hermes_cli_components::traits::types::config::ConfigTypeComponent; -use hermes_cosmos_integration_tests::contexts::chain_driver::CosmosChainDriver; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::types::HermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_relayer_components::error::traits::RetryableErrorComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::config::{ StarknetChainConfig, StarknetContractAddresses, StarknetContractClasses, StarknetRelayerConfig, @@ -67,8 +39,8 @@ use hermes_starknet_integration_tests::contexts::chain_driver::StarknetChainDriv use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::StarknetBootstrap; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_test_components::chain_driver::traits::config::{ConfigUpdater, ConfigUpdaterComponent}; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; +use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId, PortId}; use toml::to_string_pretty; diff --git a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs index c44b93d2e..cce49638e 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs @@ -1,11 +1,8 @@ use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; -use hermes_cli_components::traits::bootstrap::{ - BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType, -}; -use hermes_cosmos_chain_components::types::config::gas::dynamic_gas_config::DynamicGasConfig; -use hermes_cosmos_chain_components::types::config::gas::eip_type::EipQueryType; -use hermes_cosmos_relayer::contexts::build::CosmosBuilder; +use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; +use hermes_cosmos_chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos_relayer::contexts::CosmosBuilder; use hermes_error::HermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; 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 a9260768c..c472fed8d 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs @@ -1,13 +1,10 @@ use std::sync::Arc; use cgp::prelude::*; -use hermes_cli_components::traits::bootstrap::{ - BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType, -}; +use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::{CanReadFileAsString, HasRuntime}; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::{ StarknetBootstrap, StarknetBootstrapFields, }; diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs index 5a07ccf2d..2cbb6d07a 100644 --- a/relayer/crates/starknet-cli/src/impls/build.rs +++ b/relayer/crates/starknet-cli/src/impls/build.rs @@ -1,10 +1,10 @@ use cgp::prelude::*; -use hermes_cli_components::traits::build::{BuilderLoader, BuilderLoaderComponent, HasBuilderType}; -use hermes_cli_components::traits::config::load_config::CanLoadConfig; -use hermes_cli_components::traits::types::config::HasConfigType; -use hermes_cosmos_relayer::contexts::build::CosmosBuilder; +use hermes_cli_components::traits::{ + BuilderLoader, BuilderLoaderComponent, CanLoadConfig, HasBuilderType, HasConfigType, +}; +use hermes_cosmos_relayer::contexts::CosmosBuilder; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::HasRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-cli/src/impls/create_client.rs b/relayer/crates/starknet-cli/src/impls/create_client.rs index 9ea145aec..d0ba1cc33 100644 --- a/relayer/crates/starknet-cli/src/impls/create_client.rs +++ b/relayer/crates/starknet-cli/src/impls/create_client.rs @@ -2,12 +2,10 @@ use core::time::Duration; use cgp::core::field::Index; use cgp::prelude::*; -use hermes_cli::commands::client::create::CreateCosmosClientArgs; -use hermes_cli_components::impls::commands::client::create::{ - CreateClientOptionsParser, CreateClientOptionsParserComponent, -}; -use hermes_cosmos_chain_components::types::payloads::client::CosmosCreateClientOptions; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cli::commands::CreateCosmosClientArgs; +use hermes_cli_components::impls::{CreateClientOptionsParser, CreateClientOptionsParserComponent}; +use hermes_cosmos_chain_components::types::CosmosCreateClientOptions; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::HermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-cli/src/impls/error.rs b/relayer/crates/starknet-cli/src/impls/error.rs index f8399d3a9..a62ff744e 100644 --- a/relayer/crates/starknet-cli/src/impls/error.rs +++ b/relayer/crates/starknet-cli/src/impls/error.rs @@ -7,10 +7,7 @@ use cgp::core::error::{ }; use cgp::prelude::*; use eyre::Report; -use hermes_error::handlers::display::DisplayError; -use hermes_error::handlers::identity::ReturnError; -use hermes_error::handlers::infallible::HandleInfallible; -use hermes_error::handlers::report::ReportError; +use hermes_error::handlers::{DisplayError, HandleInfallible, ReportError, ReturnError}; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; use hermes_relayer_components::error::traits::RetryableErrorComponent; diff --git a/relayer/crates/starknet-integration-tests/Cargo.toml b/relayer/crates/starknet-integration-tests/Cargo.toml index a13af68aa..3ee89b899 100644 --- a/relayer/crates/starknet-integration-tests/Cargo.toml +++ b/relayer/crates/starknet-integration-tests/Cargo.toml @@ -14,6 +14,9 @@ workspace = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } 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 872316a27..22c0d251f 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs @@ -7,9 +7,7 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; use hermes_starknet_chain_components::types::wallet::StarknetWallet; @@ -17,21 +15,13 @@ use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain_driver::impls::wait::WaitChainReachHeight; -use hermes_test_components::chain_driver::traits::chain_process::{ - ChainProcessTaker, ChainProcessTakerComponent, -}; -use hermes_test_components::chain_driver::traits::fields::amount::RandomAmountGeneratorComponent; -use hermes_test_components::chain_driver::traits::fields::denom::{ - DenomGetter, DenomGetterComponent, StakingDenom, TransferDenom, -}; -use hermes_test_components::chain_driver::traits::fields::wallet::{ - RelayerWallet, UserWallet, WalletGetterComponent, -}; -use hermes_test_components::chain_driver::traits::types::chain::{ - ChainGetterComponent, ChainTypeProviderComponent, HasChain, +use hermes_test_components::chain_driver::impls::WaitChainReachHeight; +use hermes_test_components::chain_driver::traits::{ + ChainGetterComponent, ChainProcessTaker, ChainProcessTakerComponent, + ChainStartupWaiterComponent, ChainTypeProviderComponent, DenomGetter, DenomGetterComponent, + HasChain, RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, + UserWallet, WalletGetterComponent, }; -use hermes_test_components::chain_driver::traits::wait::ChainStartupWaiterComponent; use tokio::process::Child; #[cgp_context(StarknetChainDriverComponents)] diff --git a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs index 49f93851a..a9ed23435 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs @@ -2,9 +2,9 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::extra::run::CanRun; use cgp::prelude::*; -use hermes_cosmos_integration_tests::contexts::relay_driver::AbortOnDrop; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_error::handlers::debug::DebugError; +use hermes_cosmos_integration_tests::contexts::AbortOnDrop; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; use hermes_relayer_components::multi::traits::birelay_at::{ 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 ed1a0ccbb..c3a296fb5 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -2,54 +2,43 @@ use std::path::PathBuf; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; -use hermes_cosmos_chain_components::types::config::gas::dynamic_gas_config::DynamicGasConfig; -use hermes_cosmos_integration_tests::contexts::chain_driver::CosmosChainDriver; -use hermes_cosmos_integration_tests::impls::bootstrap::build_cosmos_chain::BuildCosmosChainWithNodeConfig; -use hermes_cosmos_integration_tests::impls::bootstrap::build_cosmos_chain_driver::BuildCosmosChainDriver; -use hermes_cosmos_integration_tests::impls::bootstrap::relayer_chain_config::BuildRelayerChainConfig; -use hermes_cosmos_integration_tests::traits::bootstrap::build_chain::ChainBuilderWithNodeConfigComponent; -use hermes_cosmos_integration_tests::traits::bootstrap::compat_mode::{ - CompatModeGetterComponent, UseCompatMode37, +use hermes_cosmos_chain_components::types::DynamicGasConfig; +use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_integration_tests::impls::{ + BuildCosmosChainDriver, BuildCosmosChainWithNodeConfig, BuildRelayerChainConfig, }; -use hermes_cosmos_integration_tests::traits::bootstrap::cosmos_builder::CosmosBuilderGetterComponent; -use hermes_cosmos_integration_tests::traits::bootstrap::relayer_chain_config::RelayerChainConfigBuilderComponent; -use hermes_cosmos_relayer::contexts::build::CosmosBuilder; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_cosmos_test_components::bootstrap::components::cosmos_sdk_legacy::*; -use hermes_cosmos_test_components::bootstrap::impls::chain::build_wait::BuildAndWaitChainDriver; -use hermes_cosmos_test_components::bootstrap::impls::generator::wallet_config::GenerateStandardWalletConfig; -use hermes_cosmos_test_components::bootstrap::impls::modifiers::no_modify_comet_config::NoModifyCometConfig; -use hermes_cosmos_test_components::bootstrap::impls::modifiers::no_modify_cosmos_sdk_config::NoModifyCosmosSdkConfig; -use hermes_cosmos_test_components::bootstrap::impls::modifiers::no_modify_genesis_config::NoModifyGenesisConfig; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::ChainDriverBuilderComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::account_prefix::AccountPrefixGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_command_path::ChainCommandPathGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::ChainStoreDirGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::denom::{ - DenomForStaking, DenomForTransfer, DenomPrefixGetterComponent, +use hermes_cosmos_integration_tests::traits::{ + ChainBuilderWithNodeConfigComponent, CompatModeGetterComponent, CosmosBuilderGetterComponent, + RelayerChainConfigBuilderComponent, UseCompatMode37, }; -use hermes_cosmos_test_components::bootstrap::traits::fields::dynamic_gas_fee::DynamicGasGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::random_id::RandomIdFlagGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::generator::generate_wallet_config::WalletConfigGeneratorComponent; -use hermes_cosmos_test_components::bootstrap::traits::modifiers::modify_comet_config::CometConfigModifierComponent; -use hermes_cosmos_test_components::bootstrap::traits::modifiers::modify_cosmos_sdk_config::CosmosSdkConfigModifierComponent; -use hermes_cosmos_test_components::bootstrap::traits::modifiers::modify_genesis_config::CosmosGenesisConfigModifierComponent; -use hermes_error::handlers::debug::DebugError; +use hermes_cosmos_relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_cosmos_test_components::bootstrap::components::LegacyCosmosSdkBootstrapComponents; +use hermes_cosmos_test_components::bootstrap::impls::{ + BuildAndWaitChainDriver, GenerateStandardWalletConfig, NoModifyCometConfig, + NoModifyCosmosSdkConfig, NoModifyGenesisConfig, +}; +use hermes_cosmos_test_components::bootstrap::traits::{ + AccountPrefixGetterComponent, ChainCommandPathGetterComponent, ChainDriverBuilderComponent, + ChainStoreDirGetterComponent, CometConfigModifierComponent, + CosmosGenesisConfigModifierComponent, CosmosSdkConfigModifierComponent, DenomForStaking, + DenomForTransfer, DenomPrefixGetterComponent, DynamicGasGetterComponent, + RandomIdFlagGetterComponent, WalletConfigGeneratorComponent, +}; +use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; +use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; +use hermes_test_components::chain_driver::traits::ChainTypeProviderComponent; +use hermes_test_components::driver::traits::ChainDriverTypeProviderComponent; +use hermes_tracing_logging_components::contexts::TracingLogger; +use hermes_wasm_test_components::impls::bootstrap::{ + BuildChainDriverAndInitWasmClient, ModifyWasmGenesisConfig, ModifyWasmNodeConfig, +}; +use hermes_wasm_test_components::traits::bootstrap::{ + GovernanceProposalAuthorityGetterComponent, WasmClientByteCodeGetterComponent, }; -use hermes_test_components::bootstrap::traits::chain::ChainBootstrapperComponent; -use hermes_test_components::chain_driver::traits::types::chain::ChainTypeProviderComponent; -use hermes_test_components::driver::traits::types::chain_driver::ChainDriverTypeProviderComponent; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; -use hermes_wasm_test_components::impls::bootstrap::build_chain_driver::BuildChainDriverAndInitWasmClient; -use hermes_wasm_test_components::impls::bootstrap::genesis_config::ModifyWasmGenesisConfig; -use hermes_wasm_test_components::impls::bootstrap::node_config::ModifyWasmNodeConfig; -use hermes_wasm_test_components::traits::bootstrap::client_byte_code::WasmClientByteCodeGetterComponent; -use hermes_wasm_test_components::traits::bootstrap::gov_authority::GovernanceProposalAuthorityGetterComponent; /** A bootstrap context for bootstrapping a new Cosmos chain, and builds diff --git a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs index b3341d040..116643448 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs @@ -1,13 +1,13 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::prelude::*; -use hermes_cosmos_chain_components::types::channel::CosmosInitChannelOptions; -use hermes_cosmos_chain_components::types::connection::CosmosInitConnectionOptions; -use hermes_cosmos_chain_components::types::payloads::client::CosmosCreateClientOptions; -use hermes_cosmos_integration_tests::contexts::chain_driver::CosmosChainDriver; -use hermes_cosmos_integration_tests::impls::init_channel_options::UseCosmosInitChannelOptions; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_error::handlers::debug::DebugError; +use hermes_cosmos_chain_components::types::{ + CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, +}; +use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_integration_tests::impls::UseCosmosInitChannelOptions; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; @@ -19,29 +19,19 @@ use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBi use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::driver::traits::types::builder_at::BuilderAtTypeProviderComponent; -use hermes_test_components::driver::traits::types::chain_driver_at::ChainDriverTypeProviderAtComponent; -use hermes_test_components::setup::binary_channel::components::BinaryChannelTestComponents; -use hermes_test_components::setup::traits::birelay::BiRelaySetupComponent; -use hermes_test_components::setup::traits::bootstrap_at::{ - BootstrapGetterAtComponent, BootstrapTypeProviderAtComponent, +use hermes_test_components::driver::traits::{ + BuilderAtTypeProviderComponent, ChainDriverTypeProviderAtComponent, }; -use hermes_test_components::setup::traits::builder_at::BuilderAtGetterComponent; -use hermes_test_components::setup::traits::chain::ChainSetupComponent; -use hermes_test_components::setup::traits::channel::ChannelSetupComponent; -use hermes_test_components::setup::traits::clients::ClientSetupComponent; -use hermes_test_components::setup::traits::connection::ConnectionSetupComponent; -use hermes_test_components::setup::traits::create_client_options_at::{ +use hermes_test_components::setup::binary_channel::BinaryChannelTestComponents; +use hermes_test_components::setup::traits::{ + BiRelaySetupComponent, BinaryChannelDriverBuilderComponent, BootstrapGetterAtComponent, + BootstrapTypeProviderAtComponent, BuilderAtGetterComponent, ChainSetupComponent, + ChannelSetupComponent, ClientSetupComponent, ConnectionSetupComponent, CreateClientMessageOptionsGetterAtComponent, CreateClientPayloadOptionsGetterAtComponent, + DriverBuilderComponent, InitChannelOptionsGetterAtComponent, + InitConnectionOptionsGetterAtComponent, PortIdGetterAtComponent, RelaySetupComponent, + TestDriverTypeProviderComponent, }; -use hermes_test_components::setup::traits::driver::{ - DriverBuilderComponent, TestDriverTypeProviderComponent, -}; -use hermes_test_components::setup::traits::drivers::binary_channel::BinaryChannelDriverBuilderComponent; -use hermes_test_components::setup::traits::init_channel_options_at::InitChannelOptionsGetterAtComponent; -use hermes_test_components::setup::traits::init_connection_options_at::InitConnectionOptionsGetterAtComponent; -use hermes_test_components::setup::traits::port_id_at::PortIdGetterAtComponent; -use hermes_test_components::setup::traits::relay::RelaySetupComponent; use ibc::core::host::types::identifiers::PortId; use crate::contexts::chain_driver::StarknetChainDriver; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index 032519b8b..26323c3ef 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -5,19 +5,15 @@ use std::sync::Arc; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::impls::chain::build_wait::BuildAndWaitChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::ChainDriverBuilderComponent; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::ChainFullNodeStarterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_command_path::ChainCommandPathGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::ChainStoreDirGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::ChainNodeConfigTypeComponent; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::ChainGenesisConfigTypeComponent; +use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, + ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, +}; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_starknet_test_components::impls::bootstrap::bootstrap_chain::BootstrapStarknetDevnet; @@ -28,10 +24,10 @@ use hermes_starknet_test_components::impls::bootstrap::start_chain::StartStarkne use hermes_starknet_test_components::impls::types::genesis_config::ProvideStarknetGenesisConfigType; use hermes_starknet_test_components::impls::types::node_config::ProvideStarknetNodeConfigType; use hermes_starknet_test_components::traits::IbcContractsDeployerComponent; -use hermes_test_components::bootstrap::traits::chain::ChainBootstrapperComponent; -use hermes_test_components::chain_driver::traits::types::chain::ChainTypeProviderComponent; -use hermes_test_components::driver::traits::types::chain_driver::ChainDriverTypeProviderComponent; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; +use hermes_test_components::chain_driver::traits::ChainTypeProviderComponent; +use hermes_test_components::driver::traits::ChainDriverTypeProviderComponent; +use hermes_tracing_logging_components::contexts::TracingLogger; use starknet::core::types::contract::SierraClass; use crate::contexts::chain_driver::StarknetChainDriver; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs index 8e9023a06..f90ac2009 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs @@ -2,9 +2,9 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::extra::run::CanRun; use cgp::prelude::*; -use hermes_cosmos_integration_tests::contexts::relay_driver::AbortOnDrop; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_error::handlers::debug::DebugError; +use hermes_cosmos_integration_tests::contexts::AbortOnDrop; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; use hermes_relayer_components::multi::traits::birelay_at::{ diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index ce066b5f6..780905c71 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -1,11 +1,11 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::prelude::*; -use hermes_cosmos_integration_tests::contexts::chain_driver::CosmosChainDriver; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_error::handlers::debug::DebugError; +use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_relayer_components::multi::traits::birelay_at::{ BiRelayTypeProviderAtComponent, HasBiRelayTypeAt, }; @@ -22,19 +22,15 @@ use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBi use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::driver::traits::channel_at::ChannelIdGetterAtComponent; -use hermes_test_components::driver::traits::types::chain_driver_at::{ - ChainDriverGetterAtComponent, ChainDriverTypeProviderAtComponent, HasChainDriverTypeAt, +use hermes_test_components::driver::traits::{ + ChainDriverGetterAtComponent, ChainDriverTypeProviderAtComponent, ChannelIdGetterAtComponent, + HasChainDriverTypeAt, RelayDriverGetterAtComponent, RelayDriverTypeProviderAtComponent, }; -use hermes_test_components::driver::traits::types::relay_driver_at::{ - RelayDriverGetterAtComponent, RelayDriverTypeProviderAtComponent, +use hermes_test_components::setup::traits::{ + BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, + PortIdGetterAtComponent, }; -use hermes_test_components::setup::traits::driver::HasTestDriverType; -use hermes_test_components::setup::traits::drivers::binary_channel::{ - BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, -}; -use hermes_test_components::setup::traits::port_id_at::PortIdGetterAtComponent; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::PortId; use crate::contexts::chain_driver::StarknetChainDriver; diff --git a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs index 9874452ee..e2fd4f98d 100644 --- a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs @@ -5,25 +5,21 @@ use std::sync::OnceLock; use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use futures::lock::Mutex; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::{ - ChainDriverBuilder, ChainDriverBuilderComponent, +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, + HasChainNodeConfigType, HasChainStoreDir, }; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::HasChainStoreDir; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::fs::write_file::CanWriteStringToFile; -use hermes_runtime_components::traits::sleep::CanSleep; +use hermes_runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain::traits::types::wallet::HasWalletType; -use hermes_test_components::chain_driver::traits::types::chain::HasChainType; -use hermes_test_components::driver::traits::types::chain_driver::HasChainDriverType; +use hermes_test_components::chain::traits::HasWalletType; +use hermes_test_components::chain_driver::traits::HasChainType; +use hermes_test_components::driver::traits::HasChainDriverType; use ibc::core::host::types::error::IdentifierError; use starknet::accounts::{ExecutionEncoding, SingleOwnerAccount}; use starknet::providers::jsonrpc::HttpTransport; diff --git a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs index c769cf48a..3e865c48e 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs @@ -1,10 +1,10 @@ use std::time::SystemTime; +use hermes_core::chain_components::traits::CanSendSingleMessage; use hermes_cosmos_integration_tests::init::init_test_runtime; -use hermes_encoding_components::traits::encode::CanEncode; +use hermes_encoding_components::traits::CanEncode; use hermes_error::types::Error; -use hermes_relayer_components::chain::traits::send_message::CanSendSingleMessage; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; +use hermes_runtime_components::traits::CanReadFileAsString; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; @@ -16,7 +16,7 @@ use hermes_starknet_chain_components::types::events::erc20::Erc20Event; use hermes_starknet_chain_components::types::messages::erc20::deploy::DeployErc20TokenMessage; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_chain_context::contexts::encoding::event::StarknetEventEncoding; -use hermes_test_components::bootstrap::traits::chain::CanBootstrapChain; +use hermes_test_components::bootstrap::traits::CanBootstrapChain; use starknet::core::types::U256; use starknet::macros::selector; use tracing::info; diff --git a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs index 42315e602..679234899 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs @@ -6,19 +6,17 @@ use core::marker::PhantomData; use core::time::Duration; -use hermes_chain_components::traits::queries::chain_status::{ - CanQueryChainHeight, CanQueryChainStatus, -}; +use hermes_chain_components::traits::{CanQueryChainHeight, CanQueryChainStatus}; use hermes_cosmos_integration_tests::init::init_test_runtime; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; -use hermes_cosmos_test_components::chain::types::amount::Amount; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_test_components::chain::types::Amount; use hermes_error::types::Error; use hermes_relayer_components::birelay::traits::CanAutoBiRelay; -use hermes_relayer_components::relay::traits::auto_relayer::CanAutoRelayWithHeights; -use hermes_relayer_components::relay::traits::packet_relayer::CanRelayPacket; -use hermes_relayer_components::relay::traits::target::SourceTarget; -use hermes_relayer_components::transaction::traits::send_messages_with_signer::CanSendMessagesWithSigner; -use hermes_runtime_components::traits::sleep::CanSleep; +use hermes_relayer_components::relay::traits::{ + CanAutoRelayWithHeights, CanRelayPacket, SourceTarget, +}; +use hermes_relayer_components::transaction::traits::CanSendMessagesWithSigner; +use hermes_runtime_components::traits::CanSleep; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::queries::token_address::CanQueryCosmosTokenAddressOnStarknet; use hermes_starknet_chain_components::traits::queries::token_balance::CanQueryTokenBalance; @@ -28,10 +26,9 @@ use hermes_starknet_chain_components::types::messages::ibc::denom::{ }; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; -use hermes_test_components::chain::traits::assert::eventual_amount::CanAssertEventualAmount; -use hermes_test_components::chain::traits::messages::ibc_transfer::CanBuildIbcTokenTransferMessages; -use hermes_test_components::chain::traits::queries::balance::CanQueryBalance; -use hermes_test_components::chain::traits::transfer::ibc_transfer::CanIbcTransferToken; +use hermes_test_components::chain::traits::{ + CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanIbcTransferToken, CanQueryBalance, +}; use ibc::core::host::types::identifiers::PortId; use ibc::primitives::Timestamp; use tracing::info; diff --git a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs index 56789f7fa..3ded1bb84 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs @@ -2,20 +2,21 @@ use core::marker::PhantomData; use core::time::Duration; use cgp::core::field::Index; -use hermes_chain_components::traits::queries::chain_status::CanQueryChainHeight; -use hermes_chain_components::traits::queries::client_state::CanQueryClientStateWithLatestHeight; -use hermes_chain_components::traits::queries::consensus_state::CanQueryConsensusStateWithLatestHeight; +use hermes_chain_components::traits::{ + CanQueryChainHeight, CanQueryClientStateWithLatestHeight, + CanQueryConsensusStateWithLatestHeight, +}; use hermes_cosmos_integration_tests::init::init_test_runtime; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::types::Error; -use hermes_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget}; -use hermes_relayer_components::relay::traits::update_client_message_builder::CanSendTargetUpdateClientMessage; -use hermes_runtime_components::traits::sleep::CanSleep; +use hermes_relayer_components::relay::traits::{ + CanSendTargetUpdateClientMessage, DestinationTarget, SourceTarget, +}; +use hermes_runtime_components::traits::CanSleep; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::setup::traits::chain::CanSetupChain; -use hermes_test_components::setup::traits::clients::CanSetupClients; +use hermes_test_components::setup::traits::{CanSetupChain, CanSetupClients}; use ibc::core::client::types::Height as CosmosHeight; use tracing::info; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs index 9a08d2300..7a7c6887e 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs @@ -1,12 +1,11 @@ use std::sync::Arc; use std::time::SystemTime; -use hermes_cosmos_chain_components::types::config::gas::dynamic_gas_config::DynamicGasConfig; -use hermes_cosmos_chain_components::types::config::gas::eip_type::EipQueryType; -use hermes_cosmos_relayer::contexts::build::CosmosBuilder; +use hermes_cosmos_chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos_relayer::contexts::CosmosBuilder; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; +use hermes_runtime_components::traits::CanReadFileAsString; use starknet::core::types::contract::SierraClass; use crate::contexts::osmosis_bootstrap::OsmosisBootstrap; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs index c95225d23..02538b1fc 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs @@ -2,7 +2,7 @@ use cgp::prelude::CanRaiseError; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_test_components::setup::traits::driver::CanBuildTestDriver; +use hermes_test_components::setup::traits::CanBuildTestDriver; use crate::contexts::setup::StarknetTestSetup; use crate::contexts::test_driver::StarknetTestDriver; diff --git a/relayer/crates/starknet-madara-tests/Cargo.toml b/relayer/crates/starknet-madara-tests/Cargo.toml index be0db20d0..62491fd2d 100644 --- a/relayer/crates/starknet-madara-tests/Cargo.toml +++ b/relayer/crates/starknet-madara-tests/Cargo.toml @@ -13,6 +13,8 @@ workspace = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs index 029675216..6a2a1adf0 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs @@ -5,28 +5,24 @@ use std::sync::Arc; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::impls::chain::build_wait::BuildAndWaitChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::ChainDriverBuilderComponent; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::ChainFullNodeStarterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_command_path::ChainCommandPathGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::ChainStoreDirGetterComponent; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::ChainNodeConfigTypeComponent; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::ChainGenesisConfigTypeComponent; +use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, + ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, +}; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_test_components::impls::bootstrap_madara::{ BootstrapMadara, StartMadaraSequencer, }; use hermes_starknet_test_components::impls::types::genesis_config::ProvideStarknetGenesisConfigType; use hermes_starknet_test_components::impls::types::node_config::ProvideStarknetNodeConfigType; -use hermes_test_components::bootstrap::traits::chain::ChainBootstrapperComponent; -use hermes_test_components::chain_driver::traits::types::chain::ChainTypeProviderComponent; -use hermes_test_components::driver::traits::types::chain_driver::ChainDriverTypeProviderComponent; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; +use hermes_test_components::chain_driver::traits::ChainTypeProviderComponent; +use hermes_test_components::driver::traits::ChainDriverTypeProviderComponent; +use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::{MadaraChain, MadaraChainDriver}; use crate::impls::{BuildMadaraChainDriver, HandleMadaraChainError}; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index 4c573517e..10622d918 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -9,27 +9,25 @@ use cgp::prelude::*; use futures::lock::Mutex; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::queries::block_time::BlockTimeQuerierComponent; -use hermes_chain_components::traits::queries::chain_status::ChainStatusQuerierComponent; -use hermes_chain_components::traits::send_message::MessageSenderComponent; -use hermes_chain_components::traits::types::poll_interval::PollIntervalGetterComponent; -use hermes_chain_type_components::traits::fields::chain_id::ChainIdGetterComponent; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::has_encoding::{ +use hermes_chain_components::traits::{ + BlockTimeQuerierComponent, ChainStatusQuerierComponent, MessageSenderComponent, + PollIntervalGetterComponent, +}; +use hermes_chain_type_components::traits::ChainIdGetterComponent; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{ DefaultEncodingGetter, DefaultEncodingGetterComponent, EncodingGetter, EncodingGetterComponent, EncodingTypeProviderComponent, }; use hermes_encoding_components::types::AsBytes; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; -use hermes_relayer_components::transaction::impls::global_nonce_mutex::GetGlobalNonceMutex; -use hermes_relayer_components::transaction::traits::default_signer::DefaultSignerGetterComponent; -use hermes_relayer_components::transaction::traits::nonce::nonce_mutex::NonceAllocationMutexGetterComponent; -use hermes_relayer_components::transaction::traits::nonce::query_nonce::NonceQuerierComponent; -use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, +use hermes_logging_components::traits::LoggerComponent; +use hermes_relayer_components::transaction::impls::GetGlobalNonceMutex; +use hermes_relayer_components::transaction::traits::{ + DefaultSignerGetterComponent, NonceAllocationMutexGetterComponent, NonceQuerierComponent, }; +use hermes_runtime::types::runtime::HermesRuntime; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::commitment_proof::{ VerifyStarknetMerkleProof, VerifyStarknetStorageProof, }; @@ -66,7 +64,7 @@ use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::encoding::cairo::UseStarknetCairoEncoding; use hermes_starknet_chain_context::contexts::encoding::event::StarknetEventEncoding; use hermes_starknet_chain_context::contexts::encoding::protobuf::StarknetProtobufEncoding; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::ChainId; use indexmap::IndexMap; use reqwest::Client; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs index 6749f5512..17d85dce8 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs @@ -7,29 +7,19 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain_driver::impls::wait::WaitChainReachHeight; -use hermes_test_components::chain_driver::traits::chain_process::{ - ChainProcessTaker, ChainProcessTakerComponent, -}; -use hermes_test_components::chain_driver::traits::fields::amount::RandomAmountGeneratorComponent; -use hermes_test_components::chain_driver::traits::fields::denom::{ - DenomGetter, DenomGetterComponent, StakingDenom, TransferDenom, -}; -use hermes_test_components::chain_driver::traits::fields::wallet::{ - RelayerWallet, UserWallet, WalletGetterComponent, -}; -use hermes_test_components::chain_driver::traits::types::chain::{ - ChainGetterComponent, ChainTypeProviderComponent, +use hermes_test_components::chain_driver::impls::WaitChainReachHeight; +use hermes_test_components::chain_driver::traits::{ + ChainGetterComponent, ChainProcessTaker, ChainProcessTakerComponent, + ChainStartupWaiterComponent, ChainTypeProviderComponent, DenomGetter, DenomGetterComponent, + RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, UserWallet, + WalletGetterComponent, }; -use hermes_test_components::chain_driver::traits::wait::ChainStartupWaiterComponent; use tokio::process::Child; use crate::contexts::MadaraChain; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_account.rs b/relayer/crates/starknet-madara-tests/src/impls/build_account.rs index ec64060d9..35f7dbbd7 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_account.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_account.rs @@ -2,8 +2,8 @@ use core::str::FromStr; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_components::traits::types::chain_id::HasChainId; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; +use hermes_chain_components::traits::HasChainId; +use hermes_relayer_components::transaction::traits::HasSignerType; use hermes_starknet_chain_components::traits::account::{ AccountFromSignerBuilder, AccountFromSignerBuilderComponent, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index a3a0b698f..9ce45eee6 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -5,24 +5,20 @@ use std::sync::OnceLock; use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use futures::lock::Mutex; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::{ - ChainDriverBuilder, ChainDriverBuilderComponent, +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, + HasChainNodeConfigType, HasChainStoreDir, }; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::HasChainStoreDir; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::fs::write_file::CanWriteStringToFile; -use hermes_runtime_components::traits::sleep::CanSleep; +use hermes_runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain::traits::types::wallet::HasWalletType; -use hermes_test_components::chain_driver::traits::types::chain::HasChainType; -use hermes_test_components::driver::traits::types::chain_driver::HasChainDriverType; +use hermes_test_components::chain::traits::HasWalletType; +use hermes_test_components::chain_driver::traits::HasChainType; +use hermes_test_components::driver::traits::HasChainDriverType; use ibc::core::host::types::error::IdentifierError; use reqwest::Client; use starknet_v13::providers::jsonrpc::HttpTransport; diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs index 38b9099e0..be8faca74 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs @@ -1,5 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::types::height::HasHeightType; +use hermes_chain_components::traits::HasHeightType; +use hermes_chain_type_components::traits::HasAddressType; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::contract::call::{ @@ -7,7 +8,6 @@ use hermes_starknet_chain_components::traits::contract::call::{ }; use hermes_starknet_chain_components::traits::types::blob::HasBlobType; use hermes_starknet_chain_components::traits::types::method::HasSelectorType; -use hermes_test_components::chain::traits::types::address::HasAddressType; use starknet_v13::core::types::{BlockId, BlockTag, Felt, FunctionCall}; use starknet_v13::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs index 598c47b46..8b7accc82 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs @@ -6,8 +6,7 @@ use cairo_lang_starknet_classes::casm_contract_class::{ use cairo_lang_starknet_classes::contract_class::ContractClass; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::default_signer::HasDefaultSigner; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; +use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use hermes_starknet_chain_components::traits::account::CanBuildAccountFromSigner; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::contract::declare::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs index 42d33f276..afb56ba0f 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::default_signer::HasDefaultSigner; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; +use hermes_chain_type_components::traits::HasAddressType; +use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::account::CanBuildAccountFromSigner; use hermes_starknet_chain_components::traits::contract::deploy::{ @@ -8,7 +8,6 @@ use hermes_starknet_chain_components::traits::contract::deploy::{ }; use hermes_starknet_chain_components::traits::types::blob::HasBlobType; use hermes_starknet_chain_components::traits::types::contract_class::HasContractClassHashType; -use hermes_test_components::chain::traits::types::address::HasAddressType; use starknet_v13::contract::ContractFactory; use starknet_v13::core::types::{Felt, RevertedInvocation}; use starknet_v13::signers::SigningKey; diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs index cf941a753..97f440eb1 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs @@ -11,33 +11,27 @@ use hermes_cairo_encoding_components::impls::encode_mut::bool::DecodeBoolError; use hermes_cairo_encoding_components::impls::encode_mut::end::NonEmptyBuffer; use hermes_cairo_encoding_components::impls::encode_mut::felt::UnexpectedEndOfBuffer; use hermes_cairo_encoding_components::impls::encode_mut::variant::VariantIndexOutOfBound; -use hermes_chain_components::impls::payload_builders::packet::InvalidTimeoutReceipt; -use hermes_chain_components::traits::types::packet::HasOutgoingPacketType; -use hermes_chain_type_components::traits::types::address::HasAddressType; -use hermes_chain_type_components::traits::types::amount::HasAmountType; -use hermes_chain_type_components::traits::types::height::HasHeightType; -use hermes_error::handlers::debug::DebugError; -use hermes_error::handlers::display::DisplayError; -use hermes_error::handlers::identity::ReturnError; -use hermes_error::handlers::infallible::HandleInfallible; -use hermes_error::handlers::report::ReportError; +use hermes_chain_components::impls::InvalidTimeoutReceipt; +use hermes_chain_components::traits::HasOutgoingPacketType; +use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasHeightType}; +use hermes_core::chain_components::traits::{EmptyMessageResponse, HasClientIdType}; +use hermes_error::handlers::{ + DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, +}; use hermes_error::types::Error; -use hermes_protobuf_encoding_components::impls::any::TypeUrlMismatchError; -use hermes_protobuf_encoding_components::impls::encode_mut::chunk::{ - InvalidWireType, UnsupportedWireType, +use hermes_protobuf_encoding_components::impls::{ + InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; -use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::RequiredFieldTagNotFound; -use hermes_relayer_components::chain::impls::queries::consensus_state_height::NoConsensusStateAtLessThanHeight; -use hermes_relayer_components::chain::traits::send_message::EmptyMessageResponse; -use hermes_relayer_components::chain::traits::types::ibc::HasClientIdType; -use hermes_relayer_components::transaction::impls::poll_tx_response::TxNoResponseError; -use hermes_relayer_components::transaction::traits::types::tx_hash::HasTxHashType; +use hermes_relayer_components::chain::impls::NoConsensusStateAtLessThanHeight; +use hermes_relayer_components::transaction::impls::TxNoResponseError; +use hermes_relayer_components::transaction::traits::HasTxHashType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::queries::consensus_state::ConsensusStateNotFound; use hermes_starknet_chain_components::impls::queries::contract_address::ContractAddressNotFound; use hermes_starknet_chain_components::types::event::UnknownEvent; -use hermes_test_components::chain::impls::assert::poll_assert_eventual_amount::EventualAmountTimeoutError; -use hermes_test_components::chain::impls::ibc_transfer::MissingSendPacketEventError; +use hermes_test_components::chain::impls::{ + EventualAmountTimeoutError, MissingSendPacketEventError, +}; use ibc::core::channel::types::error::ChannelError; use ibc::core::client::types::error::ClientError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs b/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs index 7d68d8a8d..b9c34be35 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs @@ -3,7 +3,7 @@ use std::time::SystemTime; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; +use hermes_runtime_components::traits::CanReadFileAsString; use starknet_v13::core::types::contract::SierraClass; use crate::contexts::{MadaraBootstrap, MadaraBootstrapFields}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index 77810f5d0..d22e1d286 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -1,15 +1,12 @@ use cgp::prelude::*; -use hermes_chain_components::traits::payload_builders::update_client::UpdateClientPayloadBuilderComponent; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding; +use hermes_chain_components::traits::{CanQueryBlock, UpdateClientPayloadBuilderComponent}; +use hermes_core::chain_components::traits::{ + HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, +}; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_encoding_components::types::AsBytes; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; -use hermes_relayer_components::chain::traits::payload_builders::update_client::UpdateClientPayloadBuilder; -use hermes_relayer_components::chain::traits::types::client_state::HasClientStateType; -use hermes_relayer_components::chain::traits::types::height::HasHeightType; -use hermes_relayer_components::chain::traits::types::update_client::HasUpdateClientPayloadType; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; use hermes_starknet_chain_components::types::consensus_state::StarknetConsensusState; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs index 0fbb3d5e7..b78e2840b 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::queries::block::{BlockQuerier, BlockQuerierComponent}; -use hermes_chain_components::traits::types::block::HasBlockType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_cosmos_chain_components::types::status::Time; +use hermes_chain_components::traits::{ + BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, +}; +use hermes_cosmos_chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs index 5f6d5ad1e..b3e9d360f 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs @@ -2,12 +2,10 @@ use core::marker::PhantomData; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_components::traits::queries::block_events::{ - BlockEventsQuerier, BlockEventsQuerierComponent, +use hermes_chain_components::traits::{ + BlockEventsQuerier, BlockEventsQuerierComponent, HasEventType, HasHeightType, }; -use hermes_chain_components::traits::types::event::HasEventType; -use hermes_chain_components::traits::types::height::HasHeightType; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_type_components::traits::HasAddressType; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::queries::contract_address::CanQueryContractAddress; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs index 7fb2d1072..1f778b39d 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs @@ -1,9 +1,7 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::nonce::query_nonce::{ - NonceQuerier, NonceQuerierComponent, +use hermes_relayer_components::transaction::traits::{ + HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; -use hermes_relayer_components::transaction::traits::types::nonce::HasNonceType; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; use hermes_starknet_chain_components::traits::account::{ CanBuildAccountFromSigner, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs index 8fbca3f6d..494e1f4c8 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs @@ -1,8 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::queries::chain_status::ChainStatusQuerierComponent; -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; +use hermes_chain_components::traits::ChainStatusQuerierComponent; +use hermes_core::chain_components::traits::{ChainStatusQuerier, HasChainStatusType}; +use hermes_cosmos_chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs index 83b3cb418..595a07a05 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs @@ -1,13 +1,10 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::query_tx_response::{ - TxResponseQuerier, TxResponseQuerierComponent, +use hermes_relayer_components::transaction::traits::{ + HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; -use hermes_relayer_components::transaction::traits::types::tx_hash::HasTxHashType; -use hermes_relayer_components::transaction::traits::types::tx_response::HasTxResponseType; -use hermes_runtime_components::traits::runtime::HasRuntime; -use hermes_runtime_components::traits::sleep::CanSleep; +use hermes_runtime_components::traits::{CanSleep, HasRuntime}; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use starknet_v13::core::types::{Felt, StarknetError}; use starknet_v13::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/send_message.rs b/relayer/crates/starknet-madara-tests/src/impls/send_message.rs index eecbcc752..1db028356 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/send_message.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/send_message.rs @@ -2,19 +2,13 @@ use core::fmt::Debug; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_type_components::traits::types::message_response::HasMessageResponseType; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_relayer_components::transaction::traits::parse_events::{ - TxMessageResponseParser, TxMessageResponseParserComponent, -}; -use hermes_relayer_components::transaction::traits::poll_tx_response::CanPollTxResponse; -use hermes_relayer_components::transaction::traits::send_messages_with_signer_and_nonce::{ +use hermes_chain_type_components::traits::HasMessageResponseType; +use hermes_core::chain_components::traits::HasMessageType; +use hermes_relayer_components::transaction::traits::{ + CanPollTxResponse, HasNonceType, HasSignerType, HasTxHashType, HasTxResponseType, MessagesWithSignerAndNonceSender, MessagesWithSignerAndNonceSenderComponent, + TxMessageResponseParser, TxMessageResponseParserComponent, }; -use hermes_relayer_components::transaction::traits::types::nonce::HasNonceType; -use hermes_relayer_components::transaction::traits::types::signer::HasSignerType; -use hermes_relayer_components::transaction::traits::types::tx_hash::HasTxHashType; -use hermes_relayer_components::transaction::traits::types::tx_response::HasTxResponseType; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::account::{ diff --git a/relayer/crates/starknet-madara-tests/src/tests/erc20.rs b/relayer/crates/starknet-madara-tests/src/tests/erc20.rs index 5c0df15db..08779890e 100644 --- a/relayer/crates/starknet-madara-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-madara-tests/src/tests/erc20.rs @@ -1,12 +1,10 @@ use cgp::prelude::*; -use hermes_chain_components::traits::queries::block::CanQueryBlock; -use hermes_chain_components::traits::queries::chain_status::{ - CanQueryChainHeight, CanQueryChainStatus, +use hermes_chain_components::traits::{ + CanQueryBlock, CanQueryChainHeight, CanQueryChainStatus, CanSendSingleMessage, }; -use hermes_chain_components::traits::send_message::CanSendSingleMessage; -use hermes_encoding_components::traits::encode::CanEncode; +use hermes_encoding_components::traits::CanEncode; use hermes_error::Error; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; +use hermes_runtime_components::traits::CanReadFileAsString; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; use hermes_starknet_chain_components::traits::contract::deploy::CanDeployContract; @@ -17,7 +15,7 @@ use hermes_starknet_chain_components::types::amount::StarknetAmount; use hermes_starknet_chain_components::types::events::erc20::Erc20Event; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_chain_context::contexts::encoding::event::StarknetEventEncoding; -use hermes_test_components::bootstrap::traits::chain::CanBootstrapChain; +use hermes_test_components::bootstrap::traits::CanBootstrapChain; use starknet::core::crypto::pedersen_hash; use starknet::core::types::U256; use starknet::macros::selector; diff --git a/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs b/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs index 478abcf3d..c251f9f96 100644 --- a/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs +++ b/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs @@ -1,10 +1,10 @@ use core::fmt::Display; use cgp::prelude::*; -use hermes_chain_components::traits::queries::chain_status::CanQueryChainHeight; -use hermes_chain_type_components::traits::types::address::HasAddressType; +use hermes_chain_components::traits::CanQueryChainHeight; +use hermes_chain_type_components::traits::HasAddressType; use hermes_error::Error; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; +use hermes_runtime_components::traits::CanReadFileAsString; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::commitment_proof::CanVerifyStarknetStorageProof; use hermes_starknet_chain_components::traits::contract::call::CanCallContract; @@ -18,7 +18,7 @@ use hermes_starknet_chain_components::traits::types::method::HasSelectorType; use hermes_starknet_chain_components::traits::types::storage_proof::{ HasStorageKeyType, HasStorageProofType, }; -use hermes_test_components::bootstrap::traits::chain::CanBootstrapChain; +use hermes_test_components::bootstrap::traits::CanBootstrapChain; use starknet::core::types::{Felt, StorageProof}; use starknet::macros::{felt, selector}; use tracing::info; diff --git a/relayer/crates/starknet-relayer/Cargo.toml b/relayer/crates/starknet-relayer/Cargo.toml index 5ca2f9648..03714e421 100644 --- a/relayer/crates/starknet-relayer/Cargo.toml +++ b/relayer/crates/starknet-relayer/Cargo.toml @@ -15,6 +15,8 @@ workspace = true [dependencies] cgp = { workspace = true } ibc = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-runtime-components = { workspace = true } diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs index f1d6580cb..a8b576300 100644 --- a/relayer/crates/starknet-relayer/src/contexts/builder.rs +++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs @@ -12,9 +12,8 @@ use cgp::core::types::WithType; use cgp::prelude::*; use eyre::eyre; use futures::lock::Mutex; -use hermes_cosmos_chain_components::types::key_types::secp256k1::Secp256k1KeyPair; -use hermes_cosmos_relayer::contexts::build::CosmosBuilder; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_relayer::contexts::{CosmosBuilder, CosmosChain}; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; use hermes_error::HermesError; @@ -37,9 +36,8 @@ use hermes_relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtC use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; use hermes_relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::fs::read_file::CanReadFileAsString; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, +use hermes_runtime_components::traits::{ + CanReadFileAsString, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_starknet_chain_components::impls::types::config::StarknetChainConfig; use hermes_starknet_chain_components::types::wallet::StarknetWallet; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs index bcc48b318..cd13d2af5 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs @@ -3,22 +3,20 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWr use cgp::core::field::Index; use cgp::extra::run::RunnerComponent; use cgp::prelude::*; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_relayer_components::birelay::traits::AutoBiRelayerComponent; -use hermes_relayer_components::components::default::birelay::DefaultBiRelayComponents; +use hermes_relayer_components::components::default::DefaultBiRelayComponents; use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; use hermes_relayer_components::multi::traits::relay_at::{ RelayGetterAtComponent, RelayTypeProviderAtComponent, }; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use crate::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs index db1c64dfc..b3f4f6ce5 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs @@ -4,40 +4,23 @@ use core::ops::Deref; use cgp::prelude::*; use futures::lock::Mutex; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; use hermes_relayer_components::multi::types::tags::{Dst, Src}; -use hermes_relayer_components::relay::impls::channel::bootstrap::CanBootstrapChannel; -use hermes_relayer_components::relay::impls::connection::bootstrap::CanBootstrapConnection; -use hermes_relayer_components::relay::impls::packet_lock::PacketMutexOf; -use hermes_relayer_components::relay::impls::selector::SelectRelayAToB; -use hermes_relayer_components::relay::traits::auto_relayer::CanAutoRelayTarget; -use hermes_relayer_components::relay::traits::chains::{ - CanRaiseRelayChainErrors, HasRelayChains, HasRelayClientIds, +use hermes_relayer_components::relay::impls::{ + CanBootstrapChannel, CanBootstrapConnection, PacketMutexOf, SelectRelayAToB, }; -use hermes_relayer_components::relay::traits::channel::open_ack::CanRelayChannelOpenAck; -use hermes_relayer_components::relay::traits::channel::open_confirm::CanRelayChannelOpenConfirm; -use hermes_relayer_components::relay::traits::channel::open_try::CanRelayChannelOpenTry; -use hermes_relayer_components::relay::traits::client_creator::CanCreateClient; -use hermes_relayer_components::relay::traits::connection::open_ack::CanRelayConnectionOpenAck; -use hermes_relayer_components::relay::traits::connection::open_confirm::CanRelayConnectionOpenConfirm; -use hermes_relayer_components::relay::traits::connection::open_init::CanInitConnection; -use hermes_relayer_components::relay::traits::connection::open_try::CanRelayConnectionOpenTry; -use hermes_relayer_components::relay::traits::event_relayer::CanRelayEvent; -use hermes_relayer_components::relay::traits::ibc_message_sender::{ - IbcMessageSenderComponent, MainSink, -}; -use hermes_relayer_components::relay::traits::packet_lock::HasPacketLock; -use hermes_relayer_components::relay::traits::packet_relayer::CanRelayPacket; -use hermes_relayer_components::relay::traits::target::{ - DestinationTarget, HasDestinationTargetChainTypes, HasSourceTargetChainTypes, - HasTargetClientIds, SourceTarget, -}; -use hermes_relayer_components::relay::traits::update_client_message_builder::{ - CanBuildTargetUpdateClientMessage, CanSendTargetUpdateClientMessage, +use hermes_relayer_components::relay::traits::{ + CanAutoRelayTarget, CanBuildTargetUpdateClientMessage, CanCreateClient, CanInitConnection, + CanRaiseRelayChainErrors, CanRelayChannelOpenAck, CanRelayChannelOpenConfirm, + CanRelayChannelOpenTry, CanRelayConnectionOpenAck, CanRelayConnectionOpenConfirm, + CanRelayConnectionOpenTry, CanRelayEvent, CanRelayPacket, CanSendTargetUpdateClientMessage, + DestinationTarget, HasDestinationTargetChainTypes, HasPacketLock, HasRelayChains, + HasRelayClientIds, HasSourceTargetChainTypes, HasTargetClientIds, IbcMessageSenderComponent, + MainSink, SourceTarget, }; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs index f4c66435d..64d92a8af 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs @@ -3,22 +3,20 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWr use cgp::core::field::Index; use cgp::extra::run::RunnerComponent; use cgp::prelude::*; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_relayer_components::birelay::traits::AutoBiRelayerComponent; -use hermes_relayer_components::components::default::birelay::DefaultBiRelayComponents; +use hermes_relayer_components::components::default::DefaultBiRelayComponents; use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; use hermes_relayer_components::multi::traits::relay_at::{ RelayGetterAtComponent, RelayTypeProviderAtComponent, }; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, -}; +use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use crate::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs index 13de732b3..f857b3696 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs @@ -4,37 +4,23 @@ use core::ops::Deref; use cgp::prelude::*; use futures::lock::Mutex; -use hermes_cosmos_relayer::contexts::chain::CosmosChain; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; use hermes_relayer_components::multi::types::tags::{Dst, Src}; -use hermes_relayer_components::relay::impls::connection::bootstrap::CanBootstrapConnection; -use hermes_relayer_components::relay::impls::packet_lock::PacketMutexOf; -use hermes_relayer_components::relay::impls::selector::SelectRelayBToA; -use hermes_relayer_components::relay::traits::auto_relayer::{ - AutoRelayerWithHeightsComponent, TargetAutoRelayerComponent, +use hermes_relayer_components::relay::impls::{ + CanBootstrapConnection, PacketMutexOf, SelectRelayBToA, }; -use hermes_relayer_components::relay::traits::chains::{ - CanRaiseRelayChainErrors, HasRelayChains, HasRelayClientIds, -}; -use hermes_relayer_components::relay::traits::client_creator::CanCreateClient; -use hermes_relayer_components::relay::traits::connection::open_ack::CanRelayConnectionOpenAck; -use hermes_relayer_components::relay::traits::connection::open_confirm::CanRelayConnectionOpenConfirm; -use hermes_relayer_components::relay::traits::connection::open_init::CanInitConnection; -use hermes_relayer_components::relay::traits::connection::open_try::CanRelayConnectionOpenTry; -use hermes_relayer_components::relay::traits::event_relayer::EventRelayerComponent; -use hermes_relayer_components::relay::traits::ibc_message_sender::{ - CanSendIbcMessages, CanSendSingleIbcMessage, MainSink, -}; -use hermes_relayer_components::relay::traits::packet_relayer::CanRelayPacket; -use hermes_relayer_components::relay::traits::target::{ - DestinationTarget, HasDestinationTargetChainTypes, HasSourceTargetChainTypes, - HasTargetClientIds, SourceTarget, -}; -use hermes_relayer_components::relay::traits::update_client_message_builder::{ - CanBuildTargetUpdateClientMessage, CanSendTargetUpdateClientMessage, +use hermes_relayer_components::relay::traits::{ + AutoRelayerWithHeightsComponent, CanBuildTargetUpdateClientMessage, CanCreateClient, + CanInitConnection, CanRaiseRelayChainErrors, CanRelayConnectionOpenAck, + CanRelayConnectionOpenConfirm, CanRelayConnectionOpenTry, CanRelayPacket, CanSendIbcMessages, + CanSendSingleIbcMessage, CanSendTargetUpdateClientMessage, DestinationTarget, + EventRelayerComponent, HasDestinationTargetChainTypes, HasRelayChains, HasRelayClientIds, + HasSourceTargetChainTypes, HasTargetClientIds, MainSink, SourceTarget, + TargetAutoRelayerComponent, }; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; diff --git a/relayer/crates/starknet-relayer/src/impls/error.rs b/relayer/crates/starknet-relayer/src/impls/error.rs index bf79c4972..c293bcb20 100644 --- a/relayer/crates/starknet-relayer/src/impls/error.rs +++ b/relayer/crates/starknet-relayer/src/impls/error.rs @@ -4,20 +4,16 @@ use std::string::FromUtf8Error; use cgp::prelude::*; use eyre::Report; -use hermes_error::handlers::debug::DebugError; -use hermes_error::handlers::display::DisplayError; -use hermes_error::handlers::identity::ReturnError; -use hermes_error::handlers::infallible::HandleInfallible; -use hermes_error::handlers::report::ReportError; +use hermes_core::chain_components::traits::{EmptyMessageResponse, HasChainIdType}; +use hermes_error::handlers::{ + DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, +}; use hermes_error::types::Error; -use hermes_relayer_components::chain::traits::send_message::EmptyMessageResponse; -use hermes_relayer_components::chain::traits::types::chain_id::HasChainIdType; -use hermes_relayer_components::relay::impls::channel::open_init::MissingChannelInitEventError; -use hermes_relayer_components::relay::impls::channel::open_try::MissingChannelTryEventError; -use hermes_relayer_components::relay::impls::connection::open_init::MissingConnectionInitEventError; -use hermes_relayer_components::relay::impls::connection::open_try::MissingConnectionTryEventError; -use hermes_relayer_components::relay::impls::create_client::MissingCreateClientEventError; -use hermes_relayer_components::relay::traits::chains::HasRelayChains; +use hermes_relayer_components::relay::impls::{ + MissingChannelInitEventError, MissingChannelTryEventError, MissingConnectionInitEventError, + MissingConnectionTryEventError, MissingCreateClientEventError, +}; +use hermes_relayer_components::relay::traits::HasRelayChains; use hermes_runtime::types::error::TokioRuntimeError; pub struct HandleStarknetRelayError; diff --git a/relayer/crates/starknet-relayer/src/presets/relay.rs b/relayer/crates/starknet-relayer/src/presets/relay.rs index 499b8b1e7..a08575f4f 100644 --- a/relayer/crates/starknet-relayer/src/presets/relay.rs +++ b/relayer/crates/starknet-relayer/src/presets/relay.rs @@ -5,22 +5,19 @@ mod preset { ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent, }; use cgp::core::field::{Index, UseField}; - use cgp::prelude::*; - use hermes_cosmos_relayer::contexts::chain::CosmosChain; + use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; - use hermes_logging_components::traits::logger::LoggerComponent; - use hermes_relayer_components::components::default::relay::*; + use hermes_logging_components::traits::LoggerComponent; + use hermes_relayer_components::components::default::DefaultRelayPreset; use hermes_relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; - use hermes_relayer_components::relay::impls::packet_lock::PacketMutexGetterComponent; + use hermes_relayer_components::relay::impls::PacketMutexGetterComponent; use hermes_runtime::types::runtime::HermesRuntime; - use hermes_runtime_components::traits::runtime::{ - RuntimeGetterComponent, RuntimeTypeProviderComponent, - }; + use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; - use hermes_tracing_logging_components::contexts::logger::TracingLogger; + use hermes_tracing_logging_components::contexts::TracingLogger; use DefaultRelayPreset::re_exports::*; use crate::impls::error::HandleStarknetRelayError; diff --git a/relayer/crates/starknet-test-components/Cargo.toml b/relayer/crates/starknet-test-components/Cargo.toml index 44a98ab6f..c3d7d9b6e 100644 --- a/relayer/crates/starknet-test-components/Cargo.toml +++ b/relayer/crates/starknet-test-components/Cargo.toml @@ -14,6 +14,8 @@ workspace = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } hermes-runtime-components = { workspace = true } hermes-relayer-components = { workspace = true } hermes-test-components = { workspace = true } 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 81e761182..a26f29e4f 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 @@ -3,23 +3,18 @@ use std::net::{IpAddr, Ipv4Addr}; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::CanBuildChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::CanStartChainFullNodes; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::HasChainStoreDir; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::fs::file_path::HasFilePathType; -use hermes_runtime_components::traits::os::child_process::HasChildProcessType; -use hermes_runtime_components::traits::os::reserve_port::CanReserveTcpPort; -use hermes_runtime_components::traits::random::CanGenerateRandom; -use hermes_runtime_components::traits::runtime::HasRuntime; -use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_test_components::bootstrap::traits::chain::{ - ChainBootstrapper, ChainBootstrapperComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, + HasChainStoreDir, +}; +use hermes_runtime_components::traits::{ + CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, + HasRuntime, }; -use hermes_test_components::chain::traits::types::wallet::HasWalletType; -use hermes_test_components::chain_driver::traits::types::chain::HasChainType; +use hermes_starknet_chain_components::types::wallet::StarknetWallet; +use hermes_test_components::bootstrap::traits::{ChainBootstrapper, ChainBootstrapperComponent}; +use hermes_test_components::chain::traits::HasWalletType; +use hermes_test_components::chain_driver::traits::HasChainType; use starknet::macros::felt; use crate::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs index fbc3eae3d..1c5af1fb2 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs @@ -8,19 +8,16 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::{ - ChainDriverBuilder, ChainDriverBuilderComponent, +use hermes_core::chain_components::traits::{CanSendSingleMessage, HasMessageType}; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, + HasChainNodeConfigType, }; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_encoding_components::traits::has_encoding::HasEncoding; -use hermes_encoding_components::traits::types::encoded::HasEncodedType; -use hermes_logging_components::traits::logger::CanLog; -use hermes_logging_components::types::level::LevelInfo; -use hermes_relayer_components::chain::traits::send_message::CanSendSingleMessage; -use hermes_relayer_components::chain::traits::types::message::HasMessageType; -use hermes_runtime_components::traits::os::child_process::{ChildProcessOf, HasChildProcessType}; +use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; +use hermes_logging_components::traits::CanLog; +use hermes_logging_components::types::LevelInfo; +use hermes_runtime_components::traits::{ChildProcessOf, HasChildProcessType}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; @@ -31,10 +28,9 @@ use hermes_starknet_chain_components::traits::types::contract_class::{ }; use hermes_starknet_chain_components::types::messages::ibc::channel::PortId; use hermes_starknet_chain_components::types::register::{MsgRegisterApp, MsgRegisterClient}; -use hermes_test_components::chain::traits::types::address::HasAddressType; -use hermes_test_components::chain::traits::types::wallet::HasWalletType; -use hermes_test_components::chain_driver::traits::types::chain::{HasChain, HasChainType}; -use hermes_test_components::driver::traits::types::chain_driver::HasChainDriverType; +use hermes_test_components::chain::traits::HasWalletType; +use hermes_test_components::chain_driver::traits::{HasChain, HasChainType}; +use hermes_test_components::driver::traits::HasChainDriverType; use starknet::core::types::Felt; use starknet::macros::{selector, short_string}; 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 6d2ab6737..a99c9a820 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,13 +1,9 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::{ - ChainFullNodeStarter, ChainFullNodeStarterComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, + HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_command_path::HasChainCommandPath; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::file_path::HasFilePathType; -use hermes_runtime_components::traits::os::child_process::CanStartChildProcess; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::{CanStartChildProcess, HasFilePathType, HasRuntime}; use crate::types::genesis_config::StarknetGenesisConfig; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs index 228a7832e..a646bcde3 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs @@ -3,23 +3,18 @@ use std::net::{IpAddr, Ipv4Addr}; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::build_chain_driver::CanBuildChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::CanStartChainFullNodes; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_store_dir::HasChainStoreDir; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::fs::file_path::HasFilePathType; -use hermes_runtime_components::traits::os::child_process::HasChildProcessType; -use hermes_runtime_components::traits::os::reserve_port::CanReserveTcpPort; -use hermes_runtime_components::traits::random::CanGenerateRandom; -use hermes_runtime_components::traits::runtime::HasRuntime; -use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_test_components::bootstrap::traits::chain::{ - ChainBootstrapper, ChainBootstrapperComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, + HasChainStoreDir, +}; +use hermes_runtime_components::traits::{ + CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, + HasRuntime, }; -use hermes_test_components::chain::traits::types::wallet::HasWalletType; -use hermes_test_components::chain_driver::traits::types::chain::HasChainType; +use hermes_starknet_chain_components::types::wallet::StarknetWallet; +use hermes_test_components::bootstrap::traits::{ChainBootstrapper, ChainBootstrapperComponent}; +use hermes_test_components::chain::traits::HasWalletType; +use hermes_test_components::chain_driver::traits::HasChainType; use starknet::macros::felt; use crate::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs index 84638b89d..9fba5d518 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs @@ -1,12 +1,9 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::{ - ChainFullNodeStarter, ChainFullNodeStarterComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, + HasChainNodeConfigType, }; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::file_path::HasFilePathType; -use hermes_runtime_components::traits::os::child_process::HasChildProcessType; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::{HasChildProcessType, HasFilePathType, HasRuntime}; use crate::impls::bootstrap_madara::{StartAnvil, StartMadaraSequencer, StartPathfinder}; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs index 3a13a544d..eedbf123d 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs @@ -1,12 +1,9 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::{ - ChainFullNodeStarter, ChainFullNodeStarterComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, + HasChainNodeConfigType, }; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::os::child_process::CanStartChildProcess; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs index 3813c92e7..0dbcd9742 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs @@ -1,13 +1,9 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::{ - ChainFullNodeStarter, ChainFullNodeStarterComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, + HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_cosmos_test_components::bootstrap::traits::fields::chain_command_path::HasChainCommandPath; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::os::child_process::CanStartChildProcess; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs index ead3a75da..790fd45e7 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs @@ -1,12 +1,9 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::chain::start_chain::{ - ChainFullNodeStarter, ChainFullNodeStarterComponent, +use hermes_cosmos_test_components::bootstrap::traits::{ + ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, + HasChainNodeConfigType, }; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::HasChainNodeConfigType; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::HasChainGenesisConfigType; -use hermes_runtime_components::traits::fs::create_dir::CanCreateDir; -use hermes_runtime_components::traits::os::child_process::CanStartChildProcess; -use hermes_runtime_components::traits::runtime::HasRuntime; +use hermes_runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs b/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs index 3eeff3129..caac55f3c 100644 --- a/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs +++ b/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::types::genesis_config::{ +use hermes_cosmos_test_components::bootstrap::traits::{ ChainGenesisConfigTypeComponent, ProvideChainGenesisConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/types/node_config.rs b/relayer/crates/starknet-test-components/src/impls/types/node_config.rs index 7b50d3054..26601ffca 100644 --- a/relayer/crates/starknet-test-components/src/impls/types/node_config.rs +++ b/relayer/crates/starknet-test-components/src/impls/types/node_config.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::types::chain_node_config::{ +use hermes_cosmos_test_components::bootstrap::traits::{ ChainNodeConfigTypeComponent, ProvideChainNodeConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs index 6b0f5244b..85db866ec 100644 --- a/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_test_components::chain_driver::traits::types::chain::HasChainType; +use hermes_test_components::chain_driver::traits::HasChainType; #[cgp_component { provider: IbcContractsDeployer, diff --git a/relayer/crates/tools/bin/main.rs b/relayer/crates/tools/bin/main.rs index 02806970f..e7448594c 100644 --- a/relayer/crates/tools/bin/main.rs +++ b/relayer/crates/tools/bin/main.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use clap::Parser; use eyre::{eyre, Error}; -use hermes_cli_components::traits::command::CanRunCommand; +use hermes_cli_components::traits::CanRunCommand; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_tools_cli::commands::subcommand::AllSubCommands; use hermes_starknet_tools_cli::contexts::app::ToolApp; diff --git a/relayer/crates/tools/src/commands/starknet/subcommand.rs b/relayer/crates/tools/src/commands/starknet/subcommand.rs index 66fe408f7..7d6162c44 100644 --- a/relayer/crates/tools/src/commands/starknet/subcommand.rs +++ b/relayer/crates/tools/src/commands/starknet/subcommand.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, -}; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; use crate::commands::starknet::transfer_args::TransferArgs; diff --git a/relayer/crates/tools/src/commands/starknet/transfer_args.rs b/relayer/crates/tools/src/commands/starknet/transfer_args.rs index 9c5f19bee..5939c0e79 100644 --- a/relayer/crates/tools/src/commands/starknet/transfer_args.rs +++ b/relayer/crates/tools/src/commands/starknet/transfer_args.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_cli_components::traits::command::{CommandRunner, CommandRunnerComponent}; -use hermes_cli_components::traits::output::HasOutputType; -use hermes_encoding_components::traits::encode::CanEncode; -use hermes_logging_components::traits::logger::CanLog; -use hermes_logging_components::types::level::LevelInfo; +use hermes_cli_components::traits::{CommandRunner, CommandRunnerComponent, HasOutputType}; +use hermes_encoding_components::traits::CanEncode; +use hermes_logging_components::traits::CanLog; +use hermes_logging_components::types::LevelInfo; use hermes_starknet_chain_components::types::cosmos::height::Height; use hermes_starknet_chain_components::types::cosmos::timestamp::Timestamp; use hermes_starknet_chain_components::types::messages::ibc::channel::PortId; diff --git a/relayer/crates/tools/src/commands/subcommand.rs b/relayer/crates/tools/src/commands/subcommand.rs index fdcf264a0..371dd0d42 100644 --- a/relayer/crates/tools/src/commands/subcommand.rs +++ b/relayer/crates/tools/src/commands/subcommand.rs @@ -1,7 +1,5 @@ use cgp::prelude::*; -use hermes_cli_components::traits::command::{ - CanRunCommand, CommandRunner, CommandRunnerComponent, -}; +use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; use crate::commands::starknet::subcommand::StarknetSubCommand; diff --git a/relayer/crates/tools/src/contexts/app.rs b/relayer/crates/tools/src/contexts/app.rs index 538902975..ea8dcbc9b 100644 --- a/relayer/crates/tools/src/contexts/app.rs +++ b/relayer/crates/tools/src/contexts/app.rs @@ -4,29 +4,18 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::types::WithType; use cgp::prelude::*; -use hermes_cli_components::impls::config::get_config_path::GetDefaultConfigField; -use hermes_cli_components::impls::config::load_toml_config::LoadTomlConfig; -use hermes_cli_components::impls::config::save_toml_config::WriteTomlConfig; -use hermes_cli_components::traits::bootstrap::{ - BootstrapLoaderComponent, BootstrapTypeProviderComponent, CanLoadBootstrap, +use hermes_cli_components::impls::{GetDefaultConfigField, LoadTomlConfig, WriteTomlConfig}; +use hermes_cli_components::traits::{ + BootstrapLoaderComponent, BootstrapTypeProviderComponent, BuilderLoaderComponent, + BuilderTypeComponent, CanLoadBootstrap, CanLoadBuilder, CanLoadConfig, CanProduceOutput, + CanWriteConfig, CommandRunnerComponent, ConfigLoaderComponent, ConfigPathGetterComponent, + ConfigTypeComponent, ConfigWriterComponent, HasConfigPath, HasConfigType, OutputProducer, + OutputProducerComponent, OutputTypeComponent, }; -use hermes_cli_components::traits::build::{ - BuilderLoaderComponent, BuilderTypeComponent, CanLoadBuilder, -}; -use hermes_cli_components::traits::command::CommandRunnerComponent; -use hermes_cli_components::traits::config::config_path::{ - ConfigPathGetterComponent, HasConfigPath, -}; -use hermes_cli_components::traits::config::load_config::{CanLoadConfig, ConfigLoaderComponent}; -use hermes_cli_components::traits::config::write_config::{CanWriteConfig, ConfigWriterComponent}; -use hermes_cli_components::traits::output::{ - CanProduceOutput, OutputProducer, OutputProducerComponent, OutputTypeComponent, -}; -use hermes_cli_components::traits::types::config::{ConfigTypeComponent, HasConfigType}; -use hermes_logging_components::traits::logger::LoggerComponent; +use hermes_logging_components::traits::LoggerComponent; use hermes_relayer_components::error::traits::RetryableErrorComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::runtime::{ +use hermes_runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; @@ -37,7 +26,7 @@ use hermes_starknet_cli::impls::build::LoadStarknetBuilder; use hermes_starknet_cli::impls::error::ProvideCliError; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::StarknetBootstrap; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_tracing_logging_components::contexts::logger::TracingLogger; +use hermes_tracing_logging_components::contexts::TracingLogger; use crate::commands::starknet::subcommand::{RunStarknetSubCommand, StarknetSubCommand}; use crate::commands::starknet::transfer_args::{RunTransferArgs, TransferArgs}; From 855ecd99647a5d5a22a988f1a3d89f037ff4f5a9 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 20:21:26 +0000 Subject: [PATCH 02/13] Use hermes_core to simplify imports --- light-client/Cargo.lock | 35 ------- light-client/Cargo.toml | 7 -- relayer/Cargo.lock | 2 + .../src/components/chain.rs | 84 +++++++++-------- .../src/components/encoding/cairo.rs | 4 +- .../src/components/encoding/event.rs | 4 +- .../src/components/encoding/protobuf.rs | 4 +- .../src/components/starknet_to_cosmos.rs | 14 ++- .../src/components/types.rs | 2 +- .../src/impls/assert/assert_duration.rs | 2 +- .../src/impls/commitment_prefix.rs | 2 +- .../src/impls/commitment_proof.rs | 2 +- .../src/impls/contract/call.rs | 4 +- .../src/impls/contract/declare.rs | 2 +- .../src/impls/contract/deploy.rs | 4 +- .../src/impls/contract/message.rs | 2 +- .../src/impls/counterparty_message_height.rs | 2 +- .../src/impls/encoding/class_hash.rs | 2 +- .../src/impls/encoding/contract_address.rs | 2 +- .../src/impls/encoding/events.rs | 2 +- .../src/impls/events/ack.rs | 4 +- .../src/impls/events/channel.rs | 6 +- .../src/impls/events/connection_id.rs | 6 +- .../src/impls/events/create_client.rs | 6 +- .../src/impls/events/send_packet.rs | 4 +- .../src/impls/ibc_amount.rs | 8 +- .../src/impls/json_rpc.rs | 4 +- .../src/impls/messages/channel.rs | 8 +- .../src/impls/messages/connection.rs | 8 +- .../src/impls/messages/create_client.rs | 6 +- .../src/impls/messages/ibc_transfer.rs | 8 +- .../src/impls/messages/packet.rs | 8 +- .../src/impls/messages/update_client.rs | 6 +- .../src/impls/packet_fields.rs | 2 +- .../src/impls/packet_filter.rs | 2 +- .../impls/payload_builders/create_client.rs | 7 +- .../impls/payload_builders/update_client.rs | 8 +- .../src/impls/queries/ack_commitment.rs | 4 +- .../src/impls/queries/balance.rs | 6 +- .../src/impls/queries/block.rs | 2 +- .../src/impls/queries/block_events.rs | 4 +- .../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 | 4 +- .../src/impls/queries/contract_address.rs | 2 +- .../impls/queries/counterparty_chain_id.rs | 2 +- .../src/impls/queries/nonce.rs | 2 +- .../src/impls/queries/packet_commitment.rs | 4 +- .../src/impls/queries/packet_receipt.rs | 4 +- .../src/impls/queries/packet_received.rs | 4 +- .../src/impls/queries/status.rs | 5 +- .../src/impls/queries/storage_proof.rs | 8 +- .../src/impls/queries/token_address/create.rs | 6 +- .../src/impls/queries/token_address/get.rs | 4 +- .../queries/token_address/get_or_create.rs | 2 +- .../src/impls/queries/token_balance.rs | 4 +- .../src/impls/send_message.rs | 4 +- .../starknet_to_cosmos/connection_message.rs | 4 +- .../counterparty_message_height.rs | 4 +- .../create_client_message.rs | 10 +- .../impls/starknet_to_cosmos/ibc_amount.rs | 10 +- .../impls/starknet_to_cosmos/packet_fields.rs | 2 +- .../query_consensus_state_height.rs | 4 +- .../update_client_message.rs | 6 +- .../src/impls/transfer.rs | 6 +- .../src/impls/tx_response.rs | 4 +- .../src/impls/types/amount.rs | 8 +- .../src/impls/types/block.rs | 2 +- .../src/impls/types/client.rs | 9 +- .../src/impls/types/commitment_proof.rs | 2 +- .../src/impls/types/denom.rs | 4 +- .../src/impls/types/height.rs | 7 +- .../src/impls/types/payloads.rs | 7 +- .../src/impls/types/status.rs | 7 +- .../src/impls/types/timestamp.rs | 2 +- .../src/impls/types/wallet.rs | 6 +- .../src/traits/account.rs | 2 +- .../src/traits/commitment_proof.rs | 2 +- .../src/traits/contract/call.rs | 2 +- .../src/traits/contract/deploy.rs | 2 +- .../src/traits/contract/invoke.rs | 2 +- .../src/traits/contract/message.rs | 2 +- .../src/traits/messages/transfer.rs | 2 +- .../src/traits/queries/contract_address.rs | 2 +- .../src/traits/queries/storage_proof.rs | 4 +- .../src/traits/queries/token_address.rs | 2 +- .../src/traits/queries/token_balance.rs | 2 +- .../src/traits/signer.rs | 2 +- .../src/traits/transfer.rs | 2 +- .../src/types/channel_id.rs | 2 +- .../src/types/client_id.rs | 2 +- .../src/types/client_state.rs | 2 +- .../src/types/connection_id.rs | 2 +- .../src/types/consensus_state.rs | 2 +- .../src/types/cosmos/client_state.rs | 4 +- .../src/types/cosmos/height.rs | 6 +- .../src/types/cosmos/timestamp.rs | 2 +- .../src/types/cosmos/update.rs | 2 +- .../src/types/events/channel.rs | 2 +- .../src/types/events/connection.rs | 2 +- .../src/types/events/erc20.rs | 2 +- .../src/types/events/ics20.rs | 2 +- .../src/types/events/packet.rs | 2 +- .../src/types/message_response.rs | 4 +- .../src/types/messages/erc20/transfer.rs | 4 +- .../src/types/messages/ibc/channel.rs | 2 +- .../src/types/messages/ibc/connection.rs | 2 +- .../src/types/messages/ibc/packet.rs | 4 +- .../src/contexts/chain.rs | 92 +++++++++---------- .../src/contexts/encoding/cairo.rs | 4 +- .../src/contexts/encoding/event.rs | 2 +- .../src/contexts/encoding/protobuf.rs | 2 +- .../src/impls/build_account.rs | 4 +- .../starknet-chain-context/src/impls/error.rs | 21 +++-- relayer/crates/starknet-cli/Cargo.toml | 2 + .../starknet-cli/examples/bootstrap_ibc.rs | 10 +- .../crates/starknet-cli/src/contexts/app.rs | 10 +- .../src/impls/bootstrap/starknet_chain.rs | 2 +- .../crates/starknet-cli/src/impls/build.rs | 2 +- .../crates/starknet-cli/src/impls/error.rs | 2 +- .../src/contexts/chain_driver.rs | 18 ++-- .../contexts/cosmos_starknet_relay_driver.rs | 16 ++-- .../src/contexts/osmosis_bootstrap.rs | 12 ++- .../src/contexts/setup.rs | 32 +++---- .../src/contexts/starknet_bootstrap.rs | 12 ++- .../contexts/starknet_cosmos_relay_driver.rs | 16 ++-- .../src/contexts/test_driver.rs | 32 +++---- .../src/impls/build_bootstrap.rs | 8 +- .../src/tests/erc20.rs | 6 +- .../src/tests/test_suite.rs | 2 +- .../src/tests/timeout_packet.rs | 20 ++-- .../src/tests/update_client.rs | 12 +-- .../src/utils/init_bootstrap.rs | 2 +- .../src/utils/init_setup.rs | 2 +- .../src/contexts/bootstrap.rs | 12 ++- .../src/contexts/chain.rs | 22 +++-- .../src/contexts/chain_driver.rs | 18 ++-- .../src/impls/build_account.rs | 4 +- .../src/impls/build_chain_driver.rs | 8 +- .../src/impls/contract/call.rs | 4 +- .../src/impls/contract/declare.rs | 2 +- .../src/impls/contract/deploy.rs | 4 +- .../src/impls/error/handler.rs | 21 +++-- .../src/impls/init_bootstrap.rs | 2 +- .../impls/payload_builders/update_client.rs | 8 +- .../src/impls/queries/block.rs | 2 +- .../src/impls/queries/block_events.rs | 4 +- .../src/impls/queries/nonce.rs | 2 +- .../src/impls/queries/status.rs | 5 +- .../src/impls/queries/tx_response.rs | 4 +- .../src/impls/send_message.rs | 4 +- .../starknet-madara-tests/src/tests/erc20.rs | 8 +- .../src/tests/raw_storage.rs | 8 +- .../starknet-relayer/src/contexts/builder.rs | 30 +++--- .../src/contexts/cosmos_starknet_birelay.rs | 18 ++-- .../src/contexts/cosmos_to_starknet_relay.rs | 12 +-- .../src/contexts/starknet_cosmos_birelay.rs | 18 ++-- .../src/contexts/starknet_to_cosmos_relay.rs | 12 +-- .../starknet-relayer/src/impls/error.rs | 10 +- .../starknet-relayer/src/presets/relay.rs | 18 ++-- .../src/impls/bootstrap/bootstrap_chain.rs | 16 ++-- .../src/impls/bootstrap/deploy_contracts.rs | 14 +-- .../src/impls/bootstrap/start_chain.rs | 2 +- .../impls/bootstrap_madara/bootstrap_chain.rs | 16 ++-- .../src/impls/bootstrap_madara/start_all.rs | 2 +- .../src/impls/bootstrap_madara/start_anvil.rs | 2 +- .../impls/bootstrap_madara/start_madara.rs | 2 +- .../bootstrap_madara/start_pathfinder.rs | 2 +- .../src/traits/deploy_contracts.rs | 2 +- .../src/commands/starknet/transfer_args.rs | 6 +- relayer/crates/tools/src/contexts/app.rs | 8 +- 172 files changed, 603 insertions(+), 620 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index 0ad28c371..7a8ff0ad6 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -2395,42 +2395,7 @@ dependencies = [ "syn 2.0.98", ] -[[patch.unused]] -name = "hermes-chain-components" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - -[[patch.unused]] -name = "hermes-chain-type-components" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - [[patch.unused]] name = "hermes-core" version = "0.1.0" source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - -[[patch.unused]] -name = "hermes-logging-components" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - -[[patch.unused]] -name = "hermes-relayer-components" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - -[[patch.unused]] -name = "hermes-relayer-components-extra" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - -[[patch.unused]] -name = "hermes-runtime-components" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" - -[[patch.unused]] -name = "hermes-test-components" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml index cb6bae505..ed16f622e 100644 --- a/light-client/Cargo.toml +++ b/light-client/Cargo.toml @@ -97,13 +97,6 @@ cgp-inner = { git = "https://github.com/contextgeneric/cgp.git" } hermes-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-relayer-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-relayer-components-extra = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-chain-type-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 119a2f1ae..dda0b65e1 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2437,11 +2437,13 @@ dependencies = [ "hermes-chain-components", "hermes-cli", "hermes-cli-components", + "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-error", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime", "hermes-runtime-components", diff --git a/relayer/crates/starknet-chain-components/src/components/chain.rs b/relayer/crates/starknet-chain-components/src/components/chain.rs index e3dc7c572..fb8045e19 100644 --- a/relayer/crates/starknet-chain-components/src/components/chain.rs +++ b/relayer/crates/starknet-chain-components/src/components/chain.rs @@ -2,7 +2,7 @@ mod preset { use cgp::core::types::UseDelegatedType; use cgp::prelude::*; - use hermes_chain_components::impls::{ + use hermes_core::chain_components::impls::{ BuildChannelHandshakePayload, BuildConnectionHandshakePayload, BuildPacketPayloads, ProvideBytesPacketCommitment, ProvideBytesPacketReceipt, ProvideChannelPayloadTypes, ProvideCommitmentPrefixBytes, ProvideConnectionPayloadTypes, ProvidePacketPayloadTypes, @@ -10,11 +10,12 @@ mod preset { QueryLatestConsensusStateHeightAsHeights, RetryQueryBlockEvents, WaitBlockHeightAndQueryEvents, }; - use hermes_chain_components::traits::{ + use hermes_core::chain_components::traits::{ AckCommitmentHashTypeProviderComponent, AckPacketMessageBuilderComponent, AckPacketPayloadBuilderComponent, AckPacketPayloadTypeProviderComponent, AcknowledgementTypeProviderComponent, BlockEventsQuerierComponent, BlockQuerierComponent, - BlockTypeComponent, ChannelEndQuerierComponent, ChannelEndTypeComponent, + BlockTypeComponent, ChainIdTypeProviderComponent, ChainStatusQuerierComponent, + ChainStatusTypeComponent, ChannelEndQuerierComponent, ChannelEndTypeComponent, ChannelEndWithProofsQuerierComponent, ChannelIdTypeComponent, ChannelOpenAckMessageBuilderComponent, ChannelOpenAckPayloadBuilderComponent, ChannelOpenAckPayloadTypeComponent, ChannelOpenConfirmMessageBuilderComponent, @@ -23,34 +24,37 @@ mod preset { ChannelOpenTryEventComponent, ChannelOpenTryMessageBuilderComponent, ChannelOpenTryPayloadBuilderComponent, ChannelOpenTryPayloadTypeComponent, ClientIdTypeComponent, ClientStateFieldsComponent, ClientStateQuerierComponent, - ClientStateWithProofsQuerierComponent, CommitmentPrefixTypeComponent, - CommitmentProofBytesGetterComponent, CommitmentProofHeightGetterComponent, - CommitmentProofTypeProviderComponent, ConnectionEndQuerierComponent, - ConnectionEndTypeComponent, ConnectionEndWithProofsQuerierComponent, - ConnectionIdTypeComponent, ConnectionOpenAckMessageBuilderComponent, - ConnectionOpenAckPayloadBuilderComponent, ConnectionOpenAckPayloadTypeComponent, - ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenConfirmPayloadBuilderComponent, - ConnectionOpenConfirmPayloadTypeComponent, ConnectionOpenInitEventComponent, - ConnectionOpenInitMessageBuilderComponent, ConnectionOpenInitPayloadBuilderComponent, - ConnectionOpenInitPayloadTypeComponent, ConnectionOpenTryEventComponent, - ConnectionOpenTryMessageBuilderComponent, ConnectionOpenTryPayloadBuilderComponent, - ConnectionOpenTryPayloadTypeComponent, ConsensusStateHeightQuerierComponent, - ConsensusStateHeightsQuerierComponent, ConsensusStateQuerierComponent, + ClientStateTypeComponent, ClientStateWithProofsQuerierComponent, + CommitmentPrefixTypeComponent, CommitmentProofBytesGetterComponent, + CommitmentProofHeightGetterComponent, CommitmentProofTypeProviderComponent, + ConnectionEndQuerierComponent, ConnectionEndTypeComponent, + ConnectionEndWithProofsQuerierComponent, ConnectionIdTypeComponent, + ConnectionOpenAckMessageBuilderComponent, ConnectionOpenAckPayloadBuilderComponent, + ConnectionOpenAckPayloadTypeComponent, ConnectionOpenConfirmMessageBuilderComponent, + ConnectionOpenConfirmPayloadBuilderComponent, ConnectionOpenConfirmPayloadTypeComponent, + ConnectionOpenInitEventComponent, ConnectionOpenInitMessageBuilderComponent, + ConnectionOpenInitPayloadBuilderComponent, ConnectionOpenInitPayloadTypeComponent, + ConnectionOpenTryEventComponent, ConnectionOpenTryMessageBuilderComponent, + ConnectionOpenTryPayloadBuilderComponent, ConnectionOpenTryPayloadTypeComponent, + ConsensusStateHeightQuerierComponent, ConsensusStateHeightsQuerierComponent, + ConsensusStateQuerierComponent, ConsensusStateTypeComponent, ConsensusStateWithProofsQuerierComponent, CounterpartyChainIdQuerierComponent, CounterpartyConnectionIdQuerierComponent, CounterpartyMessageHeightGetterComponent, CreateClientEventComponent, CreateClientMessageBuilderComponent, CreateClientMessageOptionsTypeComponent, CreateClientPayloadBuilderComponent, CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, - EventExtractorComponent, HeightAdjusterComponent, HeightIncrementerComponent, + EventExtractorComponent, EventTypeProviderComponent, HeightAdjusterComponent, + HeightFieldComponent, HeightIncrementerComponent, HeightTypeProviderComponent, IbcCommitmentPrefixGetterComponent, IncomingPacketFilterComponent, InitChannelOptionsTypeComponent, InitConnectionOptionsTypeComponent, - MessageResponseExtractorComponent, OutgoingPacketFilterComponent, - OutgoingPacketTypeComponent, PacketAckCommitmentQuerierComponent, - PacketCommitmentQuerierComponent, PacketCommitmentTypeComponent, - PacketDstChannelIdGetterComponent, PacketDstPortIdGetterComponent, - PacketFromSendPacketEventBuilderComponent, PacketFromWriteAckEventBuilderComponent, - PacketIsClearedQuerierComponent, PacketIsReceivedQuerierComponent, - PacketReceiptQuerierComponent, PacketReceiptTypeComponent, PacketSequenceGetterComponent, + MessageResponseExtractorComponent, MessageSenderComponent, MessageTypeProviderComponent, + OutgoingPacketFilterComponent, OutgoingPacketTypeComponent, + PacketAckCommitmentQuerierComponent, PacketCommitmentQuerierComponent, + PacketCommitmentTypeComponent, PacketDstChannelIdGetterComponent, + PacketDstPortIdGetterComponent, PacketFromSendPacketEventBuilderComponent, + PacketFromWriteAckEventBuilderComponent, PacketIsClearedQuerierComponent, + PacketIsReceivedQuerierComponent, PacketReceiptQuerierComponent, + PacketReceiptTypeComponent, PacketSequenceGetterComponent, PacketSrcChannelIdGetterComponent, PacketSrcPortIdGetterComponent, PacketTimeoutHeightGetterComponent, PacketTimeoutTimestampGetterComponent, PortIdTypeComponent, ReceivePacketMessageBuilderComponent, @@ -61,42 +65,36 @@ mod preset { UpdateClientMessageBuilderComponent, UpdateClientPayloadBuilderComponent, UpdateClientPayloadTypeComponent, WriteAckEventComponent, }; - use hermes_chain_type_components::traits::{ + use hermes_core::chain_type_components::traits::{ AddressTypeProviderComponent, AmountDenomGetterComponent, AmountTypeProviderComponent, DenomTypeComponent, MessageResponseEventsGetterComponent, MessageResponseTypeComponent, TimeTypeComponent, }; - use hermes_core::chain_components::traits::{ - ChainIdTypeProviderComponent, ChainStatusQuerierComponent, ChainStatusTypeComponent, - ClientStateTypeComponent, ConsensusStateTypeComponent, EventTypeProviderComponent, - HeightFieldComponent, HeightTypeProviderComponent, MessageSenderComponent, - MessageTypeProviderComponent, - }; - use hermes_cosmos_chain_components::impls::{ - CosmosPacketFieldReader, FixedPollTimeoutSecs, ProvideCosmosChainTypes, - ProvideCosmosInitChannelOptionsType, ProvideCosmosInitConnectionOptionsType, - ProvideNoCreateClientMessageOptionsType, QueryCounterpartyConnectionId, - }; - use hermes_relayer_components::components::default::DefaultTxComponents; - use hermes_relayer_components::error::impls::retry::ReturnRetryable; - use hermes_relayer_components::error::traits::RetryableErrorComponent; - use hermes_relayer_components::transaction::impls::PollTimeoutGetterComponent; - use hermes_relayer_components::transaction::traits::{ + use hermes_core::relayer_components::components::default::DefaultTxComponents; + use hermes_core::relayer_components::error::impls::retry::ReturnRetryable; + use hermes_core::relayer_components::error::traits::RetryableErrorComponent; + use hermes_core::relayer_components::transaction::impls::PollTimeoutGetterComponent; + use hermes_core::relayer_components::transaction::traits::{ MessagesWithSignerAndNonceSenderComponent, MessagesWithSignerSenderComponent, NonceAllocatorComponent, NonceQuerierComponent, NonceTypeProviderComponent, SignerTypeProviderComponent, TxHashTypeProviderComponent, TxMessageResponseParserComponent, TxResponsePollerComponent, TxResponseQuerierComponent, TxResponseTypeProviderComponent, }; - use hermes_test_components::chain::impls::{ + use hermes_core::test_components::chain::impls::{ PollAssertEventualAmount, ProvideDefaultMemo, SendIbcTransferMessage, }; - use hermes_test_components::chain::traits::{ + use hermes_core::test_components::chain::traits::{ AmountMethodsComponent, BalanceQuerierComponent, DefaultMemoGetterComponent, EventualAmountAsserterComponent, IbcTokenTransferMessageBuilderComponent, IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, MemoTypeProviderComponent, PollAssertDurationGetterComponent, TokenIbcTransferrerComponent, WalletSignerComponent, WalletTypeComponent, }; + use hermes_cosmos_chain_components::impls::{ + CosmosPacketFieldReader, FixedPollTimeoutSecs, ProvideCosmosChainTypes, + ProvideCosmosInitChannelOptionsType, ProvideCosmosInitConnectionOptionsType, + ProvideNoCreateClientMessageOptionsType, QueryCounterpartyConnectionId, + }; use ibc::core::host::types::identifiers::ChainId; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs index 980375ced..f02c1813e 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs @@ -14,8 +14,8 @@ mod preset { use hermes_cairo_encoding_components::impls::encode_mut::reference::EncodeDeref; use hermes_cairo_encoding_components::impls::encode_mut::vec::EncodeList; use hermes_cairo_encoding_components::strategy::ViaCairo; - use hermes_encoding_components::impls::{EncodeFields, EncodeTaggedField}; - use hermes_encoding_components::traits::{ + use hermes_core::encoding_components::impls::{EncodeFields, EncodeTaggedField}; + use hermes_core::encoding_components::traits::{ DecodeBufferBuilderComponent, DecodeBufferPeekerComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/event.rs b/relayer/crates/starknet-chain-components/src/components/encoding/event.rs index 5dd7a863b..cb9e626c2 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/event.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/event.rs @@ -3,8 +3,8 @@ mod preset { use cgp::core::component::UseDelegate; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; - pub use hermes_encoding_components::traits::DecoderComponent; - use hermes_encoding_components::traits::{EncodedTypeComponent, ProvideEncodedType}; + pub use hermes_core::encoding_components::traits::DecoderComponent; + use hermes_core::encoding_components::traits::{EncodedTypeComponent, ProvideEncodedType}; use crate::impls::encoding::class_hash::DecodeOptionalByClassHash; use crate::impls::encoding::contract_address::DecodeOptionalByContractAddress; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs index 5eb99a915..b056f3649 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs @@ -2,8 +2,8 @@ mod preset { use cgp::core::component::{UseContext, UseDelegate}; use cgp::prelude::*; - use hermes_encoding_components::impls::{ProvideEncodedBytes, ProvideStringSchema}; - use hermes_encoding_components::traits::{ + use hermes_core::encoding_components::impls::{ProvideEncodedBytes, ProvideStringSchema}; + use hermes_core::encoding_components::traits::{ ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaGetterComponent, SchemaTypeComponent, 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 ed1434c8f..5e1da6a33 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 @@ -2,14 +2,16 @@ mod preset { use cgp::core::types::WithType; use cgp::prelude::*; - use hermes_chain_components::traits::{ + use hermes_core::chain_components::traits::{ AckPacketMessageBuilderComponent, ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilderComponent, ChannelOpenTryMessageBuilderComponent, ClientStateFieldsComponent, - ClientStateTypeComponent, ConnectionOpenAckMessageBuilderComponent, + ClientStateQuerierComponent, ClientStateTypeComponent, + ClientStateWithProofsQuerierComponent, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilderComponent, ConnectionOpenTryMessageBuilderComponent, ConsensusStateHeightsQuerierComponent, - ConsensusStateTypeComponent, CounterpartyMessageHeightGetterComponent, + ConsensusStateQuerierComponent, ConsensusStateTypeComponent, + ConsensusStateWithProofsQuerierComponent, CounterpartyMessageHeightGetterComponent, CreateClientMessageBuilderComponent, CreateClientMessageOptionsTypeComponent, CreateClientPayloadBuilderComponent, CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, PacketDstChannelIdGetterComponent, @@ -20,15 +22,11 @@ mod preset { UpdateClientMessageBuilderComponent, UpdateClientPayloadBuilderComponent, UpdateClientPayloadTypeComponent, }; - use hermes_core::chain_components::traits::{ - ClientStateQuerierComponent, ClientStateWithProofsQuerierComponent, - ConsensusStateQuerierComponent, ConsensusStateWithProofsQuerierComponent, - }; + use hermes_core::test_components::chain::traits::IbcTransferredAmountConverterComponent; use hermes_cosmos_chain_components::impls::{ BuildCosmosPacketMessages, CosmosPacketFieldReader, }; use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; - use hermes_test_components::chain::traits::IbcTransferredAmountConverterComponent; use crate::impls::starknet_to_cosmos::connection_message::BuildStarknetToCosmosConnectionHandshake; use crate::impls::starknet_to_cosmos::counterparty_message_height::GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/components/types.rs b/relayer/crates/starknet-chain-components/src/components/types.rs index 88dd8966b..8cc3b57ff 100644 --- a/relayer/crates/starknet-chain-components/src/components/types.rs +++ b/relayer/crates/starknet-chain-components/src/components/types.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ ChannelEndTypeComponent, ChannelIdTypeComponent, ClientIdTypeComponent, ConnectionEndTypeComponent, ConnectionIdTypeComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs b/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs index 7194630f4..32023776d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs +++ b/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs @@ -1,7 +1,7 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_test_components::chain::traits::{ +use hermes_core::test_components::chain::traits::{ PollAssertDurationGetter, PollAssertDurationGetterComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs b/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs index 8d7c2e3ed..fe5ce6302 100644 --- a/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs +++ b/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs @@ -1,7 +1,7 @@ use std::sync::LazyLock; use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasCommitmentPrefixType, IbcCommitmentPrefixGetter, IbcCommitmentPrefixGetterComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs index dbedc0e90..ca9418c84 100644 --- a/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs @@ -1,7 +1,7 @@ use core::num::TryFromIntError; use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; use indexmap::IndexMap; use starknet::core::crypto::pedersen_hash; use starknet::core::types::{Felt, MerkleNode, StorageProof}; 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 7ff3df582..c46d5dba3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/call.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/call.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::HasHeightType; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_components::traits::HasHeightType; +use hermes_core::chain_type_components::traits::HasAddressType; use starknet::core::types::{BlockId, BlockTag, Felt, FunctionCall}; use starknet::providers::{Provider, ProviderError}; 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 67bcf2fa0..74cb62007 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs @@ -6,7 +6,7 @@ use cairo_lang_starknet_classes::casm_contract_class::{ use cairo_lang_starknet_classes::contract_class::ContractClass; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use starknet::accounts::Account; use starknet::core::types::contract::{ CompiledClass, ComputeClassHashError, JsonError, SierraClass, 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 802f0484d..27cb975b2 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; -use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use starknet::contract::ContractFactory; use starknet::core::types::{Felt, RevertedInvocation}; use starknet::macros::felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/message.rs b/relayer/crates/starknet-chain-components/src/impls/contract/message.rs index 8567c5b81..40c81f08b 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/message.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; use hermes_core::chain_components::traits::HasMessageType; +use hermes_core::chain_type_components::traits::HasAddressType; use starknet::core::types::Felt; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs index 74fd98d88..e66b5b305 100644 --- a/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, HasMessageType, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs index e17b4484c..496f5eebd 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs @@ -3,7 +3,7 @@ use std::collections::HashSet; use std::sync::OnceLock; use cgp::prelude::*; -use hermes_encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; +use hermes_core::encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; use starknet::core::types::Felt; use crate::types::event::StarknetEvent; diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs index f5ff346a1..c364a9277 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs @@ -3,7 +3,7 @@ use std::collections::HashSet; use std::sync::OnceLock; use cgp::prelude::*; -use hermes_encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; +use hermes_core::encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; use crate::impls::types::address::StarknetAddress; use crate::types::event::StarknetEvent; 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 896f193c2..c45e3d28b 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs @@ -1,6 +1,6 @@ use cgp::prelude::HasAsyncErrorType; use hermes_cairo_encoding_components::strategy::ViaCairo; -use hermes_encoding_components::traits::{CanDecode, HasEncodedType}; +use hermes_core::encoding_components::traits::{CanDecode, HasEncodedType}; pub trait CanFilterDecodeEvents: HasEncodedType + HasAsyncErrorType { fn filter_decode_events(&self, encoded: &[Self::Encoded]) -> Result, Self::Error>; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/ack.rs b/relayer/crates/starknet-chain-components/src/impls/events/ack.rs index 86ccf94e8..ed2558f89 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/ack.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/ack.rs @@ -5,12 +5,12 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ EventExtractor, EventExtractorComponent, HasAcknowledgementType, HasEventType, HasOutgoingPacketType, HasWriteAckEvent, PacketFromWriteAckEventBuilder, PacketFromWriteAckEventBuilderComponent, ProvideWriteAckEvent, WriteAckEventComponent, }; -use hermes_encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; +use hermes_core::encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; use ibc::apps::transfer::types::{Amount, BaseDenom, Memo, PrefixedDenom, TracePath}; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/channel.rs b/relayer/crates/starknet-chain-components/src/impls/events/channel.rs index f54615da0..2618b0f91 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/channel.rs @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ ChannelOpenInitEventComponent, ChannelOpenTryEventComponent, HasChannelIdType, MessageResponseExtractor, MessageResponseExtractorComponent, ProvideChannelOpenInitEvent, ProvideChannelOpenTryEvent, }; -use hermes_chain_type_components::traits::HasMessageResponseType; -use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; +use hermes_core::chain_type_components::traits::HasMessageResponseType; +use hermes_core::encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs b/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs index d5587bdff..9fb181c6b 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ ConnectionOpenInitEventComponent, ConnectionOpenTryEventComponent, HasConnectionIdType, MessageResponseExtractor, MessageResponseExtractorComponent, ProvideConnectionOpenInitEvent, ProvideConnectionOpenTryEvent, }; -use hermes_chain_type_components::traits::HasMessageResponseType; -use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; +use hermes_core::chain_type_components::traits::HasMessageResponseType; +use hermes_core::encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs b/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs index 193989588..5e23971fe 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs @@ -3,12 +3,12 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CreateClientEventComponent, HasClientIdType, MessageResponseExtractor, MessageResponseExtractorComponent, ProvideCreateClientEvent, }; -use hermes_chain_type_components::traits::HasMessageResponseType; -use hermes_encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; +use hermes_core::chain_type_components::traits::HasMessageResponseType; +use hermes_core::encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs b/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs index 3c51a9283..b69b0a26c 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs @@ -5,12 +5,12 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ EventExtractor, EventExtractorComponent, HasEventType, HasOutgoingPacketType, HasSendPacketEvent, PacketFromSendPacketEventBuilder, PacketFromSendPacketEventBuilderComponent, ProvideSendPacketEvent, SendPacketEventComponent, }; -use hermes_encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; +use hermes_core::encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; use ibc::apps::transfer::types::{Amount, BaseDenom, Memo, PrefixedDenom, TracePath}; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; diff --git a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs index 76bfff920..dad5a507e 100644 --- a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_components::traits::{HasChannelIdType, HasPortIdType}; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; -use hermes_cosmos_test_components::chain::types::Amount; -use hermes_test_components::chain::traits::{ +use hermes_core::chain_components::traits::{HasChannelIdType, HasPortIdType}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; +use hermes_core::test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; +use hermes_cosmos_test_components::chain::types::Amount; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs b/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs index b8d2f7a35..90b26a983 100644 --- a/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs +++ b/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_logging_components::traits::CanLog; -use hermes_logging_components::types::LevelTrace; +use hermes_core::logging_components::traits::CanLog; +use hermes_core::logging_components::types::LevelTrace; use serde::{Deserialize, Serialize}; use crate::traits::json_rpc::{JsonRpcRequestSender, JsonRpcRequestSenderComponent}; 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 ee9377050..d1867aac7 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs @@ -3,7 +3,7 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ ChannelOpenAckMessageBuilder, ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilder, ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilder, ChannelOpenInitMessageBuilderComponent, @@ -12,12 +12,12 @@ use hermes_chain_components::traits::{ HasChannelOpenTryPayloadType, HasCommitmentProofType, HasConnectionIdType, HasHeightType, HasInitChannelOptionsType, HasMessageType, HasPortIdType, }; -use hermes_chain_components::types::payloads::channel::{ +use hermes_core::chain_components::types::payloads::channel::{ ChannelOpenAckPayload, ChannelOpenConfirmPayload, ChannelOpenTryPayload, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::{CosmosCommitmentProof, CosmosInitChannelOptions}; -use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc::core::channel::types::channel::{ChannelEnd, Order as IbcOrder}; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId as IbcPortId}; 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 061c14f0b..c44865d94 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs @@ -6,7 +6,7 @@ use core::time::Duration; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilder, ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilder, ConnectionOpenInitMessageBuilderComponent, @@ -16,13 +16,13 @@ use hermes_chain_components::traits::{ HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, HasHeightType, HasInitConnectionOptionsType, HasMessageType, }; -use hermes_chain_components::types::payloads::connection::{ +use hermes_core::chain_components::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, ConnectionOpenTryPayload, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::{CosmosCommitmentProof, CosmosInitConnectionOptions}; -use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::{ 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 6d0172f06..68d754716 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CreateClientMessageBuilder, CreateClientMessageBuilderComponent, HasCreateClientMessageOptionsType, HasCreateClientPayloadType, HasMessageType, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::CosmosCreateClientPayload; -use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use starknet::core::types::Felt; use starknet::macros::{selector, short_string}; diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs b/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs index 33debd1de..64383f0f8 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs @@ -4,12 +4,12 @@ use std::str::FromStr; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasChannelIdType, HasHeightFields, HasMessageType, HasPortIdType, HasTimeoutType, }; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_test_components::chain::traits::{ +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_core::test_components::chain::traits::{ HasMemoType, IbcTokenTransferMessageBuilder, IbcTokenTransferMessageBuilderComponent, }; use ibc::core::host::types::identifiers::PortId; 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 830c72fc3..f12e89d14 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs @@ -3,19 +3,19 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ AckPacketMessageBuilder, AckPacketMessageBuilderComponent, HasAckPacketPayloadType, HasAcknowledgementType, HasCommitmentProofType, HasHeightType, HasMessageType, HasOutgoingPacketType, HasReceivePacketPayloadType, HasTimeoutUnorderedPacketPayloadType, ReceivePacketMessageBuilder, ReceivePacketMessageBuilderComponent, TimeoutUnorderedPacketMessageBuilder, TimeoutUnorderedPacketMessageBuilderComponent, }; -use hermes_chain_components::types::payloads::packet::{ +use hermes_core::chain_components::types::payloads::packet::{ AckPacketPayload, ReceivePacketPayload, TimeoutUnorderedPacketPayload, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::CosmosCommitmentProof; -use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc::apps::transfer::types::packet::PacketData as IbcIcs20PacketData; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; 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 eb26ccb37..d78ac8981 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasClientIdType, HasCreateClientMessageOptionsType, HasMessageType, HasUpdateClientPayloadType, UpdateClientMessageBuilder, UpdateClientMessageBuilderComponent, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::CosmosUpdateClientPayload; -use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader; use ibc_proto::Protobuf; use starknet::core::types::{ByteArray, Felt}; diff --git a/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs b/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs index 758d7dba1..5ee37d6ba 100644 --- a/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs +++ b/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasChannelIdType, HasOutgoingPacketType, PacketSrcChannelIdGetter, PacketSrcChannelIdGetterComponent, }; 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 eef68857f..704d798b7 100644 --- a/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs +++ b/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasIncomingPacketType, HasOutgoingPacketType, IncomingPacketFilter, IncomingPacketFilterComponent, OutgoingPacketFilter, OutgoingPacketFilterComponent, }; 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 93af59d33..3682ab993 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,9 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ - CanQueryBlock, CanQueryChainHeight, CreateClientPayloadBuilderComponent, HasChainId, -}; use hermes_core::chain_components::traits::{ - CreateClientPayloadBuilder, HasCreateClientPayloadOptionsType, HasCreateClientPayloadType, + CanQueryBlock, CanQueryChainHeight, CreateClientPayloadBuilder, + CreateClientPayloadBuilderComponent, HasChainId, HasCreateClientPayloadOptionsType, + HasCreateClientPayloadType, }; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; use ibc::core::client::types::error::ClientError; 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 f8023fa7a..623597ac7 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,11 +1,11 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{CanQueryBlock, UpdateClientPayloadBuilderComponent}; use hermes_core::chain_components::traits::{ - HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, + CanQueryBlock, HasClientStateType, HasHeightType, HasUpdateClientPayloadType, + UpdateClientPayloadBuilder, UpdateClientPayloadBuilderComponent, }; +use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; +use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanEncode, HasDefaultEncoding}; -use hermes_encoding_components::types::AsBytes; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::client::types::Height; use ibc::primitives::Timestamp; 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 ffd788d30..c0d026594 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, HasAckCommitmentHashType, HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, HasPortIdType, HasSequenceType, PacketAckCommitmentQuerier, PacketAckCommitmentQuerierComponent, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{AckPath, Path}; use starknet::core::types::Felt; 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 ba38633bc..ab8bc31c9 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; -use hermes_encoding_components::traits::{CanDecode, HasEncoding}; -use hermes_test_components::chain::traits::{BalanceQuerier, BalanceQuerierComponent}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; +use hermes_core::encoding_components::traits::{CanDecode, HasEncoding}; +use hermes_core::test_components::chain::traits::{BalanceQuerier, BalanceQuerierComponent}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs index 9ea9c3e52..2192d9444 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; use hermes_cosmos_chain_components::types::Time; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs index a29f382a2..2b6a49fad 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ BlockEventsQuerier, BlockEventsQuerierComponent, HasEventType, HasHeightType, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; use starknet::core::types::{BlockId, EventFilter}; use starknet::providers::{Provider, ProviderError}; 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 0078c33c7..50531e326 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, CanQueryChainHeight, ChannelEndQuerier, ChannelEndQuerierComponent, ChannelEndWithProofsQuerier, ChannelEndWithProofsQuerierComponent, HasChannelEndType, HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, HasPortIdType, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::path::{ChannelEndPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 b7e180d96..c5dd45a98 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, CanQueryClientState, ClientStateQuerier, ClientStateQuerierComponent, ClientStateWithProofsQuerier, ClientStateWithProofsQuerierComponent, HasClientIdType, HasClientStateType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::path::{ClientStatePath, Path}; use starknet::core::types::Felt; use starknet::macros::selector; 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 9ccc29701..7b3f6e25e 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 @@ -3,14 +3,14 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, ConnectionEndQuerier, ConnectionEndQuerierComponent, ConnectionEndWithProofsQuerier, ConnectionEndWithProofsQuerierComponent, HasCommitmentProofType, HasConnectionEndType, HasConnectionIdType, HasHeightType, HasIbcCommitmentPrefix, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::path::{ConnectionPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 9995766d1..93aac8464 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 @@ -3,14 +3,14 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, CanQueryConsensusState, ConsensusStateQuerier, ConsensusStateQuerierComponent, ConsensusStateWithProofsQuerier, ConsensusStateWithProofsQuerierComponent, HasClientIdType, HasCommitmentProofType, HasConsensusStateType, HasHeightFields, HasHeightType, HasIbcCommitmentPrefix, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::client::types::Height as IbcHeight; use ibc::core::host::types::path::{ClientConsensusStatePath, Path}; use starknet::core::types::Felt; 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 9ac07ae19..fd445d97e 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 @@ -2,7 +2,7 @@ use core::marker::PhantomData; use std::sync::OnceLock; use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; use crate::traits::queries::contract_address::{ ContractAddressQuerier, ContractAddressQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs b/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs index 42d09113f..462a06013 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryChainHeight, CanQueryChannelEnd, CanQueryClientState, CanQueryConnectionEnd, CounterpartyChainIdQuerier, CounterpartyChainIdQuerierComponent, HasChannelEndType, HasChannelIdType, HasClientIdType, HasClientStateFields, HasConnectionEndType, diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs b/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs index 84ca46605..9d74d64e8 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::relayer_components::transaction::traits::{ HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; use starknet::accounts::ConnectedAccount; 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 f9aea0631..b6139294d 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, HasPacketCommitmentType, HasPortIdType, HasSequenceType, PacketCommitmentQuerier, PacketCommitmentQuerierComponent, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{CommitmentPath, Path}; use starknet::core::types::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 5caa6e53e..3f2022d17 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 @@ -3,13 +3,13 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, HasPacketReceiptType, HasPortIdType, HasSequenceType, PacketReceiptQuerier, PacketReceiptQuerierComponent, }; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{Path, ReceiptPath}; use starknet::core::types::Felt; 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 66aba8333..f758dccd7 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 @@ -3,11 +3,11 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasChannelIdType, HasCommitmentProofType, HasHeightType, HasPacketCommitmentType, HasPortIdType, HasSequenceType, PacketIsReceivedQuerier, PacketIsReceivedQuerierComponent, }; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use starknet::core::types::Felt; use starknet::macros::selector; 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 5d95cfddb..bd363829e 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/status.rs @@ -1,6 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::ChainStatusQuerierComponent; -use hermes_core::chain_components::traits::{ChainStatusQuerier, HasChainStatusType}; +use hermes_core::chain_components::traits::{ + ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, +}; use hermes_cosmos_chain_components::types::Time; use starknet::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs b/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs index 62d95b3df..17e021106 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::HasHeightType; -use hermes_chain_type_components::traits::HasAddressType; -use hermes_logging_components::traits::CanLog; -use hermes_logging_components::types::LevelTrace; +use hermes_core::chain_components::traits::HasHeightType; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::logging_components::traits::CanLog; +use hermes_core::logging_components::types::LevelTrace; use serde::de::DeserializeOwned; use serde::Serialize; use starknet::core::types::{Felt, StorageProof}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs index 7e5f4f557..749b08921 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs @@ -3,9 +3,9 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_components::traits::CanSendSingleMessage; -use hermes_chain_type_components::traits::{HasAddressType, HasDenomType}; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_core::chain_components::traits::CanSendSingleMessage; +use hermes_core::chain_type_components::traits::{HasAddressType, HasDenomType}; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs index 3ac2dd40a..54fcc4980 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs @@ -3,8 +3,8 @@ use core::marker::PhantomData; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::HasDenomType; -use hermes_encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_core::chain_type_components::traits::HasDenomType; +use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use poseidon::Poseidon3Hasher; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs index ea19d1a11..f6e4b339d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasDenomType; +use hermes_core::chain_type_components::traits::HasDenomType; use crate::impls::queries::token_address::{ CreateCosmosTokenAddressOnStarknet, GetCosmosTokenAddressOnStarknet, 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 2de91a189..0b4fcb2c9 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,8 +1,8 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; -use hermes_encoding_components::traits::{CanDecode, HasEncoding}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::encoding_components::traits::{CanDecode, HasEncoding}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 b44d888c3..4a0570177 100644 --- a/relayer/crates/starknet-chain-components/src/impls/send_message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/send_message.rs @@ -1,9 +1,9 @@ use core::fmt::Debug; use cgp::prelude::*; -use hermes_chain_type_components::traits::HasMessageResponseType; use hermes_core::chain_components::traits::HasMessageType; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::chain_type_components::traits::HasMessageResponseType; +use hermes_core::relayer_components::transaction::traits::{ CanPollTxResponse, HasNonceType, HasSignerType, HasTxHashType, HasTxResponseType, MessagesWithSignerAndNonceSender, MessagesWithSignerAndNonceSenderComponent, TxMessageResponseParser, TxMessageResponseParserComponent, 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 41db7e644..fd7498531 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 @@ -1,7 +1,7 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryChainHeight, ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilder, ConnectionOpenConfirmMessageBuilderComponent, ConnectionOpenInitMessageBuilder, ConnectionOpenInitMessageBuilderComponent, @@ -11,7 +11,7 @@ use hermes_chain_components::traits::{ HasConnectionOpenInitPayloadType, HasConnectionOpenTryPayloadType, HasConsensusStateType, HasHeightType, HasInitConnectionOptionsType, HasMessageType, }; -use hermes_chain_components::types::payloads::connection::{ +use hermes_core::chain_components::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, ConnectionOpenTryPayload, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs index 988d61f4d..dd6467e3d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::CounterpartyMessageHeightGetterComponent; use hermes_core::chain_components::traits::{ - CounterpartyMessageHeightGetter, HasHeightType, HasMessageType, + CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, + HasMessageType, }; use hermes_cosmos_chain_components::traits::CosmosMessage; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs index 719358765..7da7216d8 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs @@ -1,13 +1,13 @@ use cgp::prelude::*; -use hermes_chain_components::traits::CreateClientMessageBuilderComponent; use hermes_core::chain_components::traits::{ - CreateClientMessageBuilder, HasClientStateType, HasConsensusStateType, - HasCreateClientMessageOptionsType, HasCreateClientPayloadType, HasMessageType, + CreateClientMessageBuilder, CreateClientMessageBuilderComponent, HasClientStateType, + HasConsensusStateType, HasCreateClientMessageOptionsType, HasCreateClientPayloadType, + HasMessageType, }; +use hermes_core::encoding_components::traits::{CanConvert, HasDefaultEncoding}; +use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::CosmosCreateClientMessage; -use hermes_encoding_components::traits::{CanConvert, HasDefaultEncoding}; -use hermes_encoding_components::types::AsBytes; use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs index f7ba3cd83..03a4ea82c 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs @@ -2,13 +2,13 @@ use core::marker::PhantomData; use std::string::FromUtf8Error; use cgp::prelude::*; -use hermes_chain_components::traits::{HasChannelIdType, HasPortIdType}; -use hermes_chain_type_components::traits::{HasAmountType, HasDenomType}; -use hermes_cosmos_test_components::chain::impls::derive_ibc_denom; -use hermes_cosmos_test_components::chain::types::{Amount, Denom}; -use hermes_test_components::chain::traits::{ +use hermes_core::chain_components::traits::{HasChannelIdType, HasPortIdType}; +use hermes_core::chain_type_components::traits::{HasAmountType, HasDenomType}; +use hermes_core::test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; +use hermes_cosmos_test_components::chain::impls::derive_ibc_denom; +use hermes_cosmos_test_components::chain::types::{Amount, Denom}; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::types::amount::StarknetAmount; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs index 4b669dede..7a5f636a1 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ HasChannelIdType, HasHeightType, HasOutgoingPacketType, PacketDstChannelIdGetter, PacketDstChannelIdGetterComponent, PacketTimeoutHeightGetter, PacketTimeoutHeightGetterComponent, 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 a1c3806f1..b458b547e 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,7 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::ConsensusStateHeightsQuerierComponent; use hermes_core::chain_components::traits::{ - ConsensusStateHeightsQuerier, HasHeightType, HasIbcChainTypes, + ConsensusStateHeightsQuerier, ConsensusStateHeightsQuerierComponent, HasHeightType, + HasIbcChainTypes, }; use hermes_cosmos_chain_components::traits::HasGrpcAddress; use http::uri::InvalidUri; 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 83b0e3428..aa62ffda7 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 @@ -1,12 +1,12 @@ use cgp::prelude::*; -use hermes_chain_components::traits::UpdateClientMessageBuilderComponent; use hermes_core::chain_components::traits::{ HasIbcChainTypes, HasMessageType, HasUpdateClientPayloadType, UpdateClientMessageBuilder, + UpdateClientMessageBuilderComponent, }; +use hermes_core::encoding_components::traits::{CanConvert, CanEncode, HasDefaultEncoding}; +use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_chain_components::types::CosmosUpdateClientMessage; -use hermes_encoding_components::traits::{CanConvert, CanEncode, HasDefaultEncoding}; -use hermes_encoding_components::types::AsBytes; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::host::types::identifiers::ClientId; use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader}; diff --git a/relayer/crates/starknet-chain-components/src/impls/transfer.rs b/relayer/crates/starknet-chain-components/src/impls/transfer.rs index 538981aa6..92370dccd 100644 --- a/relayer/crates/starknet-chain-components/src/impls/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/transfer.rs @@ -1,14 +1,14 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::chain_components::traits::{ CanSendSingleMessage, HasHeightType, HasTimeType, HasTimeoutType, }; -use hermes_cosmos_chain_components::types::Time; -use hermes_test_components::chain::traits::{ +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::test_components::chain::traits::{ IbcTransferTimeoutCalculator, IbcTransferTimeoutCalculatorComponent, }; +use hermes_cosmos_chain_components::types::Time; use ibc::primitives::Timestamp; use starknet::core::types::Felt; use starknet::macros::selector; 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 e5c0c82d3..89b2722ce 100644 --- a/relayer/crates/starknet-chain-components/src/impls/tx_response.rs +++ b/relayer/crates/starknet-chain-components/src/impls/tx_response.rs @@ -1,10 +1,10 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::relayer_components::transaction::traits::{ HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; -use hermes_runtime_components::traits::{CanSleep, HasRuntime}; +use hermes_core::runtime_components::traits::{CanSleep, HasRuntime}; use starknet::core::types::{Felt, StarknetError}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/amount.rs b/relayer/crates/starknet-chain-components/src/impls/types/amount.rs index a58057ae2..08c635bf9 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/amount.rs @@ -1,12 +1,12 @@ use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; -use hermes_chain_type_components::traits::{ +use hermes_core::chain_type_components::traits::{ AmountDenomGetter, AmountDenomGetterComponent, AmountTypeProviderComponent, HasAmountType, HasDenomType, }; -use hermes_runtime_components::traits::CanGenerateRandom; -use hermes_test_components::chain::traits::{AmountMethodsComponent, ProvideAmountMethods}; -use hermes_test_components::chain_driver::traits::{ +use hermes_core::runtime_components::traits::CanGenerateRandom; +use hermes_core::test_components::chain::traits::{AmountMethodsComponent, ProvideAmountMethods}; +use hermes_core::test_components::chain_driver::traits::{ HasChainType, RandomAmountGenerator, RandomAmountGeneratorComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/block.rs b/relayer/crates/starknet-chain-components/src/impls/types/block.rs index 252855920..02d2c38b1 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/block.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{BlockTypeComponent, ProvideBlockType}; +use hermes_core::chain_components::traits::{BlockTypeComponent, ProvideBlockType}; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/client.rs b/relayer/crates/starknet-chain-components/src/impls/types/client.rs index 1838ed374..d727ae5b3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/client.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/client.rs @@ -1,13 +1,10 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_chain_components::traits::{ - ClientStateFieldsComponent, ClientStateTypeComponent, ConsensusStateTypeComponent, - HasChainIdType, -}; use hermes_core::chain_components::traits::{ - ClientStateFieldsGetter, HasClientStateType, HasHeightType, ProvideClientStateType, - ProvideConsensusStateType, + ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, + ConsensusStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, + ProvideClientStateType, ProvideConsensusStateType, }; use ibc::core::host::types::identifiers::ChainId; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs index 2f648672a..ea0c0c0d6 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CommitmentProofBytesGetter, CommitmentProofBytesGetterComponent, CommitmentProofHeightGetter, CommitmentProofHeightGetterComponent, CommitmentProofTypeProviderComponent, HasCommitmentProofType, HasHeightType, diff --git a/relayer/crates/starknet-chain-components/src/impls/types/denom.rs b/relayer/crates/starknet-chain-components/src/impls/types/denom.rs index 11c93dc8c..f8754a6ff 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/denom.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/denom.rs @@ -1,5 +1,7 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{DenomTypeComponent, HasAddressType, ProvideDenomType}; +use hermes_core::chain_type_components::traits::{ + DenomTypeComponent, HasAddressType, ProvideDenomType, +}; pub struct ProvideTokenAddressDenom; 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 3b7e7e66d..58c5b97fa 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/height.rs @@ -1,9 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ - HeightAdjuster, HeightAdjusterComponent, HeightFieldComponent, HeightIncrementer, - HeightIncrementerComponent, HeightTypeProviderComponent, +use hermes_core::chain_components::traits::{ + HasHeightType, HeightAdjuster, HeightAdjusterComponent, HeightFieldComponent, + HeightFieldGetter, HeightIncrementer, HeightIncrementerComponent, HeightTypeProviderComponent, }; -use hermes_core::chain_components::traits::{HasHeightType, HeightFieldGetter}; pub struct ProvideStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs b/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs index 59a712f81..03868b68a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs @@ -1,11 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ - CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, - UpdateClientPayloadTypeComponent, -}; use hermes_core::chain_components::traits::{ + CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, ProvideCreateClientPayloadOptionsType, ProvideCreateClientPayloadType, - ProvideUpdateClientPayloadType, + ProvideUpdateClientPayloadType, UpdateClientPayloadTypeComponent, }; use crate::types::payloads::client::{ diff --git a/relayer/crates/starknet-chain-components/src/impls/types/status.rs b/relayer/crates/starknet-chain-components/src/impls/types/status.rs index 480209795..0c2a44110 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/status.rs @@ -1,7 +1,8 @@ use cgp::prelude::*; -use hermes_chain_components::traits::ChainStatusTypeComponent; -use hermes_chain_type_components::traits::HasTimeType; -use hermes_core::chain_components::traits::{HasHeightType, ProvideChainStatusType}; +use hermes_core::chain_components::traits::{ + ChainStatusTypeComponent, HasHeightType, ProvideChainStatusType, +}; +use hermes_core::chain_type_components::traits::HasTimeType; use hermes_cosmos_chain_components::types::Time; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs b/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs index 3add602c6..e44ecd118 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{ProvideTimeType, TimeTypeComponent}; +use hermes_core::chain_type_components::traits::{ProvideTimeType, TimeTypeComponent}; pub struct ProvideStarknetTimeType; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs b/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs index 1e66ad4df..6f11d3f28 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; -use hermes_relayer_components::transaction::traits::HasSignerType; -use hermes_test_components::chain::traits::{ +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::relayer_components::transaction::traits::HasSignerType; +use hermes_core::test_components::chain::traits::{ HasWalletType, ProvideWalletType, WalletSignerComponent, WalletSignerProvider, WalletTypeComponent, }; diff --git a/relayer/crates/starknet-chain-components/src/traits/account.rs b/relayer/crates/starknet-chain-components/src/traits/account.rs index 17ac2ca32..59de411d4 100644 --- a/relayer/crates/starknet-chain-components/src/traits/account.rs +++ b/relayer/crates/starknet-chain-components/src/traits/account.rs @@ -1,6 +1,6 @@ use cgp::core::macros::blanket_trait; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::HasSignerType; +use hermes_core::relayer_components::transaction::traits::HasSignerType; use starknet::accounts::{Account, AccountError, ConnectedAccount}; #[cgp_type { diff --git a/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs index 769434e85..51dffd429 100644 --- a/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; use starknet::core::types::Felt; use crate::traits::types::commitment::HasMerkleProofType; 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 08a7843d8..e7dde8da7 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{HasAddressType, HasHeightType}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasHeightType}; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; 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 9cd20e02a..8ac711b18 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; use crate::traits::types::blob::HasBlobType; use crate::traits::types::contract_class::HasContractClassHashType; 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 84012bfa7..bff0615d8 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{HasAddressType, HasMessageResponseType}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasMessageResponseType}; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/message.rs b/relayer/crates/starknet-chain-components/src/traits/contract/message.rs index ea1ec23f6..7d09176ad 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/message.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/message.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; use hermes_core::chain_components::traits::HasMessageType; +use hermes_core::chain_type_components::traits::HasAddressType; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; 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 3bc04fc55..813f4379a 100644 --- a/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::chain_components::traits::HasMessageType; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; #[cgp_component { name: TransferTokenMessageBuilderComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs index 9f1044611..2e57c9c45 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; #[cgp_component { name: ContractAddressQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs b/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs index 1d3d2a736..729326d82 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::HasHeightType; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_components::traits::HasHeightType; +use hermes_core::chain_type_components::traits::HasAddressType; use crate::traits::types::storage_proof::{HasStorageKeyType, HasStorageProofType}; diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs index 6a90b8e80..6606ca799 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasDenomType; +use hermes_core::chain_type_components::traits::HasDenomType; use crate::types::messages::ibc::denom::PrefixedDenom; 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 4a482031c..44ad5546a 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 @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; #[cgp_component { name: TokenBalanceQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/signer.rs b/relayer/crates/starknet-chain-components/src/traits/signer.rs index d3ef62f6f..93f2f8ba1 100644 --- a/relayer/crates/starknet-chain-components/src/traits/signer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/signer.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::HasSignerType; +use hermes_core::relayer_components::transaction::traits::HasSignerType; #[cgp_getter { provider: StarknetSignerGetter, diff --git a/relayer/crates/starknet-chain-components/src/traits/transfer.rs b/relayer/crates/starknet-chain-components/src/traits/transfer.rs index 6cd16d4b8..b4fc2cddb 100644 --- a/relayer/crates/starknet-chain-components/src/traits/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/transfer.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; #[cgp_component { name: TokenTransferComponent, diff --git a/relayer/crates/starknet-chain-components/src/types/channel_id.rs b/relayer/crates/starknet-chain-components/src/types/channel_id.rs index 9fecaab3c..85b0ef35f 100644 --- a/relayer/crates/starknet-chain-components/src/types/channel_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/channel_id.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::core::channel::types::channel::{ diff --git a/relayer/crates/starknet-chain-components/src/types/client_id.rs b/relayer/crates/starknet-chain-components/src/types/client_id.rs index 50825486e..df8aadba3 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_id.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::core::host::types::identifiers::ClientId; diff --git a/relayer/crates/starknet-chain-components/src/types/client_state.rs b/relayer/crates/starknet-chain-components/src/types/client_state.rs index 204c6f293..80f69dab6 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_state.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, }; use hermes_protobuf_encoding_components::types::strategy::ViaAny; diff --git a/relayer/crates/starknet-chain-components/src/types/connection_id.rs b/relayer/crates/starknet-chain-components/src/types/connection_id.rs index 4172e7669..2dd778d2a 100644 --- a/relayer/crates/starknet-chain-components/src/types/connection_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/connection_id.rs @@ -2,7 +2,7 @@ use core::time::Duration; use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, TransformerRef, }; 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 818507e33..3eff4cd9a 100644 --- a/relayer/crates/starknet-chain-components/src/types/consensus_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/consensus_state.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::{Converter, ConverterComponent}; +use hermes_core::encoding_components::traits::{Converter, ConverterComponent}; use hermes_wasm_encoding_components::impls::{ DecodeViaWasmConsensusState, EncodeViaWasmConsensusState, }; 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 10a426954..15c5d9251 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 @@ -2,11 +2,11 @@ use core::time::Duration; use cgp::core::types::WithType; use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, }; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; use ibc::clients::tendermint::types::{ diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs index 53bb00342..589b42d7d 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs @@ -1,7 +1,9 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; -use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_core::encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_core::encoding_components::traits::{ + MutDecoderComponent, MutEncoderComponent, Transformer, +}; #[derive(Debug, Clone, HasField)] pub struct Height { diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs index c87c27dc9..09ca05165 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::primitives::Timestamp; diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs index 293d22eda..4c7edea9d 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, TransformerRef, }; 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 d4f4c864a..2b2af6fa0 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/channel.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/channel.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; use starknet::core::types::Felt; 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 bfeab725a..53d29a443 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/connection.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/connection.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; use starknet::core::types::Felt; 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 2b64455e6..41ef3ab7b 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/erc20.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/erc20.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; use starknet::core::types::{Felt, 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 f1100022d..803a211ab 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/ics20.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/ics20.rs @@ -1,7 +1,7 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; use starknet::core::types::{Felt, 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 66ed2e814..a60edd9ed 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/packet.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/packet.rs @@ -1,7 +1,7 @@ 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::{ +use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/types/message_response.rs b/relayer/crates/starknet-chain-components/src/types/message_response.rs index 2c441b7fd..44886bf7a 100644 --- a/relayer/crates/starknet-chain-components/src/types/message_response.rs +++ b/relayer/crates/starknet-chain-components/src/types/message_response.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::HasEventType; -use hermes_chain_type_components::traits::{ +use hermes_core::chain_components::traits::HasEventType; +use hermes_core::chain_type_components::traits::{ HasMessageResponseType, MessageResponseEventsGetter, MessageResponseEventsGetterComponent, MessageResponseTypeComponent, ProvideMessageResponseType, }; 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 460114560..3529aae81 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 @@ -1,9 +1,9 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::chain_components::traits::HasMessageType; -use hermes_encoding_components::traits::{CanEncode, HasEncoding}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_core::encoding_components::traits::{CanEncode, HasEncoding}; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs index 6675c52c9..ba51f1bbf 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, TransformerRef, }; pub use ibc::core::channel::types::channel::Order as ChannelOrdering; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs index 85fc6b729..801832bc7 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs @@ -1,7 +1,7 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; pub use ibc::core::commitment_types::commitment::CommitmentPrefix as BasePrefix; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs index fa8aaa679..9383a4a3a 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs @@ -1,7 +1,7 @@ use cgp::core::component::UseContext; use cgp::prelude::*; -use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; +use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, }; diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index a907840e4..65e627c2e 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -9,16 +9,8 @@ use cgp::prelude::*; use futures::lock::Mutex; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::{ - BlockEventsQuerierComponent, BlockQuerierComponent, BlockTimeQuerierComponent, CanQueryBlock, - CanQueryBlockTime, CanQueryPacketAckCommitment, ChainStatusQuerierComponent, HasBlockType, - HasChainStatusType, HasInitChannelOptionsType, HasTimeoutType, PollIntervalGetterComponent, -}; -use hermes_chain_type_components::traits::{ - ChainIdGetterComponent, HasAddressType, HasChainId, HasCommitmentProofType, HasHeightType, - HasMessageResponseType, HasTimeType, -}; use hermes_core::chain_components::traits::{ + BlockEventsQuerierComponent, BlockQuerierComponent, BlockTimeQuerierComponent, CanBuildAckPacketMessage, CanBuildAckPacketPayload, CanBuildChannelOpenAckMessage, CanBuildChannelOpenAckPayload, CanBuildChannelOpenConfirmMessage, CanBuildChannelOpenConfirmPayload, CanBuildChannelOpenInitMessage, @@ -30,50 +22,61 @@ use hermes_core::chain_components::traits::{ CanBuildPacketFromWriteAck, CanBuildReceivePacketMessage, CanBuildReceivePacketPayload, CanBuildTimeoutUnorderedPacketMessage, CanBuildTimeoutUnorderedPacketPayload, CanBuildUpdateClientMessage, CanBuildUpdateClientPayload, CanExtractFromEvent, - CanExtractFromMessageResponse, CanFilterIncomingPacket, CanFilterOutgoingPacket, - CanQueryBlockEvents, CanQueryChainHeight, CanQueryChainStatus, CanQueryChannelEnd, - CanQueryChannelEndWithProofs, CanQueryClientState, CanQueryClientStateWithLatestHeight, - CanQueryClientStateWithProofs, CanQueryConnectionEnd, CanQueryConnectionEndWithProofs, - CanQueryConsensusState, CanQueryConsensusStateHeight, CanQueryConsensusStateHeights, - CanQueryConsensusStateWithProofs, CanQueryCounterpartyChainId, CanQueryPacketCommitment, - CanQueryPacketIsReceived, CanQueryPacketReceipt, CanSendMessages, CanSendSingleMessage, - HasAcknowledgementType, HasChannelEndType, HasChannelIdType, HasChannelOpenTryEvent, - HasClientIdType, HasClientStateFields, HasClientStateType, HasCommitmentPrefixType, - HasConnectionEndType, HasConnectionIdType, HasConnectionOpenAckPayloadType, - HasConnectionOpenConfirmPayloadType, HasConnectionOpenInitPayloadType, - HasConnectionOpenTryEvent, HasConnectionOpenTryPayloadType, HasConsensusStateType, - HasCounterpartyMessageHeight, HasCreateClientEvent, HasCreateClientMessageOptionsType, - HasCreateClientPayloadOptionsType, HasEventType, HasIbcCommitmentPrefix, - HasInitConnectionOptionsType, HasOutgoingPacketType, HasPacketCommitmentType, - HasPacketDstChannelId, HasPacketDstPortId, HasPacketReceiptType, HasPacketSequence, - HasPacketSrcChannelId, HasPacketSrcPortId, HasPacketTimeoutHeight, HasPacketTimeoutTimestamp, - HasPortIdType, HasSendPacketEvent, HasSequenceType, HasUpdateClientPayloadType, - HasWriteAckEvent, PacketCommitmentQuerierComponent, + CanExtractFromMessageResponse, CanFilterIncomingPacket, CanFilterOutgoingPacket, CanQueryBlock, + CanQueryBlockEvents, CanQueryBlockTime, CanQueryChainHeight, CanQueryChainStatus, + CanQueryChannelEnd, CanQueryChannelEndWithProofs, CanQueryClientState, + CanQueryClientStateWithLatestHeight, CanQueryClientStateWithProofs, CanQueryConnectionEnd, + CanQueryConnectionEndWithProofs, CanQueryConsensusState, CanQueryConsensusStateHeight, + CanQueryConsensusStateHeights, CanQueryConsensusStateWithProofs, CanQueryCounterpartyChainId, + CanQueryPacketAckCommitment, CanQueryPacketCommitment, CanQueryPacketIsReceived, + CanQueryPacketReceipt, CanSendMessages, CanSendSingleMessage, ChainStatusQuerierComponent, + HasAcknowledgementType, HasBlockType, HasChainStatusType, HasChannelEndType, HasChannelIdType, + HasChannelOpenTryEvent, HasClientIdType, HasClientStateFields, HasClientStateType, + HasCommitmentPrefixType, HasConnectionEndType, HasConnectionIdType, + HasConnectionOpenAckPayloadType, HasConnectionOpenConfirmPayloadType, + HasConnectionOpenInitPayloadType, HasConnectionOpenTryEvent, HasConnectionOpenTryPayloadType, + HasConsensusStateType, HasCounterpartyMessageHeight, HasCreateClientEvent, + HasCreateClientMessageOptionsType, HasCreateClientPayloadOptionsType, HasEventType, + HasIbcCommitmentPrefix, HasInitChannelOptionsType, HasInitConnectionOptionsType, + HasOutgoingPacketType, HasPacketCommitmentType, HasPacketDstChannelId, HasPacketDstPortId, + HasPacketReceiptType, HasPacketSequence, HasPacketSrcChannelId, HasPacketSrcPortId, + HasPacketTimeoutHeight, HasPacketTimeoutTimestamp, HasPortIdType, HasSendPacketEvent, + HasSequenceType, HasTimeoutType, HasUpdateClientPayloadType, HasWriteAckEvent, + PacketCommitmentQuerierComponent, PollIntervalGetterComponent, }; -use hermes_cosmos_chain_components::types::{ - CosmosInitChannelOptions, CosmosInitConnectionOptions, CosmosUpdateClientPayload, - Secp256k1KeyPair, Time, +use hermes_core::chain_type_components::traits::{ + ChainIdGetterComponent, HasAddressType, HasChainId, HasCommitmentProofType, HasHeightType, + HasMessageResponseType, HasTimeType, }; -use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ DefaultEncodingGetter, DefaultEncodingGetterComponent, EncodingGetter, EncodingGetterComponent, EncodingTypeProviderComponent, HasDefaultEncoding, }; -use hermes_encoding_components::types::AsBytes; -use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::error::traits::HasRetryableError; -use hermes_relayer_components::transaction::impls::GetGlobalNonceMutex; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::encoding_components::types::AsBytes; +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::error::traits::HasRetryableError; +use hermes_core::relayer_components::transaction::impls::GetGlobalNonceMutex; +use hermes_core::relayer_components::transaction::traits::{ CanAllocateNonce, CanPollTxResponse, CanQueryNonce, CanQueryTxResponse, CanSendMessagesWithSigner, CanSendMessagesWithSignerAndNonce, DefaultSignerGetterComponent, HasSignerType, NonceAllocationMutexGetterComponent, }; -use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{ +use hermes_core::runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; +use hermes_core::test_components::chain::traits::{ + CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanCalculateIbcTransferTimeout, + CanConvertIbcTransferredAmount, CanIbcTransferToken, CanQueryBalance, HasMemoType, + IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, +}; +use hermes_cosmos_chain_components::types::{ + CosmosInitChannelOptions, CosmosInitConnectionOptions, CosmosUpdateClientPayload, + Secp256k1KeyPair, Time, +}; +use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::impls::UseHermesError; +use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; use hermes_starknet_chain_components::components::starknet_to_cosmos::StarknetToCosmosComponents; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; @@ -114,11 +117,6 @@ use hermes_starknet_chain_components::types::payloads::client::{ }; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_test_components::chain::traits::{ - CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanCalculateIbcTransferTimeout, - CanConvertIbcTransferredAmount, CanIbcTransferToken, CanQueryBalance, HasMemoType, - IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, -}; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::channel::types::packet::Packet; use ibc::core::host::types::identifiers::{ChainId, PortId as IbcPortId, Sequence}; 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 1e5d82796..b09e4adfa 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs @@ -7,8 +7,8 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::impls::GetDefaultEncoding; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::impls::GetDefaultEncoding; +use hermes_core::encoding_components::traits::{ CanDecode, CanEncode, CanEncodeAndDecode, CanPeekDecodeBuffer, DefaultEncodingGetter, DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, HasDecodeBufferType, HasEncodeBufferType, HasEncodedType, HasEncodingType, diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs index a180c5301..5b97d11ab 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs @@ -6,7 +6,7 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanDecode, DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, HasEncodedType, HasEncoding, }; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index 7fa1cb1d2..063e19f13 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -1,7 +1,7 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; -use hermes_encoding_components::traits::{ +use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; use hermes_error::impls::UseHermesError; diff --git a/relayer/crates/starknet-chain-context/src/impls/build_account.rs b/relayer/crates/starknet-chain-context/src/impls/build_account.rs index 19383fb10..1f22d96f7 100644 --- a/relayer/crates/starknet-chain-context/src/impls/build_account.rs +++ b/relayer/crates/starknet-chain-context/src/impls/build_account.rs @@ -2,8 +2,8 @@ use core::str::FromStr; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_components::traits::HasChainId; -use hermes_relayer_components::transaction::traits::HasSignerType; +use hermes_core::chain_components::traits::HasChainId; +use hermes_core::relayer_components::transaction::traits::HasSignerType; use hermes_starknet_chain_components::traits::account::{ AccountFromSignerBuilder, AccountFromSignerBuilderComponent, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-chain-context/src/impls/error.rs b/relayer/crates/starknet-chain-context/src/impls/error.rs index be92c5841..ad2db0eaf 100644 --- a/relayer/crates/starknet-chain-context/src/impls/error.rs +++ b/relayer/crates/starknet-chain-context/src/impls/error.rs @@ -11,10 +11,17 @@ use hermes_cairo_encoding_components::impls::encode_mut::bool::DecodeBoolError; use hermes_cairo_encoding_components::impls::encode_mut::end::NonEmptyBuffer; use hermes_cairo_encoding_components::impls::encode_mut::felt::UnexpectedEndOfBuffer; use hermes_cairo_encoding_components::impls::encode_mut::variant::VariantIndexOutOfBound; -use hermes_chain_components::impls::InvalidTimeoutReceipt; -use hermes_chain_components::traits::HasOutgoingPacketType; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasHeightType}; -use hermes_core::chain_components::traits::{EmptyMessageResponse, HasClientIdType}; +use hermes_core::chain_components::impls::InvalidTimeoutReceipt; +use hermes_core::chain_components::traits::{ + EmptyMessageResponse, HasClientIdType, HasOutgoingPacketType, +}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasHeightType}; +use hermes_core::relayer_components::chain::impls::NoConsensusStateAtLessThanHeight; +use hermes_core::relayer_components::transaction::impls::TxNoResponseError; +use hermes_core::relayer_components::transaction::traits::HasTxHashType; +use hermes_core::test_components::chain::impls::{ + EventualAmountTimeoutError, MissingSendPacketEventError, +}; use hermes_error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; @@ -22,9 +29,6 @@ use hermes_error::types::Error; use hermes_protobuf_encoding_components::impls::{ InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; -use hermes_relayer_components::chain::impls::NoConsensusStateAtLessThanHeight; -use hermes_relayer_components::transaction::impls::TxNoResponseError; -use hermes_relayer_components::transaction::traits::HasTxHashType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::error::account::RaiseAccountError; use hermes_starknet_chain_components::impls::error::provider::RaiseProviderError; @@ -33,9 +37,6 @@ use hermes_starknet_chain_components::impls::queries::consensus_state::Consensus use hermes_starknet_chain_components::impls::queries::contract_address::ContractAddressNotFound; use hermes_starknet_chain_components::impls::send_message::UnexpectedTransactionTraceType; use hermes_starknet_chain_components::types::event::UnknownEvent; -use hermes_test_components::chain::impls::{ - EventualAmountTimeoutError, MissingSendPacketEventError, -}; use ibc::core::channel::types::error::ChannelError; use ibc::core::client::types::error::ClientError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index 11d747512..07620eb33 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -19,6 +19,8 @@ path = "bin/hermes_starknet.rs" [dependencies] cgp = { workspace = true } cgp-error-eyre = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } hermes-any-counterparty = { workspace = true } hermes-cli-components = { workspace = true } hermes-cli = { workspace = true } diff --git a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs index 254c78fbe..1e84abb54 100644 --- a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs +++ b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs @@ -5,18 +5,20 @@ use core::time::Duration; use std::sync::Arc; use cgp::extra::run::CanRun; -use hermes_chain_components::traits::{ +use hermes_cli_components::traits::CanLoadBuilder; +use hermes_core::chain_components::traits::{ CanQueryChainHeight, CanQueryChainStatus, CanQueryChannelEnd, CanQueryClientStateWithLatestHeight, CanQueryConnectionEnd, HasChainId, }; -use hermes_cli_components::traits::CanLoadBuilder; +use hermes_core::relayer_components::relay::impls::{CanBootstrapChannel, CanBootstrapConnection}; +use hermes_core::relayer_components::relay::traits::{ + CanCreateClient, DestinationTarget, SourceTarget, +}; use hermes_cosmos_chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::Error; -use hermes_relayer_components::relay::impls::{CanBootstrapChannel, CanBootstrapConnection}; -use hermes_relayer_components::relay::traits::{CanCreateClient, DestinationTarget, SourceTarget}; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index 72943d027..303673791 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -22,13 +22,16 @@ use hermes_cli_components::traits::{ CommandRunnerComponent, ConfigLoaderComponent, ConfigPathGetterComponent, ConfigTypeComponent, ConfigWriterComponent, OutputProducer, OutputProducerComponent, OutputTypeComponent, }; +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::error::traits::RetryableErrorComponent; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_core::test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::types::HermesError; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::error::traits::RetryableErrorComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::config::{ StarknetChainConfig, StarknetContractAddresses, StarknetContractClasses, StarknetRelayerConfig, @@ -39,7 +42,6 @@ use hermes_starknet_integration_tests::contexts::chain_driver::StarknetChainDriv use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::StarknetBootstrap; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId, PortId}; 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 c472fed8d..4662fce2d 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs @@ -2,9 +2,9 @@ use std::sync::Arc; use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; +use hermes_core::runtime_components::traits::{CanReadFileAsString, HasRuntime}; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{CanReadFileAsString, HasRuntime}; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::{ StarknetBootstrap, StarknetBootstrapFields, }; diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs index 2cbb6d07a..547301b16 100644 --- a/relayer/crates/starknet-cli/src/impls/build.rs +++ b/relayer/crates/starknet-cli/src/impls/build.rs @@ -2,9 +2,9 @@ use cgp::prelude::*; use hermes_cli_components::traits::{ BuilderLoader, BuilderLoaderComponent, CanLoadConfig, HasBuilderType, HasConfigType, }; +use hermes_core::runtime_components::traits::HasRuntime; use hermes_cosmos_relayer::contexts::CosmosBuilder; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::HasRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-cli/src/impls/error.rs b/relayer/crates/starknet-cli/src/impls/error.rs index a62ff744e..93ffd481d 100644 --- a/relayer/crates/starknet-cli/src/impls/error.rs +++ b/relayer/crates/starknet-cli/src/impls/error.rs @@ -7,10 +7,10 @@ use cgp::core::error::{ }; use cgp::prelude::*; use eyre::Report; +use hermes_core::relayer_components::error::traits::RetryableErrorComponent; use hermes_error::handlers::{DisplayError, HandleInfallible, ReportError, ReturnError}; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; -use hermes_relayer_components::error::traits::RetryableErrorComponent; use hermes_runtime::types::error::TokioRuntimeError; use ibc::core::channel::types::error::ChannelError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; 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 22c0d251f..e87ff7ee4 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs @@ -5,9 +5,18 @@ use std::path::PathBuf; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_core::test_components::chain_driver::impls::WaitChainReachHeight; +use hermes_core::test_components::chain_driver::traits::{ + ChainGetterComponent, ChainProcessTaker, ChainProcessTakerComponent, + ChainStartupWaiterComponent, ChainTypeProviderComponent, DenomGetter, DenomGetterComponent, + HasChain, RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, + UserWallet, WalletGetterComponent, +}; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; use hermes_starknet_chain_components::types::wallet::StarknetWallet; @@ -15,13 +24,6 @@ use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain_driver::impls::WaitChainReachHeight; -use hermes_test_components::chain_driver::traits::{ - ChainGetterComponent, ChainProcessTaker, ChainProcessTakerComponent, - ChainStartupWaiterComponent, ChainTypeProviderComponent, DenomGetter, DenomGetterComponent, - HasChain, RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, - UserWallet, WalletGetterComponent, -}; use tokio::process::Child; #[cgp_context(StarknetChainDriverComponents)] diff --git a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs index a9ed23435..e4375e31e 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs @@ -2,23 +2,23 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::extra::run::CanRun; use cgp::prelude::*; +use hermes_core::relayer_components::multi::traits::birelay_at::{ + BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, +}; +use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; +use hermes_core::test_components::relay_driver::run::{ + RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, +}; use hermes_cosmos_integration_tests::contexts::AbortOnDrop; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; -use hermes_relayer_components::multi::traits::birelay_at::{ - BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, -}; -use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBiRelay; use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::relay_driver::run::{ - RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, -}; #[cgp_context(StarknetRelayDriverComponents)] #[derive(HasField)] 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 c3a296fb5..f6af98447 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -2,6 +2,13 @@ use std::path::PathBuf; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; +use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; +use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_cosmos_chain_components::types::DynamicGasConfig; use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; use hermes_cosmos_integration_tests::impls::{ @@ -26,12 +33,7 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; -use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; -use hermes_test_components::chain_driver::traits::ChainTypeProviderComponent; -use hermes_test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_tracing_logging_components::contexts::TracingLogger; use hermes_wasm_test_components::impls::bootstrap::{ BuildChainDriverAndInitWasmClient, ModifyWasmGenesisConfig, ModifyWasmNodeConfig, diff --git a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs index 116643448..fcb5780c7 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs @@ -1,6 +1,22 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::prelude::*; +use hermes_core::relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; +use hermes_core::test_components::driver::traits::{ + BuilderAtTypeProviderComponent, ChainDriverTypeProviderAtComponent, +}; +use hermes_core::test_components::setup::binary_channel::BinaryChannelTestComponents; +use hermes_core::test_components::setup::traits::{ + BiRelaySetupComponent, BinaryChannelDriverBuilderComponent, BootstrapGetterAtComponent, + BootstrapTypeProviderAtComponent, BuilderAtGetterComponent, ChainSetupComponent, + ChannelSetupComponent, ClientSetupComponent, ConnectionSetupComponent, + CreateClientMessageOptionsGetterAtComponent, CreateClientPayloadOptionsGetterAtComponent, + DriverBuilderComponent, InitChannelOptionsGetterAtComponent, + InitConnectionOptionsGetterAtComponent, PortIdGetterAtComponent, RelaySetupComponent, + TestDriverTypeProviderComponent, +}; use hermes_cosmos_chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; @@ -9,9 +25,6 @@ use hermes_cosmos_integration_tests::impls::UseCosmosInitChannelOptions; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; -use hermes_relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; @@ -19,19 +32,6 @@ use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBi use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::driver::traits::{ - BuilderAtTypeProviderComponent, ChainDriverTypeProviderAtComponent, -}; -use hermes_test_components::setup::binary_channel::BinaryChannelTestComponents; -use hermes_test_components::setup::traits::{ - BiRelaySetupComponent, BinaryChannelDriverBuilderComponent, BootstrapGetterAtComponent, - BootstrapTypeProviderAtComponent, BuilderAtGetterComponent, ChainSetupComponent, - ChannelSetupComponent, ClientSetupComponent, ConnectionSetupComponent, - CreateClientMessageOptionsGetterAtComponent, CreateClientPayloadOptionsGetterAtComponent, - DriverBuilderComponent, InitChannelOptionsGetterAtComponent, - InitConnectionOptionsGetterAtComponent, PortIdGetterAtComponent, RelaySetupComponent, - TestDriverTypeProviderComponent, -}; use ibc::core::host::types::identifiers::PortId; use crate::contexts::chain_driver::StarknetChainDriver; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index 26323c3ef..34e97d824 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -5,15 +5,20 @@ use std::sync::Arc; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; +use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; +use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; use hermes_cosmos_test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_starknet_test_components::impls::bootstrap::bootstrap_chain::BootstrapStarknetDevnet; @@ -24,9 +29,6 @@ use hermes_starknet_test_components::impls::bootstrap::start_chain::StartStarkne use hermes_starknet_test_components::impls::types::genesis_config::ProvideStarknetGenesisConfigType; use hermes_starknet_test_components::impls::types::node_config::ProvideStarknetNodeConfigType; use hermes_starknet_test_components::traits::IbcContractsDeployerComponent; -use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; -use hermes_test_components::chain_driver::traits::ChainTypeProviderComponent; -use hermes_test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_tracing_logging_components::contexts::TracingLogger; use starknet::core::types::contract::SierraClass; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs index f90ac2009..4089cf393 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs @@ -2,23 +2,23 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::extra::run::CanRun; use cgp::prelude::*; +use hermes_core::relayer_components::multi::traits::birelay_at::{ + BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, +}; +use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; +use hermes_core::test_components::relay_driver::run::{ + RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, +}; use hermes_cosmos_integration_tests::contexts::AbortOnDrop; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; -use hermes_relayer_components::multi::traits::birelay_at::{ - BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, -}; -use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::relay_driver::run::{ - RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, -}; #[cgp_context(StarknetRelayDriverComponents)] #[derive(HasField)] diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index 780905c71..ff6c8eea0 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -1,20 +1,28 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::prelude::*; -use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_error::handlers::DebugError; -use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::multi::traits::birelay_at::{ +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::multi::traits::birelay_at::{ BiRelayTypeProviderAtComponent, HasBiRelayTypeAt, }; -use hermes_relayer_components::multi::traits::chain_at::{ +use hermes_core::relayer_components::multi::traits::chain_at::{ ChainTypeProviderAtComponent, HasChainTypeAt, }; -use hermes_relayer_components::multi::traits::relay_at::{ +use hermes_core::relayer_components::multi::traits::relay_at::{ HasRelayTypeAt, RelayTypeProviderAtComponent, }; +use hermes_core::test_components::driver::traits::{ + ChainDriverGetterAtComponent, ChainDriverTypeProviderAtComponent, ChannelIdGetterAtComponent, + HasChainDriverTypeAt, RelayDriverGetterAtComponent, RelayDriverTypeProviderAtComponent, +}; +use hermes_core::test_components::setup::traits::{ + BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, + PortIdGetterAtComponent, +}; +use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::handlers::DebugError; +use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::channel_id::ChannelId; use hermes_starknet_chain_components::types::connection_id::ConnectionId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; @@ -22,14 +30,6 @@ use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBi use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::driver::traits::{ - ChainDriverGetterAtComponent, ChainDriverTypeProviderAtComponent, ChannelIdGetterAtComponent, - HasChainDriverTypeAt, RelayDriverGetterAtComponent, RelayDriverTypeProviderAtComponent, -}; -use hermes_test_components::setup::traits::{ - BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, - PortIdGetterAtComponent, -}; use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::PortId; diff --git a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs index e2fd4f98d..0ca9da66f 100644 --- a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs @@ -5,6 +5,10 @@ use std::sync::OnceLock; use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use futures::lock::Mutex; +use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; +use hermes_core::test_components::chain::traits::HasWalletType; +use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_core::test_components::driver::traits::HasChainDriverType; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; use hermes_cosmos_test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, @@ -12,14 +16,10 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain::traits::HasWalletType; -use hermes_test_components::chain_driver::traits::HasChainType; -use hermes_test_components::driver::traits::HasChainDriverType; use ibc::core::host::types::error::IdentifierError; use starknet::accounts::{ExecutionEncoding, SingleOwnerAccount}; use starknet::providers::jsonrpc::HttpTransport; diff --git a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs index 3e865c48e..9098e3ade 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs @@ -1,10 +1,11 @@ use std::time::SystemTime; use hermes_core::chain_components::traits::CanSendSingleMessage; +use hermes_core::encoding_components::traits::CanEncode; +use hermes_core::runtime_components::traits::CanReadFileAsString; +use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; use hermes_cosmos_integration_tests::init::init_test_runtime; -use hermes_encoding_components::traits::CanEncode; use hermes_error::types::Error; -use hermes_runtime_components::traits::CanReadFileAsString; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; @@ -16,7 +17,6 @@ use hermes_starknet_chain_components::types::events::erc20::Erc20Event; use hermes_starknet_chain_components::types::messages::erc20::deploy::DeployErc20TokenMessage; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_chain_context::contexts::encoding::event::StarknetEventEncoding; -use hermes_test_components::bootstrap::traits::CanBootstrapChain; use starknet::core::types::U256; use starknet::macros::selector; use tracing::info; diff --git a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs index d6e5e92bd..46d063741 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs @@ -1,9 +1,9 @@ use cgp::core::field::Index; +use hermes_core::test_components::test_case::traits::test_case::TestCase; use hermes_cosmos_integration_tests::init::init_test_runtime; use hermes_error::types::Error; use hermes_ibc_test_suite::tests::clearing::TestPacketClearing; use hermes_ibc_test_suite::tests::transfer::TestIbcTransfer; -use hermes_test_components::test_case::traits::test_case::TestCase; use crate::utils::init_starknet_test_driver; diff --git a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs index 679234899..0a043faa7 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs @@ -6,17 +6,20 @@ use core::marker::PhantomData; use core::time::Duration; -use hermes_chain_components::traits::{CanQueryChainHeight, CanQueryChainStatus}; +use hermes_core::chain_components::traits::{CanQueryChainHeight, CanQueryChainStatus}; +use hermes_core::relayer_components::birelay::traits::CanAutoBiRelay; +use hermes_core::relayer_components::relay::traits::{ + CanAutoRelayWithHeights, CanRelayPacket, SourceTarget, +}; +use hermes_core::relayer_components::transaction::traits::CanSendMessagesWithSigner; +use hermes_core::runtime_components::traits::CanSleep; +use hermes_core::test_components::chain::traits::{ + CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanIbcTransferToken, CanQueryBalance, +}; use hermes_cosmos_integration_tests::init::init_test_runtime; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_cosmos_test_components::chain::types::Amount; use hermes_error::types::Error; -use hermes_relayer_components::birelay::traits::CanAutoBiRelay; -use hermes_relayer_components::relay::traits::{ - CanAutoRelayWithHeights, CanRelayPacket, SourceTarget, -}; -use hermes_relayer_components::transaction::traits::CanSendMessagesWithSigner; -use hermes_runtime_components::traits::CanSleep; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::queries::token_address::CanQueryCosmosTokenAddressOnStarknet; use hermes_starknet_chain_components::traits::queries::token_balance::CanQueryTokenBalance; @@ -26,9 +29,6 @@ use hermes_starknet_chain_components::types::messages::ibc::denom::{ }; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; -use hermes_test_components::chain::traits::{ - CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanIbcTransferToken, CanQueryBalance, -}; use ibc::core::host::types::identifiers::PortId; use ibc::primitives::Timestamp; use tracing::info; diff --git a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs index 3ded1bb84..792f3b5b2 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs @@ -2,21 +2,21 @@ use core::marker::PhantomData; use core::time::Duration; use cgp::core::field::Index; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryChainHeight, CanQueryClientStateWithLatestHeight, CanQueryConsensusStateWithLatestHeight, }; +use hermes_core::relayer_components::relay::traits::{ + CanSendTargetUpdateClientMessage, DestinationTarget, SourceTarget, +}; +use hermes_core::runtime_components::traits::CanSleep; +use hermes_core::test_components::setup::traits::{CanSetupChain, CanSetupClients}; use hermes_cosmos_integration_tests::init::init_test_runtime; use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_error::types::Error; -use hermes_relayer_components::relay::traits::{ - CanSendTargetUpdateClientMessage, DestinationTarget, SourceTarget, -}; -use hermes_runtime_components::traits::CanSleep; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_test_components::setup::traits::{CanSetupChain, CanSetupClients}; use ibc::core::client::types::Height as CosmosHeight; use tracing::info; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs index 7a7c6887e..59438f08a 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs @@ -1,11 +1,11 @@ use std::sync::Arc; use std::time::SystemTime; +use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_cosmos_chain_components::types::{DynamicGasConfig, EipQueryType}; use hermes_cosmos_relayer::contexts::CosmosBuilder; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::CanReadFileAsString; use starknet::core::types::contract::SierraClass; use crate::contexts::osmosis_bootstrap::OsmosisBootstrap; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs index 02538b1fc..e73884125 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs @@ -1,8 +1,8 @@ use cgp::prelude::CanRaiseError; +use hermes_core::test_components::setup::traits::CanBuildTestDriver; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_test_components::setup::traits::CanBuildTestDriver; use crate::contexts::setup::StarknetTestSetup; use crate::contexts::test_driver::StarknetTestDriver; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs index 6a2a1adf0..b7eef36bd 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs @@ -5,23 +5,25 @@ use std::sync::Arc; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; +use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; +use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; use hermes_cosmos_test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_test_components::impls::bootstrap_madara::{ BootstrapMadara, StartMadaraSequencer, }; use hermes_starknet_test_components::impls::types::genesis_config::ProvideStarknetGenesisConfigType; use hermes_starknet_test_components::impls::types::node_config::ProvideStarknetNodeConfigType; -use hermes_test_components::bootstrap::traits::ChainBootstrapperComponent; -use hermes_test_components::chain_driver::traits::ChainTypeProviderComponent; -use hermes_test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::{MadaraChain, MadaraChainDriver}; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index 10622d918..7d2c7f3b8 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -9,25 +9,27 @@ use cgp::prelude::*; use futures::lock::Mutex; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ BlockTimeQuerierComponent, ChainStatusQuerierComponent, MessageSenderComponent, PollIntervalGetterComponent, }; -use hermes_chain_type_components::traits::ChainIdGetterComponent; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{ +use hermes_core::chain_type_components::traits::ChainIdGetterComponent; +use hermes_core::encoding_components::traits::{ DefaultEncodingGetter, DefaultEncodingGetterComponent, EncodingGetter, EncodingGetterComponent, EncodingTypeProviderComponent, }; -use hermes_encoding_components::types::AsBytes; -use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::transaction::impls::GetGlobalNonceMutex; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::encoding_components::types::AsBytes; +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::transaction::impls::GetGlobalNonceMutex; +use hermes_core::relayer_components::transaction::traits::{ DefaultSignerGetterComponent, NonceAllocationMutexGetterComponent, NonceQuerierComponent, }; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::commitment_proof::{ VerifyStarknetMerkleProof, VerifyStarknetStorageProof, }; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs index 17d85dce8..84fd687a8 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs @@ -5,21 +5,23 @@ use std::path::PathBuf; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::prelude::*; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_core::test_components::chain_driver::impls::WaitChainReachHeight; +use hermes_core::test_components::chain_driver::traits::{ + ChainGetterComponent, ChainProcessTaker, ChainProcessTakerComponent, + ChainStartupWaiterComponent, ChainTypeProviderComponent, DenomGetter, DenomGetterComponent, + RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, UserWallet, + WalletGetterComponent, +}; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain_driver::impls::WaitChainReachHeight; -use hermes_test_components::chain_driver::traits::{ - ChainGetterComponent, ChainProcessTaker, ChainProcessTakerComponent, - ChainStartupWaiterComponent, ChainTypeProviderComponent, DenomGetter, DenomGetterComponent, - RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, UserWallet, - WalletGetterComponent, -}; use tokio::process::Child; use crate::contexts::MadaraChain; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_account.rs b/relayer/crates/starknet-madara-tests/src/impls/build_account.rs index 35f7dbbd7..88a32a5c5 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_account.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_account.rs @@ -2,8 +2,8 @@ use core::str::FromStr; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_components::traits::HasChainId; -use hermes_relayer_components::transaction::traits::HasSignerType; +use hermes_core::chain_components::traits::HasChainId; +use hermes_core::relayer_components::transaction::traits::HasSignerType; use hermes_starknet_chain_components::traits::account::{ AccountFromSignerBuilder, AccountFromSignerBuilderComponent, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index 9ce45eee6..e68ba67ff 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -5,6 +5,10 @@ use std::sync::OnceLock; use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use futures::lock::Mutex; +use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; +use hermes_core::test_components::chain::traits::HasWalletType; +use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_core::test_components::driver::traits::HasChainDriverType; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; use hermes_cosmos_test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, @@ -12,13 +16,9 @@ use hermes_cosmos_test_components::bootstrap::traits::{ }; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; use hermes_starknet_test_components::types::node_config::StarknetNodeConfig; -use hermes_test_components::chain::traits::HasWalletType; -use hermes_test_components::chain_driver::traits::HasChainType; -use hermes_test_components::driver::traits::HasChainDriverType; use ibc::core::host::types::error::IdentifierError; use reqwest::Client; use starknet_v13::providers::jsonrpc::HttpTransport; diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs index be8faca74..e5c7d0f9e 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_components::traits::HasHeightType; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_components::traits::HasHeightType; +use hermes_core::chain_type_components::traits::HasAddressType; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::contract::call::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs index 8b7accc82..6a7228274 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs @@ -6,7 +6,7 @@ use cairo_lang_starknet_classes::casm_contract_class::{ use cairo_lang_starknet_classes::contract_class::ContractClass; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use hermes_starknet_chain_components::traits::account::CanBuildAccountFromSigner; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::contract::declare::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs index afb56ba0f..2cd8ad3fb 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; -use hermes_chain_type_components::traits::HasAddressType; -use hermes_relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::account::CanBuildAccountFromSigner; use hermes_starknet_chain_components::traits::contract::deploy::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs index 97f440eb1..c130249c6 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs @@ -11,10 +11,17 @@ use hermes_cairo_encoding_components::impls::encode_mut::bool::DecodeBoolError; use hermes_cairo_encoding_components::impls::encode_mut::end::NonEmptyBuffer; use hermes_cairo_encoding_components::impls::encode_mut::felt::UnexpectedEndOfBuffer; use hermes_cairo_encoding_components::impls::encode_mut::variant::VariantIndexOutOfBound; -use hermes_chain_components::impls::InvalidTimeoutReceipt; -use hermes_chain_components::traits::HasOutgoingPacketType; -use hermes_chain_type_components::traits::{HasAddressType, HasAmountType, HasHeightType}; -use hermes_core::chain_components::traits::{EmptyMessageResponse, HasClientIdType}; +use hermes_core::chain_components::impls::InvalidTimeoutReceipt; +use hermes_core::chain_components::traits::{ + EmptyMessageResponse, HasClientIdType, HasOutgoingPacketType, +}; +use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasHeightType}; +use hermes_core::relayer_components::chain::impls::NoConsensusStateAtLessThanHeight; +use hermes_core::relayer_components::transaction::impls::TxNoResponseError; +use hermes_core::relayer_components::transaction::traits::HasTxHashType; +use hermes_core::test_components::chain::impls::{ + EventualAmountTimeoutError, MissingSendPacketEventError, +}; use hermes_error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; @@ -22,16 +29,10 @@ use hermes_error::types::Error; use hermes_protobuf_encoding_components::impls::{ InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; -use hermes_relayer_components::chain::impls::NoConsensusStateAtLessThanHeight; -use hermes_relayer_components::transaction::impls::TxNoResponseError; -use hermes_relayer_components::transaction::traits::HasTxHashType; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::queries::consensus_state::ConsensusStateNotFound; use hermes_starknet_chain_components::impls::queries::contract_address::ContractAddressNotFound; use hermes_starknet_chain_components::types::event::UnknownEvent; -use hermes_test_components::chain::impls::{ - EventualAmountTimeoutError, MissingSendPacketEventError, -}; use ibc::core::channel::types::error::ChannelError; use ibc::core::client::types::error::ClientError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs b/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs index b9c34be35..0ccba3d6b 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/init_bootstrap.rs @@ -1,9 +1,9 @@ use std::sync::Arc; use std::time::SystemTime; +use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::CanReadFileAsString; use starknet_v13::core::types::contract::SierraClass; use crate::contexts::{MadaraBootstrap, MadaraBootstrapFields}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index d22e1d286..c62728e70 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -1,11 +1,11 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{CanQueryBlock, UpdateClientPayloadBuilderComponent}; use hermes_core::chain_components::traits::{ - HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, + CanQueryBlock, HasClientStateType, HasHeightType, HasUpdateClientPayloadType, + UpdateClientPayloadBuilder, UpdateClientPayloadBuilderComponent, }; +use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; +use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_encoding_components::traits::{CanEncode, HasDefaultEncoding}; -use hermes_encoding_components::types::AsBytes; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs index b78e2840b..2a7dddadb 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; use hermes_cosmos_chain_components::types::Time; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs index b3e9d360f..116d23667 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs @@ -2,10 +2,10 @@ use core::marker::PhantomData; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ BlockEventsQuerier, BlockEventsQuerierComponent, HasEventType, HasHeightType, }; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_type_components::traits::HasAddressType; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::queries::contract_address::CanQueryContractAddress; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs index 1f778b39d..e44fba831 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::relayer_components::transaction::traits::{ HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; use hermes_starknet_chain_components::traits::account::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs index 494e1f4c8..f5edb8378 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs @@ -1,6 +1,7 @@ use cgp::prelude::*; -use hermes_chain_components::traits::ChainStatusQuerierComponent; -use hermes_core::chain_components::traits::{ChainStatusQuerier, HasChainStatusType}; +use hermes_core::chain_components::traits::{ + ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, +}; use hermes_cosmos_chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs index 595a07a05..784fc6f3c 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs @@ -1,10 +1,10 @@ use core::time::Duration; use cgp::prelude::*; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::relayer_components::transaction::traits::{ HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; -use hermes_runtime_components::traits::{CanSleep, HasRuntime}; +use hermes_core::runtime_components::traits::{CanSleep, HasRuntime}; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use starknet_v13::core::types::{Felt, StarknetError}; use starknet_v13::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/send_message.rs b/relayer/crates/starknet-madara-tests/src/impls/send_message.rs index 1db028356..39c3ca997 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/send_message.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/send_message.rs @@ -2,9 +2,9 @@ use core::fmt::Debug; use std::sync::Arc; use cgp::prelude::*; -use hermes_chain_type_components::traits::HasMessageResponseType; use hermes_core::chain_components::traits::HasMessageType; -use hermes_relayer_components::transaction::traits::{ +use hermes_core::chain_type_components::traits::HasMessageResponseType; +use hermes_core::relayer_components::transaction::traits::{ CanPollTxResponse, HasNonceType, HasSignerType, HasTxHashType, HasTxResponseType, MessagesWithSignerAndNonceSender, MessagesWithSignerAndNonceSenderComponent, TxMessageResponseParser, TxMessageResponseParserComponent, diff --git a/relayer/crates/starknet-madara-tests/src/tests/erc20.rs b/relayer/crates/starknet-madara-tests/src/tests/erc20.rs index 08779890e..a437c173c 100644 --- a/relayer/crates/starknet-madara-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-madara-tests/src/tests/erc20.rs @@ -1,10 +1,11 @@ use cgp::prelude::*; -use hermes_chain_components::traits::{ +use hermes_core::chain_components::traits::{ CanQueryBlock, CanQueryChainHeight, CanQueryChainStatus, CanSendSingleMessage, }; -use hermes_encoding_components::traits::CanEncode; +use hermes_core::encoding_components::traits::CanEncode; +use hermes_core::runtime_components::traits::CanReadFileAsString; +use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; use hermes_error::Error; -use hermes_runtime_components::traits::CanReadFileAsString; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; use hermes_starknet_chain_components::traits::contract::deploy::CanDeployContract; @@ -15,7 +16,6 @@ use hermes_starknet_chain_components::types::amount::StarknetAmount; use hermes_starknet_chain_components::types::events::erc20::Erc20Event; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_chain_context::contexts::encoding::event::StarknetEventEncoding; -use hermes_test_components::bootstrap::traits::CanBootstrapChain; use starknet::core::crypto::pedersen_hash; use starknet::core::types::U256; use starknet::macros::selector; diff --git a/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs b/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs index c251f9f96..60956bcf9 100644 --- a/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs +++ b/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs @@ -1,10 +1,11 @@ use core::fmt::Display; use cgp::prelude::*; -use hermes_chain_components::traits::CanQueryChainHeight; -use hermes_chain_type_components::traits::HasAddressType; +use hermes_core::chain_components::traits::CanQueryChainHeight; +use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::runtime_components::traits::CanReadFileAsString; +use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; use hermes_error::Error; -use hermes_runtime_components::traits::CanReadFileAsString; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::commitment_proof::CanVerifyStarknetStorageProof; use hermes_starknet_chain_components::traits::contract::call::CanCallContract; @@ -18,7 +19,6 @@ use hermes_starknet_chain_components::traits::types::method::HasSelectorType; use hermes_starknet_chain_components::traits::types::storage_proof::{ HasStorageKeyType, HasStorageProofType, }; -use hermes_test_components::bootstrap::traits::CanBootstrapChain; use starknet::core::types::{Felt, StorageProof}; use starknet::macros::{felt, selector}; use tracing::info; diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs index a8b576300..3a51c70f6 100644 --- a/relayer/crates/starknet-relayer/src/contexts/builder.rs +++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs @@ -12,33 +12,33 @@ use cgp::core::types::WithType; use cgp::prelude::*; use eyre::eyre; use futures::lock::Mutex; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_relayer::contexts::{CosmosBuilder, CosmosChain}; -use hermes_error::impls::UseHermesError; -use hermes_error::types::Error; -use hermes_error::HermesError; -use hermes_relayer_components::build::traits::builders::birelay_builder::{ +use hermes_core::relayer_components::build::traits::builders::birelay_builder::{ BiRelayBuilder, BiRelayBuilderComponent, }; -use hermes_relayer_components::build::traits::builders::birelay_from_relay_builder::{ +use hermes_core::relayer_components::build::traits::builders::birelay_from_relay_builder::{ BiRelayFromRelayBuilder, BiRelayFromRelayBuilderComponent, }; -use hermes_relayer_components::build::traits::builders::chain_builder::{ +use hermes_core::relayer_components::build::traits::builders::chain_builder::{ CanBuildChain, ChainBuilder, ChainBuilderComponent, }; -use hermes_relayer_components::build::traits::builders::relay_builder::{ +use hermes_core::relayer_components::build::traits::builders::relay_builder::{ RelayBuilder, RelayBuilderComponent, }; -use hermes_relayer_components::build::traits::builders::relay_from_chains_builder::{ +use hermes_core::relayer_components::build::traits::builders::relay_from_chains_builder::{ RelayFromChainsBuilder, RelayFromChainsBuilderComponent, }; -use hermes_relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; -use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{ +use hermes_core::relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; +use hermes_core::runtime_components::traits::{ CanReadFileAsString, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_error::impls::UseHermesError; +use hermes_error::types::Error; +use hermes_error::HermesError; +use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetChainConfig; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs index cd13d2af5..70c0a8ac5 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs @@ -3,17 +3,19 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWr use cgp::core::field::Index; use cgp::extra::run::RunnerComponent; use cgp::prelude::*; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::birelay::traits::AutoBiRelayerComponent; -use hermes_relayer_components::components::default::DefaultBiRelayComponents; -use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::relay_at::{ +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::birelay::traits::AutoBiRelayerComponent; +use hermes_core::relayer_components::components::default::DefaultBiRelayComponents; +use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::relay_at::{ RelayGetterAtComponent, RelayTypeProviderAtComponent, }; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_tracing_logging_components::contexts::TracingLogger; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs index b3f4f6ce5..90091719b 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs @@ -4,16 +4,15 @@ use core::ops::Deref; use cgp::prelude::*; use futures::lock::Mutex; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_relayer_components::multi::traits::chain_at::{ +use hermes_core::relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; -use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; -use hermes_relayer_components::multi::types::tags::{Dst, Src}; -use hermes_relayer_components::relay::impls::{ +use hermes_core::relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; +use hermes_core::relayer_components::multi::types::tags::{Dst, Src}; +use hermes_core::relayer_components::relay::impls::{ CanBootstrapChannel, CanBootstrapConnection, PacketMutexOf, SelectRelayAToB, }; -use hermes_relayer_components::relay::traits::{ +use hermes_core::relayer_components::relay::traits::{ CanAutoRelayTarget, CanBuildTargetUpdateClientMessage, CanCreateClient, CanInitConnection, CanRaiseRelayChainErrors, CanRelayChannelOpenAck, CanRelayChannelOpenConfirm, CanRelayChannelOpenTry, CanRelayConnectionOpenAck, CanRelayConnectionOpenConfirm, @@ -22,6 +21,7 @@ use hermes_relayer_components::relay::traits::{ HasRelayClientIds, HasSourceTargetChainTypes, HasTargetClientIds, IbcMessageSenderComponent, MainSink, SourceTarget, }; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs index 64d92a8af..a221fd34c 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs @@ -3,17 +3,19 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWr use cgp::core::field::Index; use cgp::extra::run::RunnerComponent; use cgp::prelude::*; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_error::impls::UseHermesError; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::birelay::traits::AutoBiRelayerComponent; -use hermes_relayer_components::components::default::DefaultBiRelayComponents; -use hermes_relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; -use hermes_relayer_components::multi::traits::relay_at::{ +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::birelay::traits::AutoBiRelayerComponent; +use hermes_core::relayer_components::components::default::DefaultBiRelayComponents; +use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; +use hermes_core::relayer_components::multi::traits::relay_at::{ RelayGetterAtComponent, RelayTypeProviderAtComponent, }; +use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, +}; +use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_tracing_logging_components::contexts::TracingLogger; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs index f857b3696..c12087887 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs @@ -4,16 +4,15 @@ use core::ops::Deref; use cgp::prelude::*; use futures::lock::Mutex; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_relayer_components::multi::traits::chain_at::{ +use hermes_core::relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; -use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; -use hermes_relayer_components::multi::types::tags::{Dst, Src}; -use hermes_relayer_components::relay::impls::{ +use hermes_core::relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; +use hermes_core::relayer_components::multi::types::tags::{Dst, Src}; +use hermes_core::relayer_components::relay::impls::{ CanBootstrapConnection, PacketMutexOf, SelectRelayBToA, }; -use hermes_relayer_components::relay::traits::{ +use hermes_core::relayer_components::relay::traits::{ AutoRelayerWithHeightsComponent, CanBuildTargetUpdateClientMessage, CanCreateClient, CanInitConnection, CanRaiseRelayChainErrors, CanRelayConnectionOpenAck, CanRelayConnectionOpenConfirm, CanRelayConnectionOpenTry, CanRelayPacket, CanSendIbcMessages, @@ -22,6 +21,7 @@ use hermes_relayer_components::relay::traits::{ HasSourceTargetChainTypes, HasTargetClientIds, MainSink, SourceTarget, TargetAutoRelayerComponent, }; +use hermes_cosmos_relayer::contexts::CosmosChain; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-relayer/src/impls/error.rs b/relayer/crates/starknet-relayer/src/impls/error.rs index c293bcb20..3b3fd6c99 100644 --- a/relayer/crates/starknet-relayer/src/impls/error.rs +++ b/relayer/crates/starknet-relayer/src/impls/error.rs @@ -5,15 +5,15 @@ use std::string::FromUtf8Error; use cgp::prelude::*; use eyre::Report; use hermes_core::chain_components::traits::{EmptyMessageResponse, HasChainIdType}; +use hermes_core::relayer_components::relay::impls::{ + MissingChannelInitEventError, MissingChannelTryEventError, MissingConnectionInitEventError, + MissingConnectionTryEventError, MissingCreateClientEventError, +}; +use hermes_core::relayer_components::relay::traits::HasRelayChains; use hermes_error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; use hermes_error::types::Error; -use hermes_relayer_components::relay::impls::{ - MissingChannelInitEventError, MissingChannelTryEventError, MissingConnectionInitEventError, - MissingConnectionTryEventError, MissingCreateClientEventError, -}; -use hermes_relayer_components::relay::traits::HasRelayChains; use hermes_runtime::types::error::TokioRuntimeError; pub struct HandleStarknetRelayError; diff --git a/relayer/crates/starknet-relayer/src/presets/relay.rs b/relayer/crates/starknet-relayer/src/presets/relay.rs index a08575f4f..367e7f907 100644 --- a/relayer/crates/starknet-relayer/src/presets/relay.rs +++ b/relayer/crates/starknet-relayer/src/presets/relay.rs @@ -5,17 +5,19 @@ mod preset { ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent, }; use cgp::core::field::{Index, UseField}; - use hermes_cosmos_relayer::contexts::CosmosChain; - use hermes_error::impls::UseHermesError; - use hermes_logging_components::traits::LoggerComponent; - use hermes_relayer_components::components::default::DefaultRelayPreset; - use hermes_relayer_components::multi::traits::chain_at::{ + use hermes_core::logging_components::traits::LoggerComponent; + use hermes_core::relayer_components::components::default::DefaultRelayPreset; + use hermes_core::relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, }; - use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; - use hermes_relayer_components::relay::impls::PacketMutexGetterComponent; + use hermes_core::relayer_components::multi::traits::client_id_at::ClientIdAtGetterComponent; + use hermes_core::relayer_components::relay::impls::PacketMutexGetterComponent; + use hermes_core::runtime_components::traits::{ + RuntimeGetterComponent, RuntimeTypeProviderComponent, + }; + use hermes_cosmos_relayer::contexts::CosmosChain; + use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; - use hermes_runtime_components::traits::{RuntimeGetterComponent, RuntimeTypeProviderComponent}; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_tracing_logging_components::contexts::TracingLogger; use DefaultRelayPreset::re_exports::*; 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 a26f29e4f..b8c1bd4dc 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 @@ -3,18 +3,20 @@ use std::net::{IpAddr, Ipv4Addr}; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; +use hermes_core::runtime_components::traits::{ + CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, + HasRuntime, +}; +use hermes_core::test_components::bootstrap::traits::{ + ChainBootstrapper, ChainBootstrapperComponent, +}; +use hermes_core::test_components::chain::traits::HasWalletType; +use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_cosmos_test_components::bootstrap::traits::{ CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; -use hermes_runtime_components::traits::{ - CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, - HasRuntime, -}; use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_test_components::bootstrap::traits::{ChainBootstrapper, ChainBootstrapperComponent}; -use hermes_test_components::chain::traits::HasWalletType; -use hermes_test_components::chain_driver::traits::HasChainType; use starknet::macros::felt; use crate::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs index 1c5af1fb2..9910e5f9c 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs @@ -10,14 +10,17 @@ use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; use hermes_core::chain_components::traits::{CanSendSingleMessage, HasMessageType}; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; +use hermes_core::logging_components::traits::CanLog; +use hermes_core::logging_components::types::LevelInfo; +use hermes_core::runtime_components::traits::{ChildProcessOf, HasChildProcessType}; +use hermes_core::test_components::chain::traits::HasWalletType; +use hermes_core::test_components::chain_driver::traits::{HasChain, HasChainType}; +use hermes_core::test_components::driver::traits::HasChainDriverType; use hermes_cosmos_test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; -use hermes_logging_components::traits::CanLog; -use hermes_logging_components::types::LevelInfo; -use hermes_runtime_components::traits::{ChildProcessOf, HasChildProcessType}; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; @@ -28,9 +31,6 @@ use hermes_starknet_chain_components::traits::types::contract_class::{ }; use hermes_starknet_chain_components::types::messages::ibc::channel::PortId; use hermes_starknet_chain_components::types::register::{MsgRegisterApp, MsgRegisterClient}; -use hermes_test_components::chain::traits::HasWalletType; -use hermes_test_components::chain_driver::traits::{HasChain, HasChainType}; -use hermes_test_components::driver::traits::HasChainDriverType; use starknet::core::types::Felt; use starknet::macros::{selector, short_string}; 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 a99c9a820..f49cb9532 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,9 +1,9 @@ use cgp::prelude::*; +use hermes_core::runtime_components::traits::{CanStartChildProcess, HasFilePathType, HasRuntime}; use hermes_cosmos_test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_runtime_components::traits::{CanStartChildProcess, HasFilePathType, HasRuntime}; use crate::types::genesis_config::StarknetGenesisConfig; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs index a646bcde3..d233f4e6f 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs @@ -3,18 +3,20 @@ use std::net::{IpAddr, Ipv4Addr}; use cgp::core::error::CanRaiseAsyncError; use cgp::prelude::*; +use hermes_core::runtime_components::traits::{ + CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, + HasRuntime, +}; +use hermes_core::test_components::bootstrap::traits::{ + ChainBootstrapper, ChainBootstrapperComponent, +}; +use hermes_core::test_components::chain::traits::HasWalletType; +use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_cosmos_test_components::bootstrap::traits::{ CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; -use hermes_runtime_components::traits::{ - CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, - HasRuntime, -}; use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_test_components::bootstrap::traits::{ChainBootstrapper, ChainBootstrapperComponent}; -use hermes_test_components::chain::traits::HasWalletType; -use hermes_test_components::chain_driver::traits::HasChainType; use starknet::macros::felt; use crate::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs index 9fba5d518..4b2e401a4 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; +use hermes_core::runtime_components::traits::{HasChildProcessType, HasFilePathType, HasRuntime}; use hermes_cosmos_test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_runtime_components::traits::{HasChildProcessType, HasFilePathType, HasRuntime}; use crate::impls::bootstrap_madara::{StartAnvil, StartMadaraSequencer, StartPathfinder}; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs index eedbf123d..29c572fba 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; +use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use hermes_cosmos_test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs index 0dbcd9742..c283bf75d 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; +use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use hermes_cosmos_test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs index 790fd45e7..7705a2ab0 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs @@ -1,9 +1,9 @@ use cgp::prelude::*; +use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use hermes_cosmos_test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; -use hermes_runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs index 85db866ec..b7c4f009a 100644 --- a/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_test_components::chain_driver::traits::HasChainType; +use hermes_core::test_components::chain_driver::traits::HasChainType; #[cgp_component { provider: IbcContractsDeployer, diff --git a/relayer/crates/tools/src/commands/starknet/transfer_args.rs b/relayer/crates/tools/src/commands/starknet/transfer_args.rs index 5939c0e79..d55c1d37d 100644 --- a/relayer/crates/tools/src/commands/starknet/transfer_args.rs +++ b/relayer/crates/tools/src/commands/starknet/transfer_args.rs @@ -1,8 +1,8 @@ use cgp::prelude::*; use hermes_cli_components::traits::{CommandRunner, CommandRunnerComponent, HasOutputType}; -use hermes_encoding_components::traits::CanEncode; -use hermes_logging_components::traits::CanLog; -use hermes_logging_components::types::LevelInfo; +use hermes_core::encoding_components::traits::CanEncode; +use hermes_core::logging_components::traits::CanLog; +use hermes_core::logging_components::types::LevelInfo; use hermes_starknet_chain_components::types::cosmos::height::Height; use hermes_starknet_chain_components::types::cosmos::timestamp::Timestamp; use hermes_starknet_chain_components::types::messages::ibc::channel::PortId; diff --git a/relayer/crates/tools/src/contexts/app.rs b/relayer/crates/tools/src/contexts/app.rs index ea8dcbc9b..cac81a551 100644 --- a/relayer/crates/tools/src/contexts/app.rs +++ b/relayer/crates/tools/src/contexts/app.rs @@ -12,12 +12,12 @@ use hermes_cli_components::traits::{ ConfigTypeComponent, ConfigWriterComponent, HasConfigPath, HasConfigType, OutputProducer, OutputProducerComponent, OutputTypeComponent, }; -use hermes_logging_components::traits::LoggerComponent; -use hermes_relayer_components::error::traits::RetryableErrorComponent; -use hermes_runtime::types::runtime::HermesRuntime; -use hermes_runtime_components::traits::{ +use hermes_core::logging_components::traits::LoggerComponent; +use hermes_core::relayer_components::error::traits::RetryableErrorComponent; +use hermes_core::runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; +use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_cli::impls::bootstrap::starknet_chain::{ BootstrapStarknetChainArgs, LoadStarknetBootstrap, From 0c7f32ea94f943b014670d06ecf60a8441c8f831 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 20:32:21 +0000 Subject: [PATCH 03/13] Use hermes_cosmos_core --- relayer/Cargo.lock | 5 ++++- .../crates/starknet-chain-components/Cargo.toml | 1 - .../starknet-chain-context/src/contexts/chain.rs | 6 +++--- .../src/contexts/encoding/protobuf.rs | 2 +- .../starknet-cli/examples/bootstrap_ibc.rs | 4 ++-- relayer/crates/starknet-cli/src/contexts/app.rs | 4 ++-- .../src/impls/bootstrap/osmosis_chain.rs | 4 ++-- relayer/crates/starknet-cli/src/impls/build.rs | 2 +- .../starknet-cli/src/impls/create_client.rs | 4 ++-- .../src/contexts/cosmos_starknet_relay_driver.rs | 4 ++-- .../src/contexts/osmosis_bootstrap.rs | 16 ++++++++-------- .../src/contexts/setup.rs | 8 ++++---- .../src/contexts/starknet_bootstrap.rs | 4 ++-- .../src/contexts/starknet_cosmos_relay_driver.rs | 4 ++-- .../src/contexts/test_driver.rs | 4 ++-- .../src/impls/build_bootstrap.rs | 4 ++-- .../src/tests/erc20.rs | 2 +- .../src/tests/test_suite.rs | 2 +- .../src/tests/timeout_packet.rs | 6 +++--- .../src/tests/update_client.rs | 4 ++-- .../src/utils/init_bootstrap.rs | 4 ++-- relayer/crates/starknet-madara-tests/Cargo.toml | 1 + .../src/contexts/bootstrap.rs | 4 ++-- .../starknet-madara-tests/src/contexts/chain.rs | 2 +- .../src/impls/build_chain_driver.rs | 4 ++-- .../src/impls/payload_builders/update_client.rs | 2 +- .../src/impls/queries/block.rs | 2 +- .../src/impls/queries/status.rs | 2 +- relayer/crates/starknet-relayer/Cargo.toml | 1 + .../starknet-relayer/src/contexts/builder.rs | 4 ++-- .../src/contexts/cosmos_starknet_birelay.rs | 2 +- .../src/contexts/cosmos_to_starknet_relay.rs | 2 +- .../src/contexts/starknet_cosmos_birelay.rs | 2 +- .../src/contexts/starknet_to_cosmos_relay.rs | 2 +- .../crates/starknet-relayer/src/presets/relay.rs | 2 +- relayer/crates/tools/Cargo.toml | 2 ++ 36 files changed, 67 insertions(+), 61 deletions(-) diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index dda0b65e1..058a4da0a 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2351,7 +2351,6 @@ dependencies = [ "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", - "hermes-cosmos-core", "hermes-cosmos-encoding-components", "hermes-cosmos-test-components", "hermes-encoding-components", @@ -2529,6 +2528,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-core", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-error", @@ -2578,6 +2578,7 @@ dependencies = [ "futures", "hermes-core", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-relayer", "hermes-encoding-components", "hermes-error", @@ -2626,9 +2627,11 @@ dependencies = [ "eyre", "hermes-cli", "hermes-cli-components", + "hermes-core", "hermes-encoding-components", "hermes-error", "hermes-logging-components", + "hermes-prelude", "hermes-relayer-components", "hermes-runtime", "hermes-runtime-components", diff --git a/relayer/crates/starknet-chain-components/Cargo.toml b/relayer/crates/starknet-chain-components/Cargo.toml index dacb701c3..7a97d8532 100644 --- a/relayer/crates/starknet-chain-components/Cargo.toml +++ b/relayer/crates/starknet-chain-components/Cargo.toml @@ -16,7 +16,6 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } hermes-relayer-components = { workspace = true } hermes-test-components = { workspace = true } hermes-runtime-components = { workspace = true } diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index 65e627c2e..9fda601d0 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -69,12 +69,12 @@ use hermes_core::test_components::chain::traits::{ CanConvertIbcTransferredAmount, CanIbcTransferToken, CanQueryBalance, HasMemoType, IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, }; -use hermes_cosmos_chain_components::types::{ +use hermes_cosmos_core::chain_components::types::{ CosmosInitChannelOptions, CosmosInitConnectionOptions, CosmosUpdateClientPayload, Secp256k1KeyPair, Time, }; -use hermes_cosmos_chain_preset::delegate::DelegateCosmosChainComponents; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::chain_preset::delegate::DelegateCosmosChainComponents; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index 063e19f13..b1e022182 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -14,7 +14,7 @@ use hermes_starknet_chain_components::types::client_state::{ use hermes_starknet_chain_components::types::consensus_state::{ StarknetConsensusState, WasmStarknetConsensusState, }; -use hermes_wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; +use hermes_cosmos_core::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use ibc::clients::wasm_types::client_message::ClientMessage; use ibc::core::commitment_types::commitment::CommitmentRoot; use ibc::primitives::Timestamp; diff --git a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs index 1e84abb54..b7902e6be 100644 --- a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs +++ b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs @@ -14,10 +14,10 @@ use hermes_core::relayer_components::relay::impls::{CanBootstrapChannel, CanBoot use hermes_core::relayer_components::relay::traits::{ CanCreateClient, DestinationTarget, SourceTarget, }; -use hermes_cosmos_chain_components::types::{ +use hermes_cosmos_core::chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index 303673791..aecafad9b 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -28,8 +28,8 @@ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_core::test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; -use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::types::HermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs index cce49638e..3f1e64b35 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs @@ -1,8 +1,8 @@ use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; -use hermes_cosmos_chain_components::types::{DynamicGasConfig, EipQueryType}; -use hermes_cosmos_relayer::contexts::CosmosBuilder; +use hermes_cosmos_core::chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos_core::relayer::contexts::CosmosBuilder; use hermes_error::HermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs index 547301b16..7aa309d93 100644 --- a/relayer/crates/starknet-cli/src/impls/build.rs +++ b/relayer/crates/starknet-cli/src/impls/build.rs @@ -3,7 +3,7 @@ use hermes_cli_components::traits::{ BuilderLoader, BuilderLoaderComponent, CanLoadConfig, HasBuilderType, HasConfigType, }; use hermes_core::runtime_components::traits::HasRuntime; -use hermes_cosmos_relayer::contexts::CosmosBuilder; +use hermes_cosmos_core::relayer::contexts::CosmosBuilder; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-cli/src/impls/create_client.rs b/relayer/crates/starknet-cli/src/impls/create_client.rs index d0ba1cc33..6e26baf21 100644 --- a/relayer/crates/starknet-cli/src/impls/create_client.rs +++ b/relayer/crates/starknet-cli/src/impls/create_client.rs @@ -4,8 +4,8 @@ use cgp::core::field::Index; use cgp::prelude::*; use hermes_cli::commands::CreateCosmosClientArgs; use hermes_cli_components::impls::{CreateClientOptionsParser, CreateClientOptionsParserComponent}; -use hermes_cosmos_chain_components::types::CosmosCreateClientOptions; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::chain_components::types::CosmosCreateClientOptions; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::HermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs index e4375e31e..3d079efb8 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs @@ -10,8 +10,8 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::test_components::relay_driver::run::{ RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, }; -use hermes_cosmos_integration_tests::contexts::AbortOnDrop; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::integration_tests::contexts::AbortOnDrop; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; 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 f6af98447..c47a06f89 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -9,22 +9,22 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_chain_components::types::DynamicGasConfig; -use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_integration_tests::impls::{ +use hermes_cosmos_core::chain_components::types::DynamicGasConfig; +use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_core::integration_tests::impls::{ BuildCosmosChainDriver, BuildCosmosChainWithNodeConfig, BuildRelayerChainConfig, }; -use hermes_cosmos_integration_tests::traits::{ +use hermes_cosmos_core::integration_tests::traits::{ ChainBuilderWithNodeConfigComponent, CompatModeGetterComponent, CosmosBuilderGetterComponent, RelayerChainConfigBuilderComponent, UseCompatMode37, }; -use hermes_cosmos_relayer::contexts::{CosmosBuilder, CosmosChain}; -use hermes_cosmos_test_components::bootstrap::components::LegacyCosmosSdkBootstrapComponents; -use hermes_cosmos_test_components::bootstrap::impls::{ +use hermes_cosmos_core::relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_cosmos_core::test_components::bootstrap::components::LegacyCosmosSdkBootstrapComponents; +use hermes_cosmos_core::test_components::bootstrap::impls::{ BuildAndWaitChainDriver, GenerateStandardWalletConfig, NoModifyCometConfig, NoModifyCosmosSdkConfig, NoModifyGenesisConfig, }; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ AccountPrefixGetterComponent, ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainStoreDirGetterComponent, CometConfigModifierComponent, CosmosGenesisConfigModifierComponent, CosmosSdkConfigModifierComponent, DenomForStaking, diff --git a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs index fcb5780c7..1a104dda9 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs @@ -17,12 +17,12 @@ use hermes_core::test_components::setup::traits::{ InitConnectionOptionsGetterAtComponent, PortIdGetterAtComponent, RelaySetupComponent, TestDriverTypeProviderComponent, }; -use hermes_cosmos_chain_components::types::{ +use hermes_cosmos_core::chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; -use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_integration_tests::impls::UseCosmosInitChannelOptions; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_core::integration_tests::impls::UseCosmosInitChannelOptions; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index 34e97d824..cb7b1ccca 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -12,8 +12,8 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs index 4089cf393..0f326e4d3 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs @@ -10,8 +10,8 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::test_components::relay_driver::run::{ RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, }; -use hermes_cosmos_integration_tests::contexts::AbortOnDrop; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::integration_tests::contexts::AbortOnDrop; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index ff6c8eea0..116f021a7 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -19,8 +19,8 @@ use hermes_core::test_components::setup::traits::{ BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, PortIdGetterAtComponent, }; -use hermes_cosmos_integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::channel_id::ChannelId; diff --git a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs index 0ca9da66f..7eaef7431 100644 --- a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs @@ -9,8 +9,8 @@ use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteSt use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs index 9098e3ade..7f2ab43b1 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs @@ -4,7 +4,7 @@ use hermes_core::chain_components::traits::CanSendSingleMessage; use hermes_core::encoding_components::traits::CanEncode; use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; -use hermes_cosmos_integration_tests::init::init_test_runtime; +use hermes_cosmos_core::integration_tests::init::init_test_runtime; use hermes_error::types::Error; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; diff --git a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs index 46d063741..0065c823c 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs @@ -1,6 +1,6 @@ use cgp::core::field::Index; use hermes_core::test_components::test_case::traits::test_case::TestCase; -use hermes_cosmos_integration_tests::init::init_test_runtime; +use hermes_cosmos_core::integration_tests::init::init_test_runtime; use hermes_error::types::Error; use hermes_ibc_test_suite::tests::clearing::TestPacketClearing; use hermes_ibc_test_suite::tests::transfer::TestIbcTransfer; diff --git a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs index 0a043faa7..0b91128e7 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs @@ -16,9 +16,9 @@ use hermes_core::runtime_components::traits::CanSleep; use hermes_core::test_components::chain::traits::{ CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanIbcTransferToken, CanQueryBalance, }; -use hermes_cosmos_integration_tests::init::init_test_runtime; -use hermes_cosmos_relayer::contexts::CosmosChain; -use hermes_cosmos_test_components::chain::types::Amount; +use hermes_cosmos_core::integration_tests::init::init_test_runtime; +use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos_core::test_components::chain::types::Amount; use hermes_error::types::Error; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::queries::token_address::CanQueryCosmosTokenAddressOnStarknet; diff --git a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs index 792f3b5b2..9bbea18ca 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs @@ -11,8 +11,8 @@ use hermes_core::relayer_components::relay::traits::{ }; use hermes_core::runtime_components::traits::CanSleep; use hermes_core::test_components::setup::traits::{CanSetupChain, CanSetupClients}; -use hermes_cosmos_integration_tests::init::init_test_runtime; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::integration_tests::init::init_test_runtime; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::types::Error; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs index 59438f08a..156bb55a0 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs @@ -2,8 +2,8 @@ use std::sync::Arc; use std::time::SystemTime; use hermes_core::runtime_components::traits::CanReadFileAsString; -use hermes_cosmos_chain_components::types::{DynamicGasConfig, EipQueryType}; -use hermes_cosmos_relayer::contexts::CosmosBuilder; +use hermes_cosmos_core::chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos_core::relayer::contexts::CosmosBuilder; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; use starknet::core::types::contract::SierraClass; diff --git a/relayer/crates/starknet-madara-tests/Cargo.toml b/relayer/crates/starknet-madara-tests/Cargo.toml index 62491fd2d..036a9ca49 100644 --- a/relayer/crates/starknet-madara-tests/Cargo.toml +++ b/relayer/crates/starknet-madara-tests/Cargo.toml @@ -15,6 +15,7 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs index b7eef36bd..88e17dc34 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs @@ -12,8 +12,8 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index 7d2c7f3b8..742717ccc 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -27,7 +27,7 @@ use hermes_core::relayer_components::transaction::traits::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::commitment_proof::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index e68ba67ff..f7602a726 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -9,8 +9,8 @@ use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteSt use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index c62728e70..865247565 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -5,7 +5,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs index 2a7dddadb..5962ef890 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs index f5edb8378..465679e3e 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-relayer/Cargo.toml b/relayer/crates/starknet-relayer/Cargo.toml index 03714e421..6e126711c 100644 --- a/relayer/crates/starknet-relayer/Cargo.toml +++ b/relayer/crates/starknet-relayer/Cargo.toml @@ -17,6 +17,7 @@ cgp = { workspace = true } ibc = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-runtime-components = { workspace = true } diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs index 3a51c70f6..2645a8e24 100644 --- a/relayer/crates/starknet-relayer/src/contexts/builder.rs +++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs @@ -33,8 +33,8 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::runtime_components::traits::{ CanReadFileAsString, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::relayer::contexts::{CosmosBuilder, CosmosChain}; use hermes_error::impls::UseHermesError; use hermes_error::types::Error; use hermes_error::HermesError; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs index 70c0a8ac5..9904aec0a 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs @@ -13,7 +13,7 @@ use hermes_core::relayer_components::multi::traits::relay_at::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs index 90091719b..b270f12fb 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs @@ -21,7 +21,7 @@ use hermes_core::relayer_components::relay::traits::{ HasRelayClientIds, HasSourceTargetChainTypes, HasTargetClientIds, IbcMessageSenderComponent, MainSink, SourceTarget, }; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs index a221fd34c..f6fdf8b94 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs @@ -13,7 +13,7 @@ use hermes_core::relayer_components::multi::traits::relay_at::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs index c12087887..45927f19b 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs @@ -21,7 +21,7 @@ use hermes_core::relayer_components::relay::traits::{ HasSourceTargetChainTypes, HasTargetClientIds, MainSink, SourceTarget, TargetAutoRelayerComponent, }; -use hermes_cosmos_relayer::contexts::CosmosChain; +use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-relayer/src/presets/relay.rs b/relayer/crates/starknet-relayer/src/presets/relay.rs index 367e7f907..f59490864 100644 --- a/relayer/crates/starknet-relayer/src/presets/relay.rs +++ b/relayer/crates/starknet-relayer/src/presets/relay.rs @@ -15,7 +15,7 @@ mod preset { use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; - use hermes_cosmos_relayer::contexts::CosmosChain; + use hermes_cosmos_core::relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/tools/Cargo.toml b/relayer/crates/tools/Cargo.toml index fefbe54c6..f85dedd32 100644 --- a/relayer/crates/tools/Cargo.toml +++ b/relayer/crates/tools/Cargo.toml @@ -32,6 +32,8 @@ tracing-subscriber = { workspace = true } ibc = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } hermes-cli = { workspace = true } hermes-cli-components = { workspace = true } hermes-encoding-components = { workspace = true } From 08da031032f1b9708944f09172873990693aa303 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 20:37:45 +0000 Subject: [PATCH 04/13] Don't use hermes_cosmos_core when crates don't need concrete contexts --- relayer/Cargo.lock | 2 +- .../starknet-chain-context/src/contexts/encoding/protobuf.rs | 2 +- relayer/crates/starknet-cli/Cargo.toml | 1 + relayer/crates/starknet-madara-tests/Cargo.toml | 1 - .../crates/starknet-madara-tests/src/contexts/bootstrap.rs | 4 ++-- relayer/crates/starknet-madara-tests/src/contexts/chain.rs | 2 +- .../starknet-madara-tests/src/impls/build_chain_driver.rs | 4 ++-- .../src/impls/payload_builders/update_client.rs | 2 +- .../crates/starknet-madara-tests/src/impls/queries/block.rs | 2 +- .../crates/starknet-madara-tests/src/impls/queries/status.rs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 058a4da0a..5537cffc5 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2438,6 +2438,7 @@ dependencies = [ "hermes-cli-components", "hermes-core", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-error", @@ -2528,7 +2529,6 @@ dependencies = [ "hermes-chain-type-components", "hermes-core", "hermes-cosmos-chain-components", - "hermes-cosmos-core", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-error", diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index b1e022182..85a6f1baa 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -4,6 +4,7 @@ use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; +use hermes_cosmos_core::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use hermes_error::impls::UseHermesError; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; @@ -14,7 +15,6 @@ use hermes_starknet_chain_components::types::client_state::{ use hermes_starknet_chain_components::types::consensus_state::{ StarknetConsensusState, WasmStarknetConsensusState, }; -use hermes_cosmos_core::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use ibc::clients::wasm_types::client_message::ClientMessage; use ibc::core::commitment_types::commitment::CommitmentRoot; use ibc::primitives::Timestamp; diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index 07620eb33..040d76eaa 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -21,6 +21,7 @@ cgp = { workspace = true } cgp-error-eyre = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-any-counterparty = { workspace = true } hermes-cli-components = { workspace = true } hermes-cli = { workspace = true } diff --git a/relayer/crates/starknet-madara-tests/Cargo.toml b/relayer/crates/starknet-madara-tests/Cargo.toml index 036a9ca49..62491fd2d 100644 --- a/relayer/crates/starknet-madara-tests/Cargo.toml +++ b/relayer/crates/starknet-madara-tests/Cargo.toml @@ -15,7 +15,6 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs index 88e17dc34..b7eef36bd 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs @@ -12,8 +12,8 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_core::test_components::bootstrap::impls::BuildAndWaitChainDriver; -use hermes_cosmos_core::test_components::bootstrap::traits::{ +use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos_test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index 742717ccc..7d2c7f3b8 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -27,7 +27,7 @@ use hermes_core::relayer_components::transaction::traits::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::commitment_proof::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index f7602a726..e68ba67ff 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -9,8 +9,8 @@ use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteSt use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; -use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_core::test_components::bootstrap::traits::{ +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index 865247565..c62728e70 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -5,7 +5,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; -use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_chain_components::types::Secp256k1KeyPair; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs index 5962ef890..2a7dddadb 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; -use hermes_cosmos_core::chain_components::types::Time; +use hermes_cosmos_chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs index 465679e3e..f5edb8378 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; -use hermes_cosmos_core::chain_components::types::Time; +use hermes_cosmos_chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; From accca4d04d0b3914c6ea00f40b95851895e7dbc1 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 20:48:27 +0000 Subject: [PATCH 05/13] Use hermes_cosmos instead of hermes_cosmos_core --- light-client/Cargo.lock | 12 ++++++------ relayer/Cargo.lock | 9 --------- relayer/Cargo.toml | 1 + relayer/crates/starknet-chain-context/Cargo.toml | 2 +- .../starknet-chain-context/src/contexts/chain.rs | 6 +++--- .../src/contexts/encoding/protobuf.rs | 2 +- relayer/crates/starknet-cli/Cargo.toml | 2 +- .../starknet-cli/examples/bootstrap_ibc.rs | 4 ++-- relayer/crates/starknet-cli/src/contexts/app.rs | 4 ++-- .../src/impls/bootstrap/osmosis_chain.rs | 4 ++-- relayer/crates/starknet-cli/src/impls/build.rs | 2 +- .../starknet-cli/src/impls/create_client.rs | 4 ++-- .../crates/starknet-integration-tests/Cargo.toml | 2 +- .../src/contexts/cosmos_starknet_relay_driver.rs | 4 ++-- .../src/contexts/osmosis_bootstrap.rs | 16 ++++++++-------- .../src/contexts/setup.rs | 8 ++++---- .../src/contexts/starknet_bootstrap.rs | 4 ++-- .../src/contexts/starknet_cosmos_relay_driver.rs | 4 ++-- .../src/contexts/test_driver.rs | 4 ++-- .../src/impls/build_bootstrap.rs | 4 ++-- .../src/tests/erc20.rs | 2 +- .../src/tests/test_suite.rs | 2 +- .../src/tests/timeout_packet.rs | 6 +++--- .../src/tests/update_client.rs | 4 ++-- .../src/utils/init_bootstrap.rs | 4 ++-- relayer/crates/starknet-relayer/Cargo.toml | 11 +---------- .../starknet-relayer/src/contexts/builder.rs | 12 ++++++------ .../src/contexts/cosmos_starknet_birelay.rs | 8 ++++---- .../src/contexts/cosmos_to_starknet_relay.rs | 4 ++-- .../src/contexts/starknet_cosmos_birelay.rs | 8 ++++---- .../src/contexts/starknet_to_cosmos_relay.rs | 4 ++-- .../crates/starknet-relayer/src/impls/error.rs | 6 +++--- .../crates/starknet-relayer/src/presets/relay.rs | 8 ++++---- 33 files changed, 80 insertions(+), 97 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index 7a8ff0ad6..a7abb7a92 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -1024,7 +1024,7 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-encoding-components", @@ -1039,7 +1039,7 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-prelude", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "hermes-prelude" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "cgp-async", @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-encoding-components", @@ -1825,7 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.98", @@ -2398,4 +2398,4 @@ dependencies = [ [[patch.unused]] name = "hermes-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 5537cffc5..10fa9e4f0 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2577,19 +2577,10 @@ dependencies = [ "eyre", "futures", "hermes-core", - "hermes-cosmos-chain-components", "hermes-cosmos-core", - "hermes-cosmos-relayer", - "hermes-encoding-components", - "hermes-error", - "hermes-logging-components", "hermes-prelude", - "hermes-relayer-components", - "hermes-runtime", - "hermes-runtime-components", "hermes-starknet-chain-components", "hermes-starknet-chain-context", - "hermes-tracing-logging-components", "ibc", "serde", "starknet 0.14.0", diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index fd2020f35..cee6bd394 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -70,6 +70,7 @@ tendermint-rpc = { version = "0.40" } hermes-prelude = { version = "0.1.0" } hermes-core = { version = "0.1.0" } +hermes-cosmos = { version = "0.1.0" } hermes-cosmos-core = { version = "0.1.0" } hermes-runtime-components = { version = "0.1.0" } hermes-async-runtime-components = { version = "0.1.0" } diff --git a/relayer/crates/starknet-chain-context/Cargo.toml b/relayer/crates/starknet-chain-context/Cargo.toml index a36771bda..2953511cf 100644 --- a/relayer/crates/starknet-chain-context/Cargo.toml +++ b/relayer/crates/starknet-chain-context/Cargo.toml @@ -16,7 +16,7 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } +hermes-cosmos = { workspace = true } ibc = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index 9fda601d0..27e50e5f1 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -69,12 +69,12 @@ use hermes_core::test_components::chain::traits::{ CanConvertIbcTransferredAmount, CanIbcTransferToken, CanQueryBalance, HasMemoType, IbcTransferTimeoutCalculatorComponent, IbcTransferredAmountConverterComponent, }; -use hermes_cosmos_core::chain_components::types::{ +use hermes_cosmos::chain_components::types::{ CosmosInitChannelOptions, CosmosInitConnectionOptions, CosmosUpdateClientPayload, Secp256k1KeyPair, Time, }; -use hermes_cosmos_core::chain_preset::delegate::DelegateCosmosChainComponents; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::chain_preset::delegate::DelegateCosmosChainComponents; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index 85a6f1baa..31409e7de 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -4,7 +4,7 @@ use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; -use hermes_cosmos_core::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; +use hermes_cosmos::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use hermes_error::impls::UseHermesError; use hermes_protobuf_encoding_components::types::any::Any; use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index 040d76eaa..e528e7a86 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -21,7 +21,7 @@ cgp = { workspace = true } cgp-error-eyre = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } +hermes-cosmos = { workspace = true } hermes-any-counterparty = { workspace = true } hermes-cli-components = { workspace = true } hermes-cli = { workspace = true } diff --git a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs index b7902e6be..aee1c92be 100644 --- a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs +++ b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs @@ -14,10 +14,10 @@ use hermes_core::relayer_components::relay::impls::{CanBootstrapChannel, CanBoot use hermes_core::relayer_components::relay::traits::{ CanCreateClient, DestinationTarget, SourceTarget, }; -use hermes_cosmos_core::chain_components::types::{ +use hermes_cosmos::chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index aecafad9b..a27b3eda9 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -28,8 +28,8 @@ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_core::test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; -use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::types::HermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs index 3f1e64b35..d4a801ac9 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs @@ -1,8 +1,8 @@ use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; -use hermes_cosmos_core::chain_components::types::{DynamicGasConfig, EipQueryType}; -use hermes_cosmos_core::relayer::contexts::CosmosBuilder; +use hermes_cosmos::chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos::relayer::contexts::CosmosBuilder; use hermes_error::HermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs index 7aa309d93..f0daed410 100644 --- a/relayer/crates/starknet-cli/src/impls/build.rs +++ b/relayer/crates/starknet-cli/src/impls/build.rs @@ -3,7 +3,7 @@ use hermes_cli_components::traits::{ BuilderLoader, BuilderLoaderComponent, CanLoadConfig, HasBuilderType, HasConfigType, }; use hermes_core::runtime_components::traits::HasRuntime; -use hermes_cosmos_core::relayer::contexts::CosmosBuilder; +use hermes_cosmos::relayer::contexts::CosmosBuilder; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-cli/src/impls/create_client.rs b/relayer/crates/starknet-cli/src/impls/create_client.rs index 6e26baf21..fad546ce3 100644 --- a/relayer/crates/starknet-cli/src/impls/create_client.rs +++ b/relayer/crates/starknet-cli/src/impls/create_client.rs @@ -4,8 +4,8 @@ use cgp::core::field::Index; use cgp::prelude::*; use hermes_cli::commands::CreateCosmosClientArgs; use hermes_cli_components::impls::{CreateClientOptionsParser, CreateClientOptionsParserComponent}; -use hermes_cosmos_core::chain_components::types::CosmosCreateClientOptions; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::chain_components::types::CosmosCreateClientOptions; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::HermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-integration-tests/Cargo.toml b/relayer/crates/starknet-integration-tests/Cargo.toml index 3ee89b899..c2870e19b 100644 --- a/relayer/crates/starknet-integration-tests/Cargo.toml +++ b/relayer/crates/starknet-integration-tests/Cargo.toml @@ -16,7 +16,7 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } +hermes-cosmos = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs index 3d079efb8..00517fccd 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs @@ -10,8 +10,8 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::test_components::relay_driver::run::{ RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, }; -use hermes_cosmos_core::integration_tests::contexts::AbortOnDrop; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::integration_tests::contexts::AbortOnDrop; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; 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 c47a06f89..1c4ceece8 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -9,22 +9,22 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_core::chain_components::types::DynamicGasConfig; -use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_core::integration_tests::impls::{ +use hermes_cosmos::chain_components::types::DynamicGasConfig; +use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos::integration_tests::impls::{ BuildCosmosChainDriver, BuildCosmosChainWithNodeConfig, BuildRelayerChainConfig, }; -use hermes_cosmos_core::integration_tests::traits::{ +use hermes_cosmos::integration_tests::traits::{ ChainBuilderWithNodeConfigComponent, CompatModeGetterComponent, CosmosBuilderGetterComponent, RelayerChainConfigBuilderComponent, UseCompatMode37, }; -use hermes_cosmos_core::relayer::contexts::{CosmosBuilder, CosmosChain}; -use hermes_cosmos_core::test_components::bootstrap::components::LegacyCosmosSdkBootstrapComponents; -use hermes_cosmos_core::test_components::bootstrap::impls::{ +use hermes_cosmos::relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_cosmos::test_components::bootstrap::components::LegacyCosmosSdkBootstrapComponents; +use hermes_cosmos::test_components::bootstrap::impls::{ BuildAndWaitChainDriver, GenerateStandardWalletConfig, NoModifyCometConfig, NoModifyCosmosSdkConfig, NoModifyGenesisConfig, }; -use hermes_cosmos_core::test_components::bootstrap::traits::{ +use hermes_cosmos::test_components::bootstrap::traits::{ AccountPrefixGetterComponent, ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainStoreDirGetterComponent, CometConfigModifierComponent, CosmosGenesisConfigModifierComponent, CosmosSdkConfigModifierComponent, DenomForStaking, diff --git a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs index 1a104dda9..064deec91 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs @@ -17,12 +17,12 @@ use hermes_core::test_components::setup::traits::{ InitConnectionOptionsGetterAtComponent, PortIdGetterAtComponent, RelaySetupComponent, TestDriverTypeProviderComponent, }; -use hermes_cosmos_core::chain_components::types::{ +use hermes_cosmos::chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; -use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_core::integration_tests::impls::UseCosmosInitChannelOptions; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos::integration_tests::impls::UseCosmosInitChannelOptions; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index cb7b1ccca..4bbc9e277 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -12,8 +12,8 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_core::test_components::bootstrap::impls::BuildAndWaitChainDriver; -use hermes_cosmos_core::test_components::bootstrap::traits::{ +use hermes_cosmos::test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos::test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs index 0f326e4d3..43c8fd83f 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs @@ -10,8 +10,8 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::test_components::relay_driver::run::{ RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, }; -use hermes_cosmos_core::integration_tests::contexts::AbortOnDrop; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::integration_tests::contexts::AbortOnDrop; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_error::Error; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index 116f021a7..0bd558182 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -19,8 +19,8 @@ use hermes_core::test_components::setup::traits::{ BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, PortIdGetterAtComponent, }; -use hermes_cosmos_core::integration_tests::contexts::CosmosChainDriver; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::channel_id::ChannelId; diff --git a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs index 7eaef7431..ca3613e7e 100644 --- a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs @@ -9,8 +9,8 @@ use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteSt use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; -use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_core::test_components::bootstrap::traits::{ +use hermes_cosmos::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs index 7f2ab43b1..3c21fd735 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs @@ -4,7 +4,7 @@ use hermes_core::chain_components::traits::CanSendSingleMessage; use hermes_core::encoding_components::traits::CanEncode; use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; -use hermes_cosmos_core::integration_tests::init::init_test_runtime; +use hermes_cosmos::integration_tests::init::init_test_runtime; use hermes_error::types::Error; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; diff --git a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs index 0065c823c..631567552 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs @@ -1,6 +1,6 @@ use cgp::core::field::Index; use hermes_core::test_components::test_case::traits::test_case::TestCase; -use hermes_cosmos_core::integration_tests::init::init_test_runtime; +use hermes_cosmos::integration_tests::init::init_test_runtime; use hermes_error::types::Error; use hermes_ibc_test_suite::tests::clearing::TestPacketClearing; use hermes_ibc_test_suite::tests::transfer::TestIbcTransfer; diff --git a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs index 0b91128e7..cca8d4345 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs @@ -16,9 +16,9 @@ use hermes_core::runtime_components::traits::CanSleep; use hermes_core::test_components::chain::traits::{ CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanIbcTransferToken, CanQueryBalance, }; -use hermes_cosmos_core::integration_tests::init::init_test_runtime; -use hermes_cosmos_core::relayer::contexts::CosmosChain; -use hermes_cosmos_core::test_components::chain::types::Amount; +use hermes_cosmos::integration_tests::init::init_test_runtime; +use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::test_components::chain::types::Amount; use hermes_error::types::Error; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::queries::token_address::CanQueryCosmosTokenAddressOnStarknet; diff --git a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs index 9bbea18ca..541bc68d2 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs @@ -11,8 +11,8 @@ use hermes_core::relayer_components::relay::traits::{ }; use hermes_core::runtime_components::traits::CanSleep; use hermes_core::test_components::setup::traits::{CanSetupChain, CanSetupClients}; -use hermes_cosmos_core::integration_tests::init::init_test_runtime; -use hermes_cosmos_core::relayer::contexts::CosmosChain; +use hermes_cosmos::integration_tests::init::init_test_runtime; +use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_error::types::Error; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs index 156bb55a0..988273633 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs @@ -2,8 +2,8 @@ use std::sync::Arc; use std::time::SystemTime; use hermes_core::runtime_components::traits::CanReadFileAsString; -use hermes_cosmos_core::chain_components::types::{DynamicGasConfig, EipQueryType}; -use hermes_cosmos_core::relayer::contexts::CosmosBuilder; +use hermes_cosmos::chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos::relayer::contexts::CosmosBuilder; use hermes_error::Error; use hermes_runtime::types::runtime::HermesRuntime; use starknet::core::types::contract::SierraClass; diff --git a/relayer/crates/starknet-relayer/Cargo.toml b/relayer/crates/starknet-relayer/Cargo.toml index 6e126711c..a0d25adce 100644 --- a/relayer/crates/starknet-relayer/Cargo.toml +++ b/relayer/crates/starknet-relayer/Cargo.toml @@ -17,16 +17,7 @@ cgp = { workspace = true } ibc = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } -hermes-error = { workspace = true } -hermes-runtime = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-logging-components = { workspace = true } -hermes-tracing-logging-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-cosmos-relayer = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } +hermes-cosmos = { workspace = true } hermes-starknet-chain-context = { workspace = true } hermes-starknet-chain-components = { workspace = true } diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs index 2645a8e24..fcbd7c8aa 100644 --- a/relayer/crates/starknet-relayer/src/contexts/builder.rs +++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs @@ -33,12 +33,12 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::runtime_components::traits::{ CanReadFileAsString, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_core::relayer::contexts::{CosmosBuilder, CosmosChain}; -use hermes_error::impls::UseHermesError; -use hermes_error::types::Error; -use hermes_error::HermesError; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::error::types::Error; +use hermes_cosmos::error::HermesError; +use hermes_cosmos::relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetChainConfig; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs index 9904aec0a..4954fc219 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs @@ -13,12 +13,12 @@ use hermes_core::relayer_components::multi::traits::relay_at::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_core::relayer::contexts::CosmosChain; -use hermes_error::impls::UseHermesError; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; -use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use crate::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs index b270f12fb..3fbb8c8bf 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs @@ -21,8 +21,8 @@ use hermes_core::relayer_components::relay::traits::{ HasRelayClientIds, HasSourceTargetChainTypes, HasTargetClientIds, IbcMessageSenderComponent, MainSink, SourceTarget, }; -use hermes_cosmos_core::relayer::contexts::CosmosChain; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use ibc::core::host::types::identifiers::ClientId as CosmosClientId; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs index f6fdf8b94..ba6cf1b0e 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs @@ -13,12 +13,12 @@ use hermes_core::relayer_components::multi::traits::relay_at::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_core::relayer::contexts::CosmosChain; -use hermes_error::impls::UseHermesError; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; -use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use crate::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs index 45927f19b..de0153350 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs @@ -21,8 +21,8 @@ use hermes_core::relayer_components::relay::traits::{ HasSourceTargetChainTypes, HasTargetClientIds, MainSink, SourceTarget, TargetAutoRelayerComponent, }; -use hermes_cosmos_core::relayer::contexts::CosmosChain; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use ibc::core::host::types::identifiers::ClientId as CosmosClientId; diff --git a/relayer/crates/starknet-relayer/src/impls/error.rs b/relayer/crates/starknet-relayer/src/impls/error.rs index 3b3fd6c99..8c38c09c5 100644 --- a/relayer/crates/starknet-relayer/src/impls/error.rs +++ b/relayer/crates/starknet-relayer/src/impls/error.rs @@ -10,11 +10,11 @@ use hermes_core::relayer_components::relay::impls::{ MissingConnectionTryEventError, MissingCreateClientEventError, }; use hermes_core::relayer_components::relay::traits::HasRelayChains; -use hermes_error::handlers::{ +use hermes_cosmos::error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; -use hermes_error::types::Error; -use hermes_runtime::types::error::TokioRuntimeError; +use hermes_cosmos::error::types::Error; +use hermes_cosmos::runtime::types::error::TokioRuntimeError; pub struct HandleStarknetRelayError; diff --git a/relayer/crates/starknet-relayer/src/presets/relay.rs b/relayer/crates/starknet-relayer/src/presets/relay.rs index f59490864..edcc74d44 100644 --- a/relayer/crates/starknet-relayer/src/presets/relay.rs +++ b/relayer/crates/starknet-relayer/src/presets/relay.rs @@ -15,11 +15,11 @@ mod preset { use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; - use hermes_cosmos_core::relayer::contexts::CosmosChain; - use hermes_error::impls::UseHermesError; - use hermes_runtime::types::runtime::HermesRuntime; + use hermes_cosmos::error::impls::UseHermesError; + use hermes_cosmos::relayer::contexts::CosmosChain; + use hermes_cosmos::runtime::types::runtime::HermesRuntime; + use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_starknet_chain_context::contexts::chain::StarknetChain; - use hermes_tracing_logging_components::contexts::TracingLogger; use DefaultRelayPreset::re_exports::*; use crate::impls::error::HandleStarknetRelayError; From 99c395ea045038d2ea3695145d2f789377113963 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 20:53:56 +0000 Subject: [PATCH 06/13] Use hermes_cosmos_core in other crates --- relayer/Cargo.lock | 102 ++++++++++-------- relayer/Cargo.toml | 1 + .../starknet-chain-components/Cargo.toml | 1 + .../src/components/chain.rs | 2 +- .../src/components/starknet_to_cosmos.rs | 4 +- .../src/impls/messages/channel.rs | 4 +- .../src/impls/messages/connection.rs | 4 +- .../src/impls/messages/create_client.rs | 2 +- .../src/impls/messages/packet.rs | 2 +- .../src/impls/messages/update_client.rs | 2 +- .../impls/payload_builders/create_client.rs | 2 +- .../impls/payload_builders/update_client.rs | 2 +- .../src/impls/queries/ack_commitment.rs | 2 +- .../src/impls/queries/block.rs | 2 +- .../src/impls/queries/channel_end.rs | 2 +- .../src/impls/queries/client_state.rs | 2 +- .../src/impls/queries/connection_end.rs | 2 +- .../src/impls/queries/consensus_state.rs | 2 +- .../src/impls/queries/packet_commitment.rs | 2 +- .../src/impls/queries/packet_receipt.rs | 2 +- .../src/impls/queries/status.rs | 2 +- .../starknet_to_cosmos/connection_message.rs | 4 +- .../counterparty_message_height.rs | 2 +- .../create_client_message.rs | 4 +- .../query_consensus_state_height.rs | 2 +- .../update_client_message.rs | 4 +- .../src/impls/transfer.rs | 2 +- .../src/impls/types/config.rs | 2 +- .../src/impls/types/status.rs | 2 +- .../src/types/status.rs | 2 +- .../crates/starknet-madara-tests/Cargo.toml | 1 + .../src/contexts/chain.rs | 2 +- .../src/impls/build_chain_driver.rs | 2 +- .../impls/payload_builders/update_client.rs | 2 +- .../src/impls/queries/block.rs | 2 +- .../src/impls/queries/status.rs | 2 +- .../starknet-test-components/Cargo.toml | 1 + 37 files changed, 101 insertions(+), 81 deletions(-) diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 10fa9e4f0..ce8557cae 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -1797,7 +1797,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermes-any-counterparty" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-core", @@ -1817,7 +1817,7 @@ dependencies = [ [[package]] name = "hermes-async-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "async-trait", "cgp", @@ -1841,7 +1841,7 @@ dependencies = [ [[package]] name = "hermes-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-chain-type-components", @@ -1853,7 +1853,7 @@ dependencies = [ [[package]] name = "hermes-chain-type-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-prelude", @@ -1862,7 +1862,7 @@ dependencies = [ [[package]] name = "hermes-cli" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "clap", @@ -1874,7 +1874,7 @@ dependencies = [ "hermes-cli-components", "hermes-cli-framework", "hermes-core", - "hermes-cosmos-core", + "hermes-cosmos", "hermes-prelude", "http 1.3.1", "humantime", @@ -1889,7 +1889,7 @@ dependencies = [ [[package]] name = "hermes-cli-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "clap", @@ -1905,7 +1905,7 @@ dependencies = [ [[package]] name = "hermes-cli-framework" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "clap", @@ -1925,7 +1925,7 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-chain-type-components", @@ -1935,7 +1935,7 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-context" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "eyre", @@ -1952,7 +1952,7 @@ dependencies = [ [[package]] name = "hermes-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-chain-components", @@ -1966,10 +1966,25 @@ dependencies = [ "hermes-test-components", ] +[[package]] +name = "hermes-cosmos" +version = "0.1.0" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +dependencies = [ + "hermes-comet-light-client-context", + "hermes-core", + "hermes-cosmos-core", + "hermes-cosmos-integration-tests", + "hermes-cosmos-relayer", + "hermes-cosmos-wasm-relayer", + "hermes-error", + "hermes-runtime", +] + [[package]] name = "hermes-cosmos-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "bech32 0.9.1", "bitcoin", @@ -2018,7 +2033,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-chain-preset" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-core", @@ -2030,21 +2045,15 @@ dependencies = [ [[package]] name = "hermes-cosmos-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "hermes-comet-light-client-components", - "hermes-comet-light-client-context", "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", "hermes-cosmos-encoding-components", - "hermes-cosmos-integration-tests", - "hermes-cosmos-relayer", "hermes-cosmos-test-components", - "hermes-cosmos-wasm-relayer", - "hermes-error", "hermes-protobuf-encoding-components", - "hermes-runtime", "hermes-tracing-logging-components", "hermes-wasm-client-components", "hermes-wasm-encoding-components", @@ -2059,7 +2068,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-encoding-components", @@ -2074,7 +2083,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-integration-tests" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "eyre", @@ -2104,7 +2113,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "dirs-next", @@ -2148,7 +2157,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hdpath", @@ -2174,7 +2183,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-wasm-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "eyre", @@ -2219,7 +2228,7 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-prelude", @@ -2228,7 +2237,7 @@ dependencies = [ [[package]] name = "hermes-error" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "eyre", @@ -2240,7 +2249,7 @@ dependencies = [ [[package]] name = "hermes-ibc-test-suite" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-chain-components", @@ -2255,7 +2264,7 @@ dependencies = [ [[package]] name = "hermes-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-prelude", @@ -2264,7 +2273,7 @@ dependencies = [ [[package]] name = "hermes-prelude" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "cgp-async", @@ -2273,7 +2282,7 @@ dependencies = [ [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-encoding-components", @@ -2285,7 +2294,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "futures", @@ -2300,7 +2309,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components-extra" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "futures", @@ -2314,7 +2323,7 @@ dependencies = [ [[package]] name = "hermes-runtime" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-async-runtime-components", @@ -2329,7 +2338,7 @@ dependencies = [ [[package]] name = "hermes-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-prelude", @@ -2351,6 +2360,7 @@ dependencies = [ "hermes-core", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", + "hermes-cosmos-core", "hermes-cosmos-encoding-components", "hermes-cosmos-test-components", "hermes-encoding-components", @@ -2397,9 +2407,9 @@ dependencies = [ "hermes-chain-components", "hermes-chain-type-components", "hermes-core", + "hermes-cosmos", "hermes-cosmos-chain-components", "hermes-cosmos-chain-preset", - "hermes-cosmos-core", "hermes-cosmos-relayer", "hermes-encoding-components", "hermes-error", @@ -2437,8 +2447,8 @@ dependencies = [ "hermes-cli", "hermes-cli-components", "hermes-core", + "hermes-cosmos", "hermes-cosmos-chain-components", - "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-error", @@ -2477,8 +2487,8 @@ dependencies = [ "futures", "hermes-chain-components", "hermes-core", + "hermes-cosmos", "hermes-cosmos-chain-components", - "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-cosmos-test-components", @@ -2529,6 +2539,7 @@ dependencies = [ "hermes-chain-type-components", "hermes-core", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-error", @@ -2577,7 +2588,7 @@ dependencies = [ "eyre", "futures", "hermes-core", - "hermes-cosmos-core", + "hermes-cosmos", "hermes-prelude", "hermes-starknet-chain-components", "hermes-starknet-chain-context", @@ -2596,6 +2607,7 @@ dependencies = [ "cgp", "hermes-cairo-encoding-components", "hermes-core", + "hermes-cosmos-core", "hermes-cosmos-test-components", "hermes-encoding-components", "hermes-logging-components", @@ -2644,7 +2656,7 @@ dependencies = [ [[package]] name = "hermes-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-chain-type-components", @@ -2658,7 +2670,7 @@ dependencies = [ [[package]] name = "hermes-tokio-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "futures", @@ -2675,7 +2687,7 @@ dependencies = [ [[package]] name = "hermes-tracing-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-core", @@ -2690,7 +2702,7 @@ dependencies = [ [[package]] name = "hermes-wasm-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-core", @@ -2710,7 +2722,7 @@ dependencies = [ [[package]] name = "hermes-wasm-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-core", @@ -2725,7 +2737,7 @@ dependencies = [ [[package]] name = "hermes-wasm-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#459ce5ff0b4976c61a7dcdcfbdfeb4458dd04968" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" dependencies = [ "cgp", "hermes-core", diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index cee6bd394..e6be70efd 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -190,6 +190,7 @@ hermes-tracing-logging-components = { git = "https://github.com/informalsyste hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-ibc-test-suite = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-any-counterparty = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-cosmos = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-cosmos-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-cosmos-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-cosmos-chain-preset = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } diff --git a/relayer/crates/starknet-chain-components/Cargo.toml b/relayer/crates/starknet-chain-components/Cargo.toml index 7a97d8532..dacb701c3 100644 --- a/relayer/crates/starknet-chain-components/Cargo.toml +++ b/relayer/crates/starknet-chain-components/Cargo.toml @@ -16,6 +16,7 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-relayer-components = { workspace = true } hermes-test-components = { workspace = true } hermes-runtime-components = { workspace = true } diff --git a/relayer/crates/starknet-chain-components/src/components/chain.rs b/relayer/crates/starknet-chain-components/src/components/chain.rs index fb8045e19..239a5814b 100644 --- a/relayer/crates/starknet-chain-components/src/components/chain.rs +++ b/relayer/crates/starknet-chain-components/src/components/chain.rs @@ -90,7 +90,7 @@ mod preset { MemoTypeProviderComponent, PollAssertDurationGetterComponent, TokenIbcTransferrerComponent, WalletSignerComponent, WalletTypeComponent, }; - use hermes_cosmos_chain_components::impls::{ + use hermes_cosmos_core::chain_components::impls::{ CosmosPacketFieldReader, FixedPollTimeoutSecs, ProvideCosmosChainTypes, ProvideCosmosInitChannelOptionsType, ProvideCosmosInitConnectionOptionsType, ProvideNoCreateClientMessageOptionsType, QueryCounterpartyConnectionId, 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 5e1da6a33..654fcc99c 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 @@ -23,10 +23,10 @@ mod preset { UpdateClientPayloadTypeComponent, }; use hermes_core::test_components::chain::traits::IbcTransferredAmountConverterComponent; - use hermes_cosmos_chain_components::impls::{ + use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; + use hermes_cosmos_core::chain_components::impls::{ BuildCosmosPacketMessages, CosmosPacketFieldReader, }; - use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; use crate::impls::starknet_to_cosmos::connection_message::BuildStarknetToCosmosConnectionHandshake; use crate::impls::starknet_to_cosmos::counterparty_message_height::GetCosmosCounterpartyMessageStarknetHeight; 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 d1867aac7..7c4bc9750 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs @@ -17,7 +17,9 @@ use hermes_core::chain_components::types::payloads::channel::{ }; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::{CosmosCommitmentProof, CosmosInitChannelOptions}; +use hermes_cosmos_core::chain_components::types::{ + CosmosCommitmentProof, CosmosInitChannelOptions, +}; use ibc::core::channel::types::channel::{ChannelEnd, Order as IbcOrder}; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId as IbcPortId}; 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 c44865d94..c3cce3208 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs @@ -22,7 +22,9 @@ use hermes_core::chain_components::types::payloads::connection::{ }; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::{CosmosCommitmentProof, CosmosInitConnectionOptions}; +use hermes_cosmos_core::chain_components::types::{ + CosmosCommitmentProof, CosmosInitConnectionOptions, +}; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::{ 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 68d754716..c3f0a1679 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::CosmosCreateClientPayload; +use hermes_cosmos_core::chain_components::types::CosmosCreateClientPayload; use starknet::core::types::Felt; use starknet::macros::{selector, short_string}; 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 f12e89d14..6d9bd2bbe 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs @@ -15,7 +15,7 @@ use hermes_core::chain_components::types::payloads::packet::{ }; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::CosmosCommitmentProof; +use hermes_cosmos_core::chain_components::types::CosmosCommitmentProof; use ibc::apps::transfer::types::packet::PacketData as IbcIcs20PacketData; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; 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 d78ac8981..88576cac7 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::CosmosUpdateClientPayload; +use hermes_cosmos_core::chain_components::types::CosmosUpdateClientPayload; use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader; use ibc_proto::Protobuf; use starknet::core::types::{ByteArray, Felt}; 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 3682ab993..00fbba150 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 @@ -4,7 +4,7 @@ use hermes_core::chain_components::traits::{ CreateClientPayloadBuilderComponent, HasChainId, HasCreateClientPayloadOptionsType, HasCreateClientPayloadType, }; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ChainId; 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 623597ac7..fc251c736 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 @@ -5,7 +5,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::client::types::Height; use ibc::primitives::Timestamp; 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 c0d026594..2faeae2b7 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ PacketAckCommitmentQuerier, PacketAckCommitmentQuerierComponent, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{AckPath, Path}; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs index 2192d9444..4739d9bdc 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use starknet::core::types::{BlockId, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; 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 50531e326..82895b429 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ HasChannelIdType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, HasPortIdType, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::host::types::path::{ChannelEndPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 c5dd45a98..6946d7fc9 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ HasClientStateType, HasCommitmentProofType, HasHeightType, HasIbcCommitmentPrefix, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::host::types::path::{ClientStatePath, Path}; use starknet::core::types::Felt; use starknet::macros::selector; 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 7b3f6e25e..180296d53 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 @@ -10,7 +10,7 @@ use hermes_core::chain_components::traits::{ HasIbcCommitmentPrefix, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::host::types::path::{ConnectionPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 93aac8464..a28ba2439 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 @@ -10,7 +10,7 @@ use hermes_core::chain_components::traits::{ HasIbcCommitmentPrefix, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::client::types::Height as IbcHeight; use ibc::core::host::types::path::{ClientConsensusStatePath, Path}; use starknet::core::types::Felt; 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 b6139294d..26a19c4ba 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ PacketCommitmentQuerierComponent, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{CommitmentPath, Path}; use starknet::core::types::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 3f2022d17..641f1b9c8 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 @@ -9,7 +9,7 @@ use hermes_core::chain_components::traits::{ PacketReceiptQuerierComponent, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{Path, ReceiptPath}; use starknet::core::types::Felt; 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 bd363829e..f76d11875 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/status.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use starknet::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; 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 fd7498531..20dad158a 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 @@ -15,8 +15,8 @@ use hermes_core::chain_components::types::payloads::connection::{ ConnectionOpenAckPayload, ConnectionOpenConfirmPayload, ConnectionOpenInitPayload, ConnectionOpenTryPayload, }; -use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; -use hermes_cosmos_chain_components::types::{ +use hermes_cosmos_core::chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_cosmos_core::chain_components::types::{ CosmosConnectionOpenAckMessage, CosmosConnectionOpenConfirmMessage, CosmosConnectionOpenInitMessage, CosmosConnectionOpenTryMessage, CosmosInitConnectionOptions, }; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs index dd6467e3d..b313116ff 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs @@ -3,7 +3,7 @@ use hermes_core::chain_components::traits::{ CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, HasMessageType, }; -use hermes_cosmos_chain_components::traits::CosmosMessage; +use hermes_cosmos_core::chain_components::traits::CosmosMessage; pub struct GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs index 7da7216d8..92239dd20 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs @@ -6,8 +6,8 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanConvert, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; -use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; -use hermes_cosmos_chain_components::types::CosmosCreateClientMessage; +use hermes_cosmos_core::chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_cosmos_core::chain_components::types::CosmosCreateClientMessage; use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; 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 b458b547e..f6a049425 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 @@ -3,7 +3,7 @@ use hermes_core::chain_components::traits::{ ConsensusStateHeightsQuerier, ConsensusStateHeightsQuerierComponent, HasHeightType, HasIbcChainTypes, }; -use hermes_cosmos_chain_components::traits::HasGrpcAddress; +use hermes_cosmos_core::chain_components::traits::HasGrpcAddress; use http::uri::InvalidUri; use http::Uri; use ibc::core::host::types::identifiers::ClientId; 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 aa62ffda7..0724fde9a 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 @@ -5,8 +5,8 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanConvert, CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; -use hermes_cosmos_chain_components::traits::{CosmosMessage, ToCosmosMessage}; -use hermes_cosmos_chain_components::types::CosmosUpdateClientMessage; +use hermes_cosmos_core::chain_components::traits::{CosmosMessage, ToCosmosMessage}; +use hermes_cosmos_core::chain_components::types::CosmosUpdateClientMessage; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::host::types::identifiers::ClientId; use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader}; diff --git a/relayer/crates/starknet-chain-components/src/impls/transfer.rs b/relayer/crates/starknet-chain-components/src/impls/transfer.rs index 92370dccd..6d702d003 100644 --- a/relayer/crates/starknet-chain-components/src/impls/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/transfer.rs @@ -8,7 +8,7 @@ use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::test_components::chain::traits::{ IbcTransferTimeoutCalculator, IbcTransferTimeoutCalculatorComponent, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use ibc::primitives::Timestamp; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/config.rs b/relayer/crates/starknet-chain-components/src/impls/types/config.rs index 0097e4b22..66cf32b15 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/config.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/config.rs @@ -1,6 +1,6 @@ use core::time::Duration; -use hermes_cosmos_chain_components::impls::CosmosChainConfig; +use hermes_cosmos_core::chain_components::impls::CosmosChainConfig; use serde::{Deserialize, Serialize}; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/status.rs b/relayer/crates/starknet-chain-components/src/impls/types/status.rs index 0c2a44110..20b7bf2d3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/status.rs @@ -3,7 +3,7 @@ use hermes_core::chain_components::traits::{ ChainStatusTypeComponent, HasHeightType, ProvideChainStatusType, }; use hermes_core::chain_type_components::traits::HasTimeType; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/types/status.rs b/relayer/crates/starknet-chain-components/src/types/status.rs index 6e0cb9f25..710fb86c8 100644 --- a/relayer/crates/starknet-chain-components/src/types/status.rs +++ b/relayer/crates/starknet-chain-components/src/types/status.rs @@ -1,6 +1,6 @@ use core::fmt::{Display, Formatter, Result}; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use serde::Serialize; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-madara-tests/Cargo.toml b/relayer/crates/starknet-madara-tests/Cargo.toml index 62491fd2d..036a9ca49 100644 --- a/relayer/crates/starknet-madara-tests/Cargo.toml +++ b/relayer/crates/starknet-madara-tests/Cargo.toml @@ -15,6 +15,7 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index 7d2c7f3b8..742717ccc 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -27,7 +27,7 @@ use hermes_core::relayer_components::transaction::traits::{ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::commitment_proof::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index e68ba67ff..5651997d9 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -9,7 +9,7 @@ use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteSt use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_cosmos_test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index c62728e70..865247565 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -5,7 +5,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; -use hermes_cosmos_chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs index 2a7dddadb..5962ef890 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs index f5edb8378..465679e3e 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; -use hermes_cosmos_chain_components::types::Time; +use hermes_cosmos_core::chain_components::types::Time; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-test-components/Cargo.toml b/relayer/crates/starknet-test-components/Cargo.toml index c3d7d9b6e..4a100c500 100644 --- a/relayer/crates/starknet-test-components/Cargo.toml +++ b/relayer/crates/starknet-test-components/Cargo.toml @@ -16,6 +16,7 @@ workspace = true cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-runtime-components = { workspace = true } hermes-relayer-components = { workspace = true } hermes-test-components = { workspace = true } From 3c6667996c4c33ee8248541092be7d2eed68324a Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 21:10:30 +0000 Subject: [PATCH 07/13] Migrating to use hermes-cosmos-core --- relayer/Cargo.lock | 3 +++ .../src/components/encoding/protobuf.rs | 8 ++++---- .../starknet-chain-components/src/impls/ibc_amount.rs | 2 +- .../src/impls/payload_builders/update_client.rs | 2 +- .../src/impls/starknet_to_cosmos/ibc_amount.rs | 4 ++-- .../src/impls/starknet_to_cosmos/update_client_message.rs | 2 +- .../starknet-chain-components/src/types/client_state.rs | 2 +- .../crates/starknet-chain-context/src/contexts/chain.rs | 2 +- .../src/contexts/encoding/protobuf.rs | 4 ++-- relayer/crates/starknet-chain-context/src/impls/error.rs | 6 +++--- relayer/crates/starknet-cli/Cargo.toml | 1 + relayer/crates/starknet-cli/bin/hermes_starknet.rs | 2 +- relayer/crates/starknet-cli/src/contexts/app.rs | 2 +- relayer/crates/starknet-integration-tests/Cargo.toml | 1 + .../src/contexts/osmosis_bootstrap.rs | 2 +- .../src/contexts/starknet_bootstrap.rs | 2 +- .../src/contexts/test_driver.rs | 2 +- .../starknet-madara-tests/src/contexts/bootstrap.rs | 6 +++--- .../crates/starknet-madara-tests/src/contexts/chain.rs | 2 +- .../starknet-madara-tests/src/impls/build_chain_driver.rs | 2 +- .../starknet-madara-tests/src/impls/error/handler.rs | 6 +++--- relayer/crates/starknet-madara-tests/src/impls/init.rs | 2 +- .../src/impls/payload_builders/update_client.rs | 2 +- .../src/impls/bootstrap/bootstrap_chain.rs | 2 +- .../src/impls/bootstrap/deploy_contracts.rs | 2 +- .../src/impls/bootstrap/start_chain.rs | 2 +- .../src/impls/bootstrap_madara/bootstrap_chain.rs | 2 +- .../src/impls/bootstrap_madara/start_all.rs | 2 +- .../src/impls/bootstrap_madara/start_anvil.rs | 2 +- .../src/impls/bootstrap_madara/start_madara.rs | 2 +- .../src/impls/bootstrap_madara/start_pathfinder.rs | 2 +- .../src/impls/types/genesis_config.rs | 2 +- .../src/impls/types/node_config.rs | 2 +- relayer/crates/tools/Cargo.toml | 1 + relayer/crates/tools/src/contexts/app.rs | 2 +- 35 files changed, 48 insertions(+), 42 deletions(-) diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index ce8557cae..585219b9e 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2449,6 +2449,7 @@ dependencies = [ "hermes-core", "hermes-cosmos", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-error", @@ -2489,6 +2490,7 @@ dependencies = [ "hermes-core", "hermes-cosmos", "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", "hermes-cosmos-test-components", @@ -2631,6 +2633,7 @@ dependencies = [ "hermes-cli", "hermes-cli-components", "hermes-core", + "hermes-cosmos-core", "hermes-encoding-components", "hermes-error", "hermes-logging-components", diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs index b056f3649..393c6f645 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs @@ -8,13 +8,13 @@ mod preset { EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaGetterComponent, SchemaTypeComponent, }; - use hermes_protobuf_encoding_components::impl_type_url; - use hermes_protobuf_encoding_components::impls::{ + use hermes_cosmos_core::protobuf_encoding_components::impl_type_url; + use hermes_cosmos_core::protobuf_encoding_components::impls::{ DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, ProvideBytesEncodeBuffer, ProvideProtoChunksDecodeBuffer, }; - use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent; - use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; + use hermes_cosmos_core::protobuf_encoding_components::traits::EncodedLengthGetterComponent; + use hermes_cosmos_core::protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_wasm_encoding_components::components::WasmEncodingComponents; use hermes_wasm_encoding_components::impls::{DecodeViaClientMessage, EncodeViaClientMessage}; use hermes_wasm_encoding_components::types::{ diff --git a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs index dad5a507e..a95018d32 100644 --- a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs @@ -6,7 +6,7 @@ use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, use hermes_core::test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; -use hermes_cosmos_test_components::chain::types::Amount; +use hermes_cosmos_core::test_components::chain::types::Amount; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::impls::types::address::StarknetAddress; 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 fc251c736..6ccd5bf1b 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 @@ -6,7 +6,7 @@ use hermes_core::chain_components::traits::{ use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; -use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; +use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::client::types::Height; use ibc::primitives::Timestamp; use ibc_client_starknet_types::header::StarknetHeader; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs index 03a4ea82c..a5f944cc4 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs @@ -7,8 +7,8 @@ use hermes_core::chain_type_components::traits::{HasAmountType, HasDenomType}; use hermes_core::test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; -use hermes_cosmos_test_components::chain::impls::derive_ibc_denom; -use hermes_cosmos_test_components::chain::types::{Amount, Denom}; +use hermes_cosmos_core::test_components::chain::impls::derive_ibc_denom; +use hermes_cosmos_core::test_components::chain::types::{Amount, Denom}; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::types::amount::StarknetAmount; 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 0724fde9a..4a71a1dc6 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 @@ -7,7 +7,7 @@ use hermes_core::encoding_components::traits::{CanConvert, CanEncode, HasDefault use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_core::chain_components::types::CosmosUpdateClientMessage; -use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; +use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaProtobuf; use ibc::core::host::types::identifiers::ClientId; use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader}; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/types/client_state.rs b/relayer/crates/starknet-chain-components/src/types/client_state.rs index 80f69dab6..0c95a5f9d 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_state.rs @@ -2,7 +2,7 @@ use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, }; -use hermes_protobuf_encoding_components::types::strategy::ViaAny; +use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaAny; use hermes_wasm_encoding_components::types::WasmClientState; pub use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index 27e50e5f1..c228c8b7c 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -75,6 +75,7 @@ use hermes_cosmos::chain_components::types::{ }; use hermes_cosmos::chain_preset::delegate::DelegateCosmosChainComponents; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; @@ -117,7 +118,6 @@ use hermes_starknet_chain_components::types::payloads::client::{ }; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use hermes_starknet_chain_components::types::wallet::StarknetWallet; -use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::channel::types::packet::Packet; use ibc::core::host::types::identifiers::{ChainId, PortId as IbcPortId, Sequence}; use ibc::primitives::Timestamp; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index 31409e7de..7f76dee09 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -4,10 +4,10 @@ use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; +use hermes_cosmos::protobuf_encoding_components::types::any::Any; +use hermes_cosmos::protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_cosmos::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; use hermes_error::impls::UseHermesError; -use hermes_protobuf_encoding_components::types::any::Any; -use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_starknet_chain_components::components::encoding::protobuf::*; use hermes_starknet_chain_components::types::client_state::{ StarknetClientState, WasmStarknetClientState, diff --git a/relayer/crates/starknet-chain-context/src/impls/error.rs b/relayer/crates/starknet-chain-context/src/impls/error.rs index ad2db0eaf..105250d50 100644 --- a/relayer/crates/starknet-chain-context/src/impls/error.rs +++ b/relayer/crates/starknet-chain-context/src/impls/error.rs @@ -22,13 +22,13 @@ use hermes_core::relayer_components::transaction::traits::HasTxHashType; use hermes_core::test_components::chain::impls::{ EventualAmountTimeoutError, MissingSendPacketEventError, }; +use hermes_cosmos::protobuf_encoding_components::impls::{ + InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, +}; use hermes_error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; use hermes_error::types::Error; -use hermes_protobuf_encoding_components::impls::{ - InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, -}; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::error::account::RaiseAccountError; use hermes_starknet_chain_components::impls::error::provider::RaiseProviderError; diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index e528e7a86..01eb6612d 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -22,6 +22,7 @@ cgp-error-eyre = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-any-counterparty = { workspace = true } hermes-cli-components = { workspace = true } hermes-cli = { workspace = true } diff --git a/relayer/crates/starknet-cli/bin/hermes_starknet.rs b/relayer/crates/starknet-cli/bin/hermes_starknet.rs index b6906c5c0..43f3deeda 100644 --- a/relayer/crates/starknet-cli/bin/hermes_starknet.rs +++ b/relayer/crates/starknet-cli/bin/hermes_starknet.rs @@ -6,10 +6,10 @@ use std::sync::Arc; use clap::Parser; use eyre::{eyre, Error}; use hermes_cli_components::traits::CanRunCommand; +use hermes_cosmos::tracing_logging_components::subscriber::init_tracing_subscriber; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_cli::commands::all::AllSubCommands; use hermes_starknet_cli::contexts::app::StarknetApp; -use hermes_tracing_logging_components::subscriber::init_tracing_subscriber; use tokio::runtime::Builder; fn main() { diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index a27b3eda9..e77380424 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -30,6 +30,7 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_error::types::HermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; @@ -42,7 +43,6 @@ use hermes_starknet_integration_tests::contexts::chain_driver::StarknetChainDriv use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::StarknetBootstrap; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId, PortId}; use toml::to_string_pretty; diff --git a/relayer/crates/starknet-integration-tests/Cargo.toml b/relayer/crates/starknet-integration-tests/Cargo.toml index c2870e19b..6d06e4336 100644 --- a/relayer/crates/starknet-integration-tests/Cargo.toml +++ b/relayer/crates/starknet-integration-tests/Cargo.toml @@ -17,6 +17,7 @@ cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-error = { workspace = true } hermes-runtime = { workspace = true } hermes-relayer-components = { workspace = true } 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 1c4ceece8..ab16b417a 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -31,10 +31,10 @@ use hermes_cosmos::test_components::bootstrap::traits::{ DenomForTransfer, DenomPrefixGetterComponent, DynamicGasGetterComponent, RandomIdFlagGetterComponent, WalletConfigGeneratorComponent, }; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_tracing_logging_components::contexts::TracingLogger; use hermes_wasm_test_components::impls::bootstrap::{ BuildChainDriverAndInitWasmClient, ModifyWasmGenesisConfig, ModifyWasmNodeConfig, }; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index 4bbc9e277..4ac1d3098 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -17,6 +17,7 @@ use hermes_cosmos::test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_context::contexts::chain::StarknetChain; @@ -29,7 +30,6 @@ use hermes_starknet_test_components::impls::bootstrap::start_chain::StartStarkne use hermes_starknet_test_components::impls::types::genesis_config::ProvideStarknetGenesisConfigType; use hermes_starknet_test_components::impls::types::node_config::ProvideStarknetNodeConfigType; use hermes_starknet_test_components::traits::IbcContractsDeployerComponent; -use hermes_tracing_logging_components::contexts::TracingLogger; use starknet::core::types::contract::SierraClass; use crate::contexts::chain_driver::StarknetChainDriver; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index 0bd558182..0ee080c17 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -21,6 +21,7 @@ use hermes_core::test_components::setup::traits::{ }; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; use hermes_error::handlers::DebugError; use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::channel_id::ChannelId; @@ -30,7 +31,6 @@ use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBi use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; -use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::PortId; use crate::contexts::chain_driver::StarknetChainDriver; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs index b7eef36bd..abe4f0f75 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs @@ -12,11 +12,12 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; -use hermes_cosmos_test_components::bootstrap::impls::BuildAndWaitChainDriver; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::impls::BuildAndWaitChainDriver; +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; +use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_test_components::impls::bootstrap_madara::{ @@ -24,7 +25,6 @@ use hermes_starknet_test_components::impls::bootstrap_madara::{ }; use hermes_starknet_test_components::impls::types::genesis_config::ProvideStarknetGenesisConfigType; use hermes_starknet_test_components::impls::types::node_config::ProvideStarknetNodeConfigType; -use hermes_tracing_logging_components::contexts::TracingLogger; use crate::contexts::{MadaraChain, MadaraChainDriver}; use crate::impls::{BuildMadaraChainDriver, HandleMadaraChainError}; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index 742717ccc..bba16f00a 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -28,6 +28,7 @@ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; use hermes_error::impls::UseHermesError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::commitment_proof::{ @@ -66,7 +67,6 @@ use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::encoding::cairo::UseStarknetCairoEncoding; use hermes_starknet_chain_context::contexts::encoding::event::StarknetEventEncoding; use hermes_starknet_chain_context::contexts::encoding::protobuf::StarknetProtobufEncoding; -use hermes_tracing_logging_components::contexts::TracingLogger; use ibc::core::host::types::identifiers::ChainId; use indexmap::IndexMap; use reqwest::Client; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index 5651997d9..f7602a726 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -10,7 +10,7 @@ use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs index c130249c6..e9919579c 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs @@ -22,13 +22,13 @@ use hermes_core::relayer_components::transaction::traits::HasTxHashType; use hermes_core::test_components::chain::impls::{ EventualAmountTimeoutError, MissingSendPacketEventError, }; +use hermes_cosmos_core::protobuf_encoding_components::impls::{ + InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, +}; use hermes_error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; use hermes_error::types::Error; -use hermes_protobuf_encoding_components::impls::{ - InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, -}; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::queries::consensus_state::ConsensusStateNotFound; use hermes_starknet_chain_components::impls::queries::contract_address::ContractAddressNotFound; diff --git a/relayer/crates/starknet-madara-tests/src/impls/init.rs b/relayer/crates/starknet-madara-tests/src/impls/init.rs index fb26f11ed..2d984ef74 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/init.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/init.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use hermes_cosmos_core::tracing_logging_components::subscriber::init_tracing_subscriber; use hermes_runtime::types::runtime::HermesRuntime; -use hermes_tracing_logging_components::subscriber::init_tracing_subscriber; use tokio::runtime::Builder; use tracing::info; diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index 865247565..cf89c3969 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -6,7 +6,7 @@ use hermes_core::chain_components::traits::{ use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; -use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf; +use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaProtobuf; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; use hermes_starknet_chain_components::types::consensus_state::StarknetConsensusState; 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 b8c1bd4dc..2b0b7ec90 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 @@ -12,7 +12,7 @@ use hermes_core::test_components::bootstrap::traits::{ }; use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs index 9910e5f9c..e282daf67 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs @@ -17,7 +17,7 @@ use hermes_core::runtime_components::traits::{ChildProcessOf, HasChildProcessTyp use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::{HasChain, HasChainType}; use hermes_core::test_components::driver::traits::HasChainDriverType; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; 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 f49cb9532..3ad4a8f87 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,6 +1,6 @@ use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanStartChildProcess, HasFilePathType, HasRuntime}; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, HasChainGenesisConfigType, HasChainNodeConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs index d233f4e6f..16954d0b6 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs @@ -12,7 +12,7 @@ use hermes_core::test_components::bootstrap::traits::{ }; use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs index 4b2e401a4..0c5e80ad7 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_core::runtime_components::traits::{HasChildProcessType, HasFilePathType, HasRuntime}; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs index 29c572fba..d399923c7 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs index c283bf75d..bea193630 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, HasChainGenesisConfigType, HasChainNodeConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs index 7705a2ab0..feaafd566 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs b/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs index caac55f3c..70e95872e 100644 --- a/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs +++ b/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainGenesisConfigTypeComponent, ProvideChainGenesisConfigType, }; diff --git a/relayer/crates/starknet-test-components/src/impls/types/node_config.rs b/relayer/crates/starknet-test-components/src/impls/types/node_config.rs index 26601ffca..c266892f9 100644 --- a/relayer/crates/starknet-test-components/src/impls/types/node_config.rs +++ b/relayer/crates/starknet-test-components/src/impls/types/node_config.rs @@ -1,5 +1,5 @@ use cgp::prelude::*; -use hermes_cosmos_test_components::bootstrap::traits::{ +use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainNodeConfigTypeComponent, ProvideChainNodeConfigType, }; diff --git a/relayer/crates/tools/Cargo.toml b/relayer/crates/tools/Cargo.toml index f85dedd32..a7337ac8f 100644 --- a/relayer/crates/tools/Cargo.toml +++ b/relayer/crates/tools/Cargo.toml @@ -34,6 +34,7 @@ ibc = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } hermes-cli = { workspace = true } hermes-cli-components = { workspace = true } hermes-encoding-components = { workspace = true } diff --git a/relayer/crates/tools/src/contexts/app.rs b/relayer/crates/tools/src/contexts/app.rs index cac81a551..c1716cca1 100644 --- a/relayer/crates/tools/src/contexts/app.rs +++ b/relayer/crates/tools/src/contexts/app.rs @@ -17,6 +17,7 @@ use hermes_core::relayer_components::error::traits::RetryableErrorComponent; use hermes_core::runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; +use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_cli::impls::bootstrap::starknet_chain::{ @@ -26,7 +27,6 @@ use hermes_starknet_cli::impls::build::LoadStarknetBuilder; use hermes_starknet_cli::impls::error::ProvideCliError; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::StarknetBootstrap; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; -use hermes_tracing_logging_components::contexts::TracingLogger; use crate::commands::starknet::subcommand::{RunStarknetSubCommand, StarknetSubCommand}; use crate::commands::starknet::transfer_args::{RunTransferArgs, TransferArgs}; From 090b04e2b4575233f54a449c94de2a05ab62e2f3 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Mon, 28 Apr 2025 21:25:00 +0000 Subject: [PATCH 08/13] More refactoring --- nix/ibc-starknet-cw.nix | 2 +- relayer/Cargo.lock | 48 ------------------- .../starknet-chain-components/Cargo.toml | 15 ------ .../src/components/encoding/protobuf.rs | 8 ++-- .../src/components/starknet_to_cosmos.rs | 2 +- .../src/types/client_state.rs | 2 +- .../src/types/consensus_state.rs | 2 +- .../crates/starknet-chain-context/Cargo.toml | 17 ------- .../src/contexts/chain.rs | 4 +- .../src/contexts/encoding/cairo.rs | 4 +- .../src/contexts/encoding/event.rs | 2 +- .../src/contexts/encoding/protobuf.rs | 2 +- .../starknet-chain-context/src/impls/error.rs | 10 ++-- relayer/crates/starknet-cli/Cargo.toml | 1 - .../starknet-cli/bin/hermes_starknet.rs | 2 +- .../starknet-cli/examples/bootstrap_ibc.rs | 4 +- .../crates/starknet-cli/src/contexts/app.rs | 4 +- .../src/impls/bootstrap/osmosis_chain.rs | 4 +- .../src/impls/bootstrap/starknet_chain.rs | 4 +- .../crates/starknet-cli/src/impls/build.rs | 2 +- .../starknet-cli/src/impls/create_client.rs | 2 +- .../crates/starknet-cli/src/impls/error.rs | 8 ++-- .../starknet-integration-tests/Cargo.toml | 15 ------ .../src/contexts/chain_driver.rs | 4 +- .../contexts/cosmos_starknet_relay_driver.rs | 6 +-- .../src/contexts/osmosis_bootstrap.rs | 10 ++-- .../src/contexts/setup.rs | 4 +- .../src/contexts/starknet_bootstrap.rs | 4 +- .../contexts/starknet_cosmos_relay_driver.rs | 6 +-- .../src/contexts/test_driver.rs | 4 +- .../src/impls/build_bootstrap.rs | 4 +- .../src/tests/erc20.rs | 2 +- .../src/tests/test_suite.rs | 2 +- .../src/tests/timeout_packet.rs | 2 +- .../src/tests/update_client.rs | 2 +- .../src/utils/init_bootstrap.rs | 4 +- .../src/utils/init_setup.rs | 4 +- .../src/utils/wasm_client.rs | 2 +- 38 files changed, 65 insertions(+), 159 deletions(-) diff --git a/nix/ibc-starknet-cw.nix b/nix/ibc-starknet-cw.nix index 950d2cb1f..c74364ac1 100644 --- a/nix/ibc-starknet-cw.nix +++ b/nix/ibc-starknet-cw.nix @@ -11,7 +11,7 @@ let lockFile = ./../light-client/Cargo.lock; outputHashes = { "cgp-0.4.0" = "sha256-aKSLWdiYRbRen9yj5K/xqsSsNp5YYee1fFPBfOYEdP8="; - "hermes-cosmos-encoding-components-0.1.0" = "sha256-KwCzSVS9J7Qe/M3bs0JqKej3HDSAhNPC2lBrzTw7gTU="; + "hermes-cosmos-encoding-components-0.1.0" = "sha256-Ml5/xXr9MivxNfbTDi2+2IEdszsVtkmew4RNk2upSi0="; "ibc-client-cw-0.56.0" = "sha256-DA3AB8ejUrx4ksBtN/vaOznjpKE0+0F6vGA7JmWyHWA="; "ibc-0.56.0" = "sha256-7DPIqu/zs0szjmtJTfXI2eQ0HEkRyvGjArcMZsFWMT4="; }; diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 585219b9e..5b3a849c8 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2353,25 +2353,10 @@ dependencies = [ "crypto-bigint", "derive_more 2.0.1", "futures", - "hermes-async-runtime-components", "hermes-cairo-encoding-components", - "hermes-chain-components", - "hermes-chain-type-components", "hermes-core", - "hermes-cosmos-chain-components", - "hermes-cosmos-chain-preset", "hermes-cosmos-core", - "hermes-cosmos-encoding-components", - "hermes-cosmos-test-components", - "hermes-encoding-components", - "hermes-logging-components", "hermes-prelude", - "hermes-protobuf-encoding-components", - "hermes-relayer-components", - "hermes-runtime-components", - "hermes-test-components", - "hermes-wasm-client-components", - "hermes-wasm-encoding-components", "hex", "http 1.3.1", "humantime-serde", @@ -2402,29 +2387,12 @@ dependencies = [ "cgp", "eyre", "futures", - "hermes-async-runtime-components", "hermes-cairo-encoding-components", - "hermes-chain-components", - "hermes-chain-type-components", "hermes-core", "hermes-cosmos", - "hermes-cosmos-chain-components", - "hermes-cosmos-chain-preset", - "hermes-cosmos-relayer", - "hermes-encoding-components", - "hermes-error", - "hermes-logging-components", "hermes-prelude", - "hermes-protobuf-encoding-components", - "hermes-relayer-components", - "hermes-runtime", - "hermes-runtime-components", "hermes-starknet-chain-components", "hermes-starknet-test-components", - "hermes-test-components", - "hermes-tracing-logging-components", - "hermes-wasm-client-components", - "hermes-wasm-encoding-components", "ibc", "ibc-client-starknet-types", "prost", @@ -2442,7 +2410,6 @@ dependencies = [ "cgp-error-eyre", "clap", "eyre", - "hermes-any-counterparty", "hermes-chain-components", "hermes-cli", "hermes-cli-components", @@ -2486,30 +2453,15 @@ dependencies = [ "eyre", "flate2", "futures", - "hermes-chain-components", "hermes-core", "hermes-cosmos", - "hermes-cosmos-chain-components", "hermes-cosmos-core", - "hermes-cosmos-integration-tests", - "hermes-cosmos-relayer", - "hermes-cosmos-test-components", - "hermes-cosmos-wasm-relayer", - "hermes-encoding-components", - "hermes-error", "hermes-ibc-test-suite", - "hermes-logging-components", "hermes-prelude", - "hermes-relayer-components", - "hermes-runtime", - "hermes-runtime-components", "hermes-starknet-chain-components", "hermes-starknet-chain-context", "hermes-starknet-relayer", "hermes-starknet-test-components", - "hermes-test-components", - "hermes-tracing-logging-components", - "hermes-wasm-test-components", "ibc", "ibc-proto", "poseidon", diff --git a/relayer/crates/starknet-chain-components/Cargo.toml b/relayer/crates/starknet-chain-components/Cargo.toml index dacb701c3..f0b29d0eb 100644 --- a/relayer/crates/starknet-chain-components/Cargo.toml +++ b/relayer/crates/starknet-chain-components/Cargo.toml @@ -17,22 +17,7 @@ cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos-core = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-async-runtime-components = { workspace = true } -hermes-chain-components = { workspace = true } -hermes-chain-type-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-cosmos-chain-preset = { workspace = true } -hermes-cosmos-test-components = { workspace = true } -hermes-wasm-client-components = { workspace = true } hermes-cairo-encoding-components = { workspace = true } -hermes-protobuf-encoding-components = { workspace = true } -hermes-cosmos-encoding-components = { workspace = true } -hermes-wasm-encoding-components = { workspace = true } -hermes-logging-components = { workspace = true } poseidon = { workspace = true } ibc = { workspace = true } diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs index 393c6f645..c48b4b577 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs @@ -15,9 +15,11 @@ mod preset { }; use hermes_cosmos_core::protobuf_encoding_components::traits::EncodedLengthGetterComponent; use hermes_cosmos_core::protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; - use hermes_wasm_encoding_components::components::WasmEncodingComponents; - use hermes_wasm_encoding_components::impls::{DecodeViaClientMessage, EncodeViaClientMessage}; - use hermes_wasm_encoding_components::types::{ + use hermes_cosmos_core::wasm_encoding_components::components::WasmEncodingComponents; + use hermes_cosmos_core::wasm_encoding_components::impls::{ + DecodeViaClientMessage, EncodeViaClientMessage, + }; + use hermes_cosmos_core::wasm_encoding_components::types::{ WasmClientMessage, WasmClientState, WasmConsensusState, }; use ibc::clients::wasm_types::client_message::ClientMessage; 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 654fcc99c..3ebfd619c 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 @@ -23,10 +23,10 @@ mod preset { UpdateClientPayloadTypeComponent, }; use hermes_core::test_components::chain::traits::IbcTransferredAmountConverterComponent; - use hermes_cosmos_chain_preset::presets::CosmosToCosmosComponents; use hermes_cosmos_core::chain_components::impls::{ BuildCosmosPacketMessages, CosmosPacketFieldReader, }; + use hermes_cosmos_core::chain_preset::presets::CosmosToCosmosComponents; use crate::impls::starknet_to_cosmos::connection_message::BuildStarknetToCosmosConnectionHandshake; use crate::impls::starknet_to_cosmos::counterparty_message_height::GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/types/client_state.rs b/relayer/crates/starknet-chain-components/src/types/client_state.rs index 0c95a5f9d..c5caef63e 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_state.rs @@ -3,7 +3,7 @@ use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, }; use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaAny; -use hermes_wasm_encoding_components::types::WasmClientState; +use hermes_cosmos_core::wasm_encoding_components::types::WasmClientState; pub use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; 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 3eff4cd9a..b259a338d 100644 --- a/relayer/crates/starknet-chain-components/src/types/consensus_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/consensus_state.rs @@ -1,6 +1,6 @@ use cgp::prelude::*; use hermes_core::encoding_components::traits::{Converter, ConverterComponent}; -use hermes_wasm_encoding_components::impls::{ +use hermes_cosmos_core::wasm_encoding_components::impls::{ DecodeViaWasmConsensusState, EncodeViaWasmConsensusState, }; pub use ibc_client_starknet_types::StarknetConsensusState; diff --git a/relayer/crates/starknet-chain-context/Cargo.toml b/relayer/crates/starknet-chain-context/Cargo.toml index 2953511cf..26373f0c3 100644 --- a/relayer/crates/starknet-chain-context/Cargo.toml +++ b/relayer/crates/starknet-chain-context/Cargo.toml @@ -18,26 +18,9 @@ hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos = { workspace = true } ibc = { workspace = true } -hermes-error = { workspace = true } -hermes-runtime = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-async-runtime-components = { workspace = true } -hermes-logging-components = { workspace = true } -hermes-tracing-logging-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-cosmos-chain-preset = { workspace = true } -hermes-wasm-client-components = { workspace = true } -hermes-wasm-encoding-components = { workspace = true } hermes-starknet-chain-components = { workspace = true } -hermes-chain-components = { workspace = true } -hermes-chain-type-components = { workspace = true } hermes-cairo-encoding-components = { workspace = true } -hermes-protobuf-encoding-components = { workspace = true } hermes-starknet-test-components = { workspace = true } -hermes-cosmos-relayer = { workspace = true } starknet = { workspace = true } futures = { workspace = true } diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index c228c8b7c..90fa35b86 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -74,10 +74,10 @@ use hermes_cosmos::chain_components::types::{ Secp256k1KeyPair, Time, }; use hermes_cosmos::chain_preset::delegate::DelegateCosmosChainComponents; +use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; -use hermes_error::impls::UseHermesError; -use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; use hermes_starknet_chain_components::components::starknet_to_cosmos::StarknetToCosmosComponents; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; 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 b09e4adfa..edd311bc4 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs @@ -13,8 +13,8 @@ use hermes_core::encoding_components::traits::{ DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, HasDecodeBufferType, HasEncodeBufferType, HasEncodedType, HasEncodingType, }; -use hermes_error::impls::UseHermesError; -use hermes_error::types::HermesError; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::error::types::HermesError; use hermes_starknet_chain_components::components::encoding::cairo::*; use hermes_starknet_chain_components::types::channel_id::{ChannelEnd, ChannelId}; use hermes_starknet_chain_components::types::client_id::ClientId; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs index 5b97d11ab..2620db728 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs @@ -10,7 +10,7 @@ use hermes_core::encoding_components::traits::{ CanDecode, DefaultEncodingGetterComponent, EncodingGetterComponent, EncodingTypeProviderComponent, HasEncodedType, HasEncoding, }; -use hermes_error::impls::UseHermesError; +use hermes_cosmos::error::impls::UseHermesError; use hermes_starknet_chain_components::components::encoding::event::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::types::event::StarknetEvent; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index 7f76dee09..9410dbb93 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -4,10 +4,10 @@ use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; +use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::protobuf_encoding_components::types::any::Any; use hermes_cosmos::protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_cosmos::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; -use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::components::encoding::protobuf::*; use hermes_starknet_chain_components::types::client_state::{ StarknetClientState, WasmStarknetClientState, diff --git a/relayer/crates/starknet-chain-context/src/impls/error.rs b/relayer/crates/starknet-chain-context/src/impls/error.rs index 105250d50..1ba600040 100644 --- a/relayer/crates/starknet-chain-context/src/impls/error.rs +++ b/relayer/crates/starknet-chain-context/src/impls/error.rs @@ -22,14 +22,14 @@ use hermes_core::relayer_components::transaction::traits::HasTxHashType; use hermes_core::test_components::chain::impls::{ EventualAmountTimeoutError, MissingSendPacketEventError, }; +use hermes_cosmos::error::handlers::{ + DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, +}; +use hermes_cosmos::error::types::Error; use hermes_cosmos::protobuf_encoding_components::impls::{ InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; -use hermes_error::handlers::{ - DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, -}; -use hermes_error::types::Error; -use hermes_runtime::types::error::TokioRuntimeError; +use hermes_cosmos::runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::error::account::RaiseAccountError; use hermes_starknet_chain_components::impls::error::provider::RaiseProviderError; use hermes_starknet_chain_components::impls::error::starknet::RaiseStarknetError; diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index 01eb6612d..805cc3554 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -23,7 +23,6 @@ hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos = { workspace = true } hermes-cosmos-core = { workspace = true } -hermes-any-counterparty = { workspace = true } hermes-cli-components = { workspace = true } hermes-cli = { workspace = true } hermes-error = { workspace = true } diff --git a/relayer/crates/starknet-cli/bin/hermes_starknet.rs b/relayer/crates/starknet-cli/bin/hermes_starknet.rs index 43f3deeda..4420229f5 100644 --- a/relayer/crates/starknet-cli/bin/hermes_starknet.rs +++ b/relayer/crates/starknet-cli/bin/hermes_starknet.rs @@ -6,8 +6,8 @@ use std::sync::Arc; use clap::Parser; use eyre::{eyre, Error}; use hermes_cli_components::traits::CanRunCommand; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::subscriber::init_tracing_subscriber; -use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_cli::commands::all::AllSubCommands; use hermes_starknet_cli::contexts::app::StarknetApp; use tokio::runtime::Builder; diff --git a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs index aee1c92be..556010348 100644 --- a/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs +++ b/relayer/crates/starknet-cli/examples/bootstrap_ibc.rs @@ -17,9 +17,9 @@ use hermes_core::relayer_components::relay::traits::{ use hermes_cosmos::chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; +use hermes_cosmos::error::Error; use hermes_cosmos::relayer::contexts::CosmosChain; -use hermes_error::Error; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_cli::contexts::app::StarknetApp; diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index e77380424..3ab88fdee 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -28,11 +28,11 @@ use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_core::test_components::chain_driver::traits::{ConfigUpdater, ConfigUpdaterComponent}; +use hermes_cosmos::error::types::HermesError; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; -use hermes_error::types::HermesError; -use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::config::{ StarknetChainConfig, StarknetContractAddresses, StarknetContractClasses, StarknetRelayerConfig, diff --git a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs index d4a801ac9..d622fe207 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs @@ -2,9 +2,9 @@ use cgp::extra::runtime::HasRuntime; use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; use hermes_cosmos::chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos::error::HermesError; use hermes_cosmos::relayer::contexts::CosmosBuilder; -use hermes_error::HermesError; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; use hermes_starknet_integration_tests::utils::load_wasm_client; use tracing::info; 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 4662fce2d..bf41ff6ea 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs @@ -3,8 +3,8 @@ use std::sync::Arc; use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; use hermes_core::runtime_components::traits::{CanReadFileAsString, HasRuntime}; -use hermes_runtime::types::error::TokioRuntimeError; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::runtime::types::error::TokioRuntimeError; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::{ StarknetBootstrap, StarknetBootstrapFields, }; diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs index f0daed410..9e6a5a327 100644 --- a/relayer/crates/starknet-cli/src/impls/build.rs +++ b/relayer/crates/starknet-cli/src/impls/build.rs @@ -4,7 +4,7 @@ use hermes_cli_components::traits::{ }; use hermes_core::runtime_components::traits::HasRuntime; use hermes_cosmos::relayer::contexts::CosmosBuilder; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-cli/src/impls/create_client.rs b/relayer/crates/starknet-cli/src/impls/create_client.rs index fad546ce3..57ddbceaa 100644 --- a/relayer/crates/starknet-cli/src/impls/create_client.rs +++ b/relayer/crates/starknet-cli/src/impls/create_client.rs @@ -5,8 +5,8 @@ use cgp::prelude::*; use hermes_cli::commands::CreateCosmosClientArgs; use hermes_cli_components::impls::{CreateClientOptionsParser, CreateClientOptionsParserComponent}; use hermes_cosmos::chain_components::types::CosmosCreateClientOptions; +use hermes_cosmos::error::HermesError; use hermes_cosmos::relayer::contexts::CosmosChain; -use hermes_error::HermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hex::FromHex; diff --git a/relayer/crates/starknet-cli/src/impls/error.rs b/relayer/crates/starknet-cli/src/impls/error.rs index 93ffd481d..a829bc5fb 100644 --- a/relayer/crates/starknet-cli/src/impls/error.rs +++ b/relayer/crates/starknet-cli/src/impls/error.rs @@ -8,10 +8,10 @@ use cgp::core::error::{ use cgp::prelude::*; use eyre::Report; use hermes_core::relayer_components::error::traits::RetryableErrorComponent; -use hermes_error::handlers::{DisplayError, HandleInfallible, ReportError, ReturnError}; -use hermes_error::impls::UseHermesError; -use hermes_error::types::Error; -use hermes_runtime::types::error::TokioRuntimeError; +use hermes_cosmos::error::handlers::{DisplayError, HandleInfallible, ReportError, ReturnError}; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::error::types::Error; +use hermes_cosmos::runtime::types::error::TokioRuntimeError; use ibc::core::channel::types::error::ChannelError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; use starknet_types_core::felt::FromStrError; diff --git a/relayer/crates/starknet-integration-tests/Cargo.toml b/relayer/crates/starknet-integration-tests/Cargo.toml index 6d06e4336..b5377bb3a 100644 --- a/relayer/crates/starknet-integration-tests/Cargo.toml +++ b/relayer/crates/starknet-integration-tests/Cargo.toml @@ -18,27 +18,12 @@ hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos = { workspace = true } hermes-cosmos-core = { workspace = true } -hermes-error = { workspace = true } -hermes-runtime = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } hermes-ibc-test-suite = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-encoding-components = { workspace = true } hermes-starknet-chain-components = { workspace = true } hermes-starknet-test-components = { workspace = true } hermes-starknet-chain-context = { workspace = true } hermes-starknet-relayer = { workspace = true } -hermes-cosmos-test-components = { workspace = true } -hermes-wasm-test-components = { workspace = true } -hermes-chain-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-cosmos-integration-tests = { workspace = true } -hermes-cosmos-relayer = { workspace = true } -hermes-cosmos-wasm-relayer = { workspace = true } -hermes-logging-components = { workspace = true } poseidon = { workspace = true } -hermes-tracing-logging-components = { workspace = true } ibc = { workspace = true } ibc-proto = { workspace = true } 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 e87ff7ee4..5328f7652 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs @@ -15,8 +15,8 @@ use hermes_core::test_components::chain_driver::traits::{ HasChain, RandomAmountGeneratorComponent, RelayerWallet, StakingDenom, TransferDenom, UserWallet, WalletGetterComponent, }; -use hermes_error::impls::UseHermesError; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; use hermes_starknet_chain_components::types::wallet::StarknetWallet; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs index 00517fccd..0464c1d8c 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs @@ -10,11 +10,11 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::test_components::relay_driver::run::{ RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, }; +use hermes_cosmos::error::handlers::DebugError; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::error::Error; use hermes_cosmos::integration_tests::contexts::AbortOnDrop; use hermes_cosmos::relayer::contexts::CosmosChain; -use hermes_error::handlers::DebugError; -use hermes_error::impls::UseHermesError; -use hermes_error::Error; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBiRelay; use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; 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 ab16b417a..14545150e 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -10,6 +10,8 @@ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; use hermes_cosmos::chain_components::types::DynamicGasConfig; +use hermes_cosmos::error::handlers::DebugError; +use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::integration_tests::impls::{ BuildCosmosChainDriver, BuildCosmosChainWithNodeConfig, BuildRelayerChainConfig, @@ -19,6 +21,7 @@ use hermes_cosmos::integration_tests::traits::{ RelayerChainConfigBuilderComponent, UseCompatMode37, }; use hermes_cosmos::relayer::contexts::{CosmosBuilder, CosmosChain}; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::test_components::bootstrap::components::LegacyCosmosSdkBootstrapComponents; use hermes_cosmos::test_components::bootstrap::impls::{ BuildAndWaitChainDriver, GenerateStandardWalletConfig, NoModifyCometConfig, @@ -32,13 +35,10 @@ use hermes_cosmos::test_components::bootstrap::traits::{ RandomIdFlagGetterComponent, WalletConfigGeneratorComponent, }; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; -use hermes_error::handlers::DebugError; -use hermes_error::impls::UseHermesError; -use hermes_runtime::types::runtime::HermesRuntime; -use hermes_wasm_test_components::impls::bootstrap::{ +use hermes_cosmos_core::wasm_test_components::impls::bootstrap::{ BuildChainDriverAndInitWasmClient, ModifyWasmGenesisConfig, ModifyWasmNodeConfig, }; -use hermes_wasm_test_components::traits::bootstrap::{ +use hermes_cosmos_core::wasm_test_components::traits::bootstrap::{ GovernanceProposalAuthorityGetterComponent, WasmClientByteCodeGetterComponent, }; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs index 064deec91..45f428e3b 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs @@ -20,11 +20,11 @@ use hermes_core::test_components::setup::traits::{ use hermes_cosmos::chain_components::types::{ CosmosCreateClientOptions, CosmosInitChannelOptions, CosmosInitConnectionOptions, }; +use hermes_cosmos::error::handlers::DebugError; +use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::integration_tests::impls::UseCosmosInitChannelOptions; use hermes_cosmos::relayer::contexts::CosmosChain; -use hermes_error::handlers::DebugError; -use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index 4ac1d3098..c0d9ccd27 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -12,14 +12,14 @@ use hermes_core::runtime_components::traits::{ use hermes_core::test_components::bootstrap::traits::ChainBootstrapperComponent; use hermes_core::test_components::chain_driver::traits::ChainTypeProviderComponent; use hermes_core::test_components::driver::traits::ChainDriverTypeProviderComponent; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::test_components::bootstrap::impls::BuildAndWaitChainDriver; use hermes_cosmos::test_components::bootstrap::traits::{ ChainCommandPathGetterComponent, ChainDriverBuilderComponent, ChainFullNodeStarterComponent, ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; -use hermes_error::impls::UseHermesError; -use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_starknet_test_components::impls::bootstrap::bootstrap_chain::BootstrapStarknetDevnet; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs index 43c8fd83f..a01f92f71 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs @@ -10,11 +10,11 @@ use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderA use hermes_core::test_components::relay_driver::run::{ RelayerBackgroundRunner, RelayerBackgroundRunnerComponent, }; +use hermes_cosmos::error::handlers::DebugError; +use hermes_cosmos::error::impls::UseHermesError; +use hermes_cosmos::error::Error; use hermes_cosmos::integration_tests::contexts::AbortOnDrop; use hermes_cosmos::relayer::contexts::CosmosChain; -use hermes_error::handlers::DebugError; -use hermes_error::impls::UseHermesError; -use hermes_error::Error; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index 0ee080c17..c02dd128b 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -19,11 +19,11 @@ use hermes_core::test_components::setup::traits::{ BinaryChannelDriverBuilder, BinaryChannelDriverBuilderComponent, HasTestDriverType, PortIdGetterAtComponent, }; +use hermes_cosmos::error::handlers::DebugError; +use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; -use hermes_error::handlers::DebugError; -use hermes_error::impls::UseHermesError; use hermes_starknet_chain_components::types::channel_id::ChannelId; use hermes_starknet_chain_components::types::connection_id::ConnectionId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs index ca3613e7e..5ba84d957 100644 --- a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs @@ -10,12 +10,12 @@ use hermes_core::test_components::chain::traits::HasWalletType; use hermes_core::test_components::chain_driver::traits::HasChainType; use hermes_core::test_components::driver::traits::HasChainDriverType; use hermes_cosmos::chain_components::types::Secp256k1KeyPair; +use hermes_cosmos::runtime::types::error::TokioRuntimeError; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; -use hermes_runtime::types::error::TokioRuntimeError; -use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs index 3c21fd735..e6805c841 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/erc20.rs @@ -4,8 +4,8 @@ use hermes_core::chain_components::traits::CanSendSingleMessage; use hermes_core::encoding_components::traits::CanEncode; use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; +use hermes_cosmos::error::types::Error; use hermes_cosmos::integration_tests::init::init_test_runtime; -use hermes_error::types::Error; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; diff --git a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs index 631567552..f5207787b 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/test_suite.rs @@ -1,7 +1,7 @@ use cgp::core::field::Index; use hermes_core::test_components::test_case::traits::test_case::TestCase; +use hermes_cosmos::error::types::Error; use hermes_cosmos::integration_tests::init::init_test_runtime; -use hermes_error::types::Error; use hermes_ibc_test_suite::tests::clearing::TestPacketClearing; use hermes_ibc_test_suite::tests::transfer::TestIbcTransfer; diff --git a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs index cca8d4345..3ff4eb713 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/timeout_packet.rs @@ -16,10 +16,10 @@ use hermes_core::runtime_components::traits::CanSleep; use hermes_core::test_components::chain::traits::{ CanAssertEventualAmount, CanBuildIbcTokenTransferMessages, CanIbcTransferToken, CanQueryBalance, }; +use hermes_cosmos::error::types::Error; use hermes_cosmos::integration_tests::init::init_test_runtime; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::test_components::chain::types::Amount; -use hermes_error::types::Error; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::queries::token_address::CanQueryCosmosTokenAddressOnStarknet; use hermes_starknet_chain_components::traits::queries::token_balance::CanQueryTokenBalance; diff --git a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs index 541bc68d2..3e3d44cb1 100644 --- a/relayer/crates/starknet-integration-tests/src/tests/update_client.rs +++ b/relayer/crates/starknet-integration-tests/src/tests/update_client.rs @@ -11,9 +11,9 @@ use hermes_core::relayer_components::relay::traits::{ }; use hermes_core::runtime_components::traits::CanSleep; use hermes_core::test_components::setup::traits::{CanSetupChain, CanSetupClients}; +use hermes_cosmos::error::types::Error; use hermes_cosmos::integration_tests::init::init_test_runtime; use hermes_cosmos::relayer::contexts::CosmosChain; -use hermes_error::types::Error; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::contexts::encoding::cairo::StarknetCairoEncoding; use hermes_starknet_relayer::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs index 988273633..58cdec6c0 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_bootstrap.rs @@ -3,9 +3,9 @@ use std::time::SystemTime; use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_cosmos::chain_components::types::{DynamicGasConfig, EipQueryType}; +use hermes_cosmos::error::Error; use hermes_cosmos::relayer::contexts::CosmosBuilder; -use hermes_error::Error; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use starknet::core::types::contract::SierraClass; use crate::contexts::osmosis_bootstrap::OsmosisBootstrap; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs index e73884125..3cb56235e 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs @@ -1,7 +1,7 @@ use cgp::prelude::CanRaiseError; use hermes_core::test_components::setup::traits::CanBuildTestDriver; -use hermes_error::Error; -use hermes_runtime::types::runtime::HermesRuntime; +use hermes_cosmos::error::Error; +use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; use crate::contexts::setup::StarknetTestSetup; diff --git a/relayer/crates/starknet-integration-tests/src/utils/wasm_client.rs b/relayer/crates/starknet-integration-tests/src/utils/wasm_client.rs index d578aab94..cb5a217cd 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/wasm_client.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/wasm_client.rs @@ -2,7 +2,7 @@ use std::io::Write; use flate2::write::GzEncoder; use flate2::Compression; -use hermes_error::Error; +use hermes_cosmos::error::Error; use sha2::{Digest, Sha256}; pub async fn load_wasm_client(wasm_client_code_path: &str) -> Result<([u8; 32], Vec), Error> { From f4cf6c231e57e632bbfe7a914e0a044919e7ca00 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Tue, 29 Apr 2025 07:15:41 +0000 Subject: [PATCH 09/13] Simplify Cargo dependencies --- relayer/Cargo.lock | 33 ----------------- .../starknet-chain-components/Cargo.toml | 12 +++---- .../crates/starknet-chain-context/Cargo.toml | 16 ++++----- relayer/crates/starknet-cli/Cargo.toml | 11 ------ .../starknet-integration-tests/Cargo.toml | 22 ++++++------ .../crates/starknet-madara-tests/Cargo.toml | 36 +++++++------------ relayer/crates/starknet-relayer/Cargo.toml | 14 ++++---- .../starknet-test-components/Cargo.toml | 6 ---- relayer/crates/tools/Cargo.toml | 4 --- 9 files changed, 44 insertions(+), 110 deletions(-) diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 5b3a849c8..31eab83e1 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -2411,27 +2411,16 @@ dependencies = [ "clap", "eyre", "hermes-chain-components", - "hermes-cli", "hermes-cli-components", "hermes-core", "hermes-cosmos", - "hermes-cosmos-chain-components", "hermes-cosmos-core", - "hermes-cosmos-integration-tests", - "hermes-cosmos-relayer", - "hermes-error", - "hermes-logging-components", "hermes-prelude", - "hermes-relayer-components", - "hermes-runtime", - "hermes-runtime-components", "hermes-starknet-chain-components", "hermes-starknet-chain-context", "hermes-starknet-integration-tests", "hermes-starknet-relayer", "hermes-starknet-test-components", - "hermes-test-components", - "hermes-tracing-logging-components", "hex", "ibc", "serde", @@ -2489,27 +2478,15 @@ dependencies = [ "flate2", "futures", "hermes-cairo-encoding-components", - "hermes-chain-components", - "hermes-chain-type-components", "hermes-core", - "hermes-cosmos-chain-components", "hermes-cosmos-core", - "hermes-cosmos-test-components", - "hermes-encoding-components", "hermes-error", "hermes-ibc-test-suite", - "hermes-logging-components", "hermes-prelude", - "hermes-protobuf-encoding-components", - "hermes-relayer-components", "hermes-runtime", - "hermes-runtime-components", "hermes-starknet-chain-components", "hermes-starknet-chain-context", "hermes-starknet-test-components", - "hermes-test-components", - "hermes-tracing-logging-components", - "hermes-wasm-test-components", "ibc", "ibc-client-starknet-types", "ibc-proto", @@ -2562,14 +2539,8 @@ dependencies = [ "hermes-cairo-encoding-components", "hermes-core", "hermes-cosmos-core", - "hermes-cosmos-test-components", - "hermes-encoding-components", - "hermes-logging-components", "hermes-prelude", - "hermes-relayer-components", - "hermes-runtime-components", "hermes-starknet-chain-components", - "hermes-test-components", "serde", "starknet 0.14.0", ] @@ -2588,17 +2559,13 @@ dependencies = [ "hermes-cosmos-core", "hermes-encoding-components", "hermes-error", - "hermes-logging-components", "hermes-prelude", - "hermes-relayer-components", "hermes-runtime", - "hermes-runtime-components", "hermes-starknet-chain-components", "hermes-starknet-chain-context", "hermes-starknet-cli", "hermes-starknet-integration-tests", "hermes-starknet-relayer", - "hermes-tracing-logging-components", "ibc", "stable-eyre", "starknet 0.14.0", diff --git a/relayer/crates/starknet-chain-components/Cargo.toml b/relayer/crates/starknet-chain-components/Cargo.toml index f0b29d0eb..45af0d7f1 100644 --- a/relayer/crates/starknet-chain-components/Cargo.toml +++ b/relayer/crates/starknet-chain-components/Cargo.toml @@ -13,12 +13,12 @@ readme = "README.md" workspace = true [dependencies] -cgp = { workspace = true } -hermes-prelude = { workspace = true } -hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } -hermes-cairo-encoding-components = { workspace = true } -poseidon = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } +hermes-cairo-encoding-components = { workspace = true } +poseidon = { workspace = true } ibc = { workspace = true } ibc-proto = { workspace = true } diff --git a/relayer/crates/starknet-chain-context/Cargo.toml b/relayer/crates/starknet-chain-context/Cargo.toml index 26373f0c3..81cefb6c6 100644 --- a/relayer/crates/starknet-chain-context/Cargo.toml +++ b/relayer/crates/starknet-chain-context/Cargo.toml @@ -13,14 +13,14 @@ readme = "README.md" workspace = true [dependencies] -cgp = { workspace = true } -hermes-prelude = { workspace = true } -hermes-core = { workspace = true } -hermes-cosmos = { workspace = true } -ibc = { workspace = true } -hermes-starknet-chain-components = { workspace = true } -hermes-cairo-encoding-components = { workspace = true } -hermes-starknet-test-components = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos = { workspace = true } +ibc = { workspace = true } +hermes-starknet-chain-components = { workspace = true } +hermes-cairo-encoding-components = { workspace = true } +hermes-starknet-test-components = { workspace = true } starknet = { workspace = true } futures = { workspace = true } diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index 805cc3554..df4ab5cd4 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -24,22 +24,11 @@ hermes-core = { workspace = true } hermes-cosmos = { workspace = true } hermes-cosmos-core = { workspace = true } hermes-cli-components = { workspace = true } -hermes-cli = { workspace = true } -hermes-error = { workspace = true } -hermes-runtime = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-logging-components = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-cosmos-relayer = { workspace = true } -hermes-cosmos-integration-tests = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } hermes-starknet-chain-components = { workspace = true } hermes-starknet-chain-context = { workspace = true } hermes-starknet-relayer = { workspace = true } hermes-starknet-integration-tests = { workspace = true } hermes-starknet-test-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-tracing-logging-components = { workspace = true } ibc = { workspace = true } starknet = { workspace = true } diff --git a/relayer/crates/starknet-integration-tests/Cargo.toml b/relayer/crates/starknet-integration-tests/Cargo.toml index b5377bb3a..410178d7e 100644 --- a/relayer/crates/starknet-integration-tests/Cargo.toml +++ b/relayer/crates/starknet-integration-tests/Cargo.toml @@ -13,17 +13,17 @@ readme = "README.md" workspace = true [dependencies] -cgp = { workspace = true } -hermes-prelude = { workspace = true } -hermes-core = { workspace = true } -hermes-cosmos = { workspace = true } -hermes-cosmos-core = { workspace = true } -hermes-ibc-test-suite = { workspace = true } -hermes-starknet-chain-components = { workspace = true } -hermes-starknet-test-components = { workspace = true } -hermes-starknet-chain-context = { workspace = true } -hermes-starknet-relayer = { workspace = true } -poseidon = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos = { workspace = true } +hermes-cosmos-core = { workspace = true } +hermes-ibc-test-suite = { workspace = true } +hermes-starknet-chain-components = { workspace = true } +hermes-starknet-test-components = { workspace = true } +hermes-starknet-chain-context = { workspace = true } +hermes-starknet-relayer = { workspace = true } +poseidon = { workspace = true } ibc = { workspace = true } ibc-proto = { workspace = true } diff --git a/relayer/crates/starknet-madara-tests/Cargo.toml b/relayer/crates/starknet-madara-tests/Cargo.toml index 036a9ca49..2d612bf69 100644 --- a/relayer/crates/starknet-madara-tests/Cargo.toml +++ b/relayer/crates/starknet-madara-tests/Cargo.toml @@ -12,30 +12,18 @@ rust-version = { workspace = true } workspace = true [dependencies] -cgp = { workspace = true } -hermes-prelude = { workspace = true } -hermes-core = { workspace = true } -hermes-cosmos-core = { workspace = true } -hermes-error = { workspace = true } -hermes-runtime = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-ibc-test-suite = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-cairo-encoding-components = { workspace = true } -hermes-starknet-chain-components = { workspace = true } -hermes-starknet-test-components = { workspace = true } -hermes-starknet-chain-context = { workspace = true } -hermes-cosmos-test-components = { workspace = true } -hermes-wasm-test-components = { workspace = true } -hermes-chain-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-logging-components = { workspace = true } -poseidon = { workspace = true } -hermes-protobuf-encoding-components = { workspace = true } -hermes-chain-type-components = { workspace = true } -hermes-tracing-logging-components = { workspace = true } +cgp = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos-core = { workspace = true } +hermes-error = { workspace = true } +hermes-runtime = { workspace = true } +hermes-ibc-test-suite = { workspace = true } +hermes-cairo-encoding-components = { workspace = true } +hermes-starknet-chain-components = { workspace = true } +hermes-starknet-test-components = { workspace = true } +hermes-starknet-chain-context = { workspace = true } +poseidon = { workspace = true } ibc = { workspace = true } ibc-proto = { workspace = true } diff --git a/relayer/crates/starknet-relayer/Cargo.toml b/relayer/crates/starknet-relayer/Cargo.toml index a0d25adce..23d262ba1 100644 --- a/relayer/crates/starknet-relayer/Cargo.toml +++ b/relayer/crates/starknet-relayer/Cargo.toml @@ -13,13 +13,13 @@ readme = "README.md" workspace = true [dependencies] -cgp = { workspace = true } -ibc = { workspace = true } -hermes-prelude = { workspace = true } -hermes-core = { workspace = true } -hermes-cosmos = { workspace = true } -hermes-starknet-chain-context = { workspace = true } -hermes-starknet-chain-components = { workspace = true } +cgp = { workspace = true } +ibc = { workspace = true } +hermes-prelude = { workspace = true } +hermes-core = { workspace = true } +hermes-cosmos = { workspace = true } +hermes-starknet-chain-context = { workspace = true } +hermes-starknet-chain-components = { workspace = true } starknet = { workspace = true } diff --git a/relayer/crates/starknet-test-components/Cargo.toml b/relayer/crates/starknet-test-components/Cargo.toml index 4a100c500..03db43b13 100644 --- a/relayer/crates/starknet-test-components/Cargo.toml +++ b/relayer/crates/starknet-test-components/Cargo.toml @@ -17,13 +17,7 @@ cgp = { workspace = true } hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos-core = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-encoding-components = { workspace = true } hermes-cairo-encoding-components = { workspace = true } -hermes-logging-components = { workspace = true } -hermes-cosmos-test-components = { workspace = true } hermes-starknet-chain-components = { workspace = true } starknet = { workspace = true } diff --git a/relayer/crates/tools/Cargo.toml b/relayer/crates/tools/Cargo.toml index a7337ac8f..f6a669a27 100644 --- a/relayer/crates/tools/Cargo.toml +++ b/relayer/crates/tools/Cargo.toml @@ -39,13 +39,9 @@ hermes-cli = { workspace = true } hermes-cli-components = { workspace = true } hermes-encoding-components = { workspace = true } hermes-error = { workspace = true } -hermes-logging-components = { workspace = true } -hermes-relayer-components = { workspace = true } hermes-runtime = { workspace = true } -hermes-runtime-components = { workspace = true } hermes-starknet-chain-components = { workspace = true } hermes-starknet-chain-context = { workspace = true } hermes-starknet-cli = { workspace = true } hermes-starknet-integration-tests = { workspace = true } hermes-starknet-relayer = { workspace = true } -hermes-tracing-logging-components = { workspace = true } From 2984572a40a2352d4aceae2016c3d79c0fe2571e Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Tue, 29 Apr 2025 07:17:52 +0000 Subject: [PATCH 10/13] Fix Nix build --- light-client/Cargo.lock | 5 ----- light-client/Cargo.toml | 1 - 2 files changed, 6 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index a7abb7a92..d44b216d3 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -2394,8 +2394,3 @@ dependencies = [ "quote", "syn 2.0.98", ] - -[[patch.unused]] -name = "hermes-core" -version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml index ed16f622e..2212fca2a 100644 --- a/light-client/Cargo.toml +++ b/light-client/Cargo.toml @@ -95,7 +95,6 @@ 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-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } From d49ffb370625912cb7ed22c38cfd26506898ea52 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Tue, 29 Apr 2025 07:46:40 +0000 Subject: [PATCH 11/13] Update hermes sdk --- light-client/Cargo.lock | 10 +-- nix/ibc-starknet-cw.nix | 2 +- relayer/Cargo.lock | 96 +++++++++++--------------- relayer/crates/starknet-cli/Cargo.toml | 1 + 4 files changed, 46 insertions(+), 63 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index d44b216d3..4c21c4125 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -1024,7 +1024,7 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-encoding-components", @@ -1039,7 +1039,7 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-prelude", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "hermes-prelude" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "cgp-async", @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-encoding-components", @@ -1825,7 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.98", diff --git a/nix/ibc-starknet-cw.nix b/nix/ibc-starknet-cw.nix index c74364ac1..3bb454957 100644 --- a/nix/ibc-starknet-cw.nix +++ b/nix/ibc-starknet-cw.nix @@ -11,7 +11,7 @@ let lockFile = ./../light-client/Cargo.lock; outputHashes = { "cgp-0.4.0" = "sha256-aKSLWdiYRbRen9yj5K/xqsSsNp5YYee1fFPBfOYEdP8="; - "hermes-cosmos-encoding-components-0.1.0" = "sha256-Ml5/xXr9MivxNfbTDi2+2IEdszsVtkmew4RNk2upSi0="; + "hermes-cosmos-encoding-components-0.1.0" = "sha256-NNR6fAVMa/u+bSeAygKSrViDxX5EaYu6dm4aTi6OULk="; "ibc-client-cw-0.56.0" = "sha256-DA3AB8ejUrx4ksBtN/vaOznjpKE0+0F6vGA7JmWyHWA="; "ibc-0.56.0" = "sha256-7DPIqu/zs0szjmtJTfXI2eQ0HEkRyvGjArcMZsFWMT4="; }; diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index 31eab83e1..c663c9660 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -1797,7 +1797,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermes-any-counterparty" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-core", @@ -1817,7 +1817,7 @@ dependencies = [ [[package]] name = "hermes-async-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "async-trait", "cgp", @@ -1841,7 +1841,7 @@ dependencies = [ [[package]] name = "hermes-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-chain-type-components", @@ -1853,7 +1853,7 @@ dependencies = [ [[package]] name = "hermes-chain-type-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-prelude", @@ -1862,7 +1862,7 @@ dependencies = [ [[package]] name = "hermes-cli" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "clap", @@ -1889,7 +1889,7 @@ dependencies = [ [[package]] name = "hermes-cli-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "clap", @@ -1905,7 +1905,7 @@ dependencies = [ [[package]] name = "hermes-cli-framework" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "clap", @@ -1925,7 +1925,7 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-chain-type-components", @@ -1935,7 +1935,7 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-context" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "eyre", @@ -1952,7 +1952,7 @@ dependencies = [ [[package]] name = "hermes-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-chain-components", @@ -1969,7 +1969,7 @@ dependencies = [ [[package]] name = "hermes-cosmos" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "hermes-comet-light-client-context", "hermes-core", @@ -1984,7 +1984,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "bech32 0.9.1", "bitcoin", @@ -2033,7 +2033,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-chain-preset" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-core", @@ -2045,7 +2045,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "hermes-comet-light-client-components", "hermes-core", @@ -2068,7 +2068,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-encoding-components", @@ -2083,21 +2083,17 @@ dependencies = [ [[package]] name = "hermes-cosmos-integration-tests" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "eyre", - "hermes-async-runtime-components", "hermes-core", - "hermes-cosmos-chain-components", + "hermes-cosmos-core", "hermes-cosmos-relayer", - "hermes-cosmos-test-components", "hermes-error", "hermes-ibc-test-suite", "hermes-prelude", "hermes-runtime", - "hermes-tracing-logging-components", - "hermes-wasm-test-components", "ibc", "ibc-proto", "prost", @@ -2113,25 +2109,18 @@ dependencies = [ [[package]] name = "hermes-cosmos-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "dirs-next", "eyre", "futures", "hermes-any-counterparty", - "hermes-async-runtime-components", "hermes-core", - "hermes-cosmos-chain-components", - "hermes-cosmos-chain-preset", - "hermes-cosmos-test-components", + "hermes-cosmos-core", "hermes-error", "hermes-prelude", - "hermes-protobuf-encoding-components", "hermes-runtime", - "hermes-tracing-logging-components", - "hermes-wasm-client-components", - "hermes-wasm-test-components", "http 1.3.1", "ibc", "ibc-proto", @@ -2157,7 +2146,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hdpath", @@ -2183,27 +2172,19 @@ dependencies = [ [[package]] name = "hermes-cosmos-wasm-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "eyre", "futures", "hermes-any-counterparty", - "hermes-async-runtime-components", "hermes-core", - "hermes-cosmos-chain-components", - "hermes-cosmos-chain-preset", + "hermes-cosmos-core", "hermes-cosmos-integration-tests", "hermes-cosmos-relayer", - "hermes-cosmos-test-components", "hermes-error", "hermes-prelude", - "hermes-protobuf-encoding-components", "hermes-runtime", - "hermes-tracing-logging-components", - "hermes-wasm-client-components", - "hermes-wasm-encoding-components", - "hermes-wasm-test-components", "http 1.3.1", "ibc", "ibc-proto", @@ -2228,7 +2209,7 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-prelude", @@ -2237,7 +2218,7 @@ dependencies = [ [[package]] name = "hermes-error" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "eyre", @@ -2249,7 +2230,7 @@ dependencies = [ [[package]] name = "hermes-ibc-test-suite" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-chain-components", @@ -2264,7 +2245,7 @@ dependencies = [ [[package]] name = "hermes-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-prelude", @@ -2273,7 +2254,7 @@ dependencies = [ [[package]] name = "hermes-prelude" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "cgp-async", @@ -2282,7 +2263,7 @@ dependencies = [ [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-encoding-components", @@ -2294,7 +2275,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "futures", @@ -2309,7 +2290,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components-extra" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "futures", @@ -2323,7 +2304,7 @@ dependencies = [ [[package]] name = "hermes-runtime" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-async-runtime-components", @@ -2338,7 +2319,7 @@ dependencies = [ [[package]] name = "hermes-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-prelude", @@ -2411,6 +2392,7 @@ dependencies = [ "clap", "eyre", "hermes-chain-components", + "hermes-cli", "hermes-cli-components", "hermes-core", "hermes-cosmos", @@ -2578,7 +2560,7 @@ dependencies = [ [[package]] name = "hermes-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-chain-type-components", @@ -2592,7 +2574,7 @@ dependencies = [ [[package]] name = "hermes-tokio-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "futures", @@ -2609,7 +2591,7 @@ dependencies = [ [[package]] name = "hermes-tracing-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-core", @@ -2624,7 +2606,7 @@ dependencies = [ [[package]] name = "hermes-wasm-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-core", @@ -2644,7 +2626,7 @@ dependencies = [ [[package]] name = "hermes-wasm-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-core", @@ -2659,7 +2641,7 @@ dependencies = [ [[package]] name = "hermes-wasm-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#ef8b260ace842359c7ef379cdc0eb547a4911e5f" +source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" dependencies = [ "cgp", "hermes-core", diff --git a/relayer/crates/starknet-cli/Cargo.toml b/relayer/crates/starknet-cli/Cargo.toml index df4ab5cd4..85b294392 100644 --- a/relayer/crates/starknet-cli/Cargo.toml +++ b/relayer/crates/starknet-cli/Cargo.toml @@ -23,6 +23,7 @@ hermes-prelude = { workspace = true } hermes-core = { workspace = true } hermes-cosmos = { workspace = true } hermes-cosmos-core = { workspace = true } +hermes-cli = { workspace = true } hermes-cli-components = { workspace = true } hermes-starknet-chain-components = { workspace = true } hermes-starknet-chain-context = { workspace = true } From 754dbf3a300c9d577c8e96f7b50ed8af95744251 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Tue, 29 Apr 2025 07:51:52 +0000 Subject: [PATCH 12/13] Use hermes_prelude instead of cgp::prelude --- light-client/Cargo.lock | 2 ++ light-client/Cargo.toml | 1 + light-client/ibc-client-starknet-types/Cargo.toml | 1 + light-client/ibc-client-starknet-types/src/client_state.rs | 2 +- light-client/ibc-client-starknet-types/src/consensus_state.rs | 2 +- .../ibc-client-starknet-types/src/encoding/components.rs | 2 +- .../src/encoding/impls/client_state.rs | 2 +- .../src/encoding/impls/consensus_state.rs | 2 +- .../ibc-client-starknet-types/src/encoding/impls/header.rs | 2 +- light-client/ibc-client-starknet-types/src/header.rs | 2 +- light-client/ibc-client-starknet/Cargo.toml | 1 + light-client/ibc-client-starknet/src/encoding/context.rs | 2 +- relayer/Cargo.lock | 2 ++ relayer/crates/cairo-encoding-components/Cargo.toml | 1 + .../cairo-encoding-components/src/components/encode_mut.rs | 2 +- .../crates/cairo-encoding-components/src/components/encoding.rs | 2 +- .../crates/cairo-encoding-components/src/impls/encode/buffer.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/array.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/bool.rs | 2 +- .../src/impls/encode_mut/byte_array.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/cons.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/display.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/end.rs | 2 +- .../src/impls/encode_mut/enum_fields.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/felt.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/from.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/from_felt.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/from_i128.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/from_u128.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/i128.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/iter.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/option.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/pair.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/reference.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/string.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/u128.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/u256.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/unit.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/variant.rs | 2 +- .../src/impls/encode_mut/variant_from.rs | 2 +- .../cairo-encoding-components/src/impls/encode_mut/vec.rs | 2 +- .../cairo-encoding-components/src/impls/types/decode_buffer.rs | 2 +- .../cairo-encoding-components/src/impls/types/encode_buffer.rs | 2 +- .../crates/cairo-encoding-components/src/impls/types/encoded.rs | 2 +- relayer/crates/cairo-encoding-components/src/traits/size.rs | 2 +- .../crates/starknet-chain-components/src/components/chain.rs | 2 +- .../starknet-chain-components/src/components/encoding/cairo.rs | 2 +- .../starknet-chain-components/src/components/encoding/event.rs | 2 +- .../src/components/encoding/protobuf.rs | 2 +- .../src/components/starknet_to_cosmos.rs | 2 +- .../crates/starknet-chain-components/src/components/types.rs | 2 +- .../src/impls/assert/assert_duration.rs | 2 +- .../starknet-chain-components/src/impls/commitment_prefix.rs | 2 +- .../starknet-chain-components/src/impls/commitment_proof.rs | 2 +- .../crates/starknet-chain-components/src/impls/contract/call.rs | 2 +- .../starknet-chain-components/src/impls/contract/declare.rs | 2 +- .../starknet-chain-components/src/impls/contract/deploy.rs | 2 +- .../starknet-chain-components/src/impls/contract/invoke.rs | 2 +- .../starknet-chain-components/src/impls/contract/message.rs | 2 +- .../src/impls/counterparty_message_height.rs | 2 +- .../starknet-chain-components/src/impls/encoding/class_hash.rs | 2 +- .../src/impls/encoding/contract_address.rs | 2 +- .../starknet-chain-components/src/impls/encoding/events.rs | 2 +- .../crates/starknet-chain-components/src/impls/error/account.rs | 2 +- .../starknet-chain-components/src/impls/error/provider.rs | 2 +- .../starknet-chain-components/src/impls/error/starknet.rs | 2 +- .../crates/starknet-chain-components/src/impls/events/ack.rs | 2 +- .../starknet-chain-components/src/impls/events/channel.rs | 2 +- .../starknet-chain-components/src/impls/events/connection_id.rs | 2 +- .../starknet-chain-components/src/impls/events/create_client.rs | 2 +- .../starknet-chain-components/src/impls/events/send_packet.rs | 2 +- .../crates/starknet-chain-components/src/impls/ibc_amount.rs | 2 +- relayer/crates/starknet-chain-components/src/impls/json_rpc.rs | 2 +- .../starknet-chain-components/src/impls/messages/channel.rs | 2 +- .../starknet-chain-components/src/impls/messages/connection.rs | 2 +- .../src/impls/messages/create_client.rs | 2 +- .../src/impls/messages/ibc_transfer.rs | 2 +- .../starknet-chain-components/src/impls/messages/packet.rs | 2 +- .../src/impls/messages/update_client.rs | 2 +- .../crates/starknet-chain-components/src/impls/packet_fields.rs | 2 +- .../crates/starknet-chain-components/src/impls/packet_filter.rs | 2 +- .../src/impls/payload_builders/create_client.rs | 2 +- .../src/impls/payload_builders/update_client.rs | 2 +- .../src/impls/queries/ack_commitment.rs | 2 +- .../starknet-chain-components/src/impls/queries/balance.rs | 2 +- .../crates/starknet-chain-components/src/impls/queries/block.rs | 2 +- .../starknet-chain-components/src/impls/queries/block_events.rs | 2 +- .../starknet-chain-components/src/impls/queries/channel_end.rs | 2 +- .../starknet-chain-components/src/impls/queries/client_state.rs | 2 +- .../src/impls/queries/connection_end.rs | 2 +- .../src/impls/queries/consensus_state.rs | 2 +- .../src/impls/queries/contract_address.rs | 2 +- .../src/impls/queries/counterparty_chain_id.rs | 2 +- .../crates/starknet-chain-components/src/impls/queries/nonce.rs | 2 +- .../src/impls/queries/packet_commitment.rs | 2 +- .../src/impls/queries/packet_receipt.rs | 2 +- .../src/impls/queries/packet_received.rs | 2 +- .../starknet-chain-components/src/impls/queries/status.rs | 2 +- .../src/impls/queries/storage_proof.rs | 2 +- .../src/impls/queries/token_address/create.rs | 2 +- .../src/impls/queries/token_address/get.rs | 2 +- .../src/impls/queries/token_address/get_or_create.rs | 2 +- .../src/impls/queries/token_balance.rs | 2 +- .../crates/starknet-chain-components/src/impls/send_message.rs | 2 +- .../src/impls/starknet_to_cosmos/connection_message.rs | 2 +- .../src/impls/starknet_to_cosmos/counterparty_message_height.rs | 2 +- .../src/impls/starknet_to_cosmos/create_client_message.rs | 2 +- .../src/impls/starknet_to_cosmos/ibc_amount.rs | 2 +- .../src/impls/starknet_to_cosmos/packet_fields.rs | 2 +- .../impls/starknet_to_cosmos/query_consensus_state_height.rs | 2 +- .../src/impls/starknet_to_cosmos/update_client_message.rs | 2 +- .../crates/starknet-chain-components/src/impls/storage_proof.rs | 2 +- relayer/crates/starknet-chain-components/src/impls/transfer.rs | 2 +- .../crates/starknet-chain-components/src/impls/tx_response.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/address.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/amount.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/block.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/client.rs | 2 +- .../src/impls/types/commitment_proof.rs | 2 +- .../starknet-chain-components/src/impls/types/contract.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/denom.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/height.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/method.rs | 2 +- .../starknet-chain-components/src/impls/types/payloads.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/status.rs | 2 +- .../starknet-chain-components/src/impls/types/timestamp.rs | 2 +- .../crates/starknet-chain-components/src/impls/types/wallet.rs | 2 +- relayer/crates/starknet-chain-components/src/traits/account.rs | 2 +- relayer/crates/starknet-chain-components/src/traits/client.rs | 2 +- .../starknet-chain-components/src/traits/commitment_proof.rs | 2 +- .../starknet-chain-components/src/traits/contract/call.rs | 2 +- .../starknet-chain-components/src/traits/contract/declare.rs | 2 +- .../starknet-chain-components/src/traits/contract/deploy.rs | 2 +- .../starknet-chain-components/src/traits/contract/invoke.rs | 2 +- .../starknet-chain-components/src/traits/contract/message.rs | 2 +- relayer/crates/starknet-chain-components/src/traits/json_rpc.rs | 2 +- .../starknet-chain-components/src/traits/messages/transfer.rs | 2 +- .../crates/starknet-chain-components/src/traits/proof_signer.rs | 2 +- .../src/traits/queries/contract_address.rs | 2 +- .../src/traits/queries/storage_proof.rs | 2 +- .../src/traits/queries/token_address.rs | 2 +- .../src/traits/queries/token_balance.rs | 2 +- .../crates/starknet-chain-components/src/traits/rpc_client.rs | 2 +- relayer/crates/starknet-chain-components/src/traits/signer.rs | 2 +- relayer/crates/starknet-chain-components/src/traits/transfer.rs | 2 +- .../crates/starknet-chain-components/src/traits/types/blob.rs | 2 +- .../starknet-chain-components/src/traits/types/commitment.rs | 2 +- .../src/traits/types/contract_class.rs | 2 +- .../crates/starknet-chain-components/src/traits/types/method.rs | 2 +- .../starknet-chain-components/src/traits/types/storage_proof.rs | 2 +- .../crates/starknet-chain-components/src/types/channel_id.rs | 2 +- relayer/crates/starknet-chain-components/src/types/client_id.rs | 2 +- .../crates/starknet-chain-components/src/types/client_state.rs | 2 +- .../crates/starknet-chain-components/src/types/connection_id.rs | 2 +- .../starknet-chain-components/src/types/consensus_state.rs | 2 +- .../starknet-chain-components/src/types/cosmos/client_state.rs | 2 +- .../src/types/cosmos/consensus_state.rs | 2 +- .../crates/starknet-chain-components/src/types/cosmos/height.rs | 2 +- .../starknet-chain-components/src/types/cosmos/timestamp.rs | 2 +- .../crates/starknet-chain-components/src/types/cosmos/update.rs | 2 +- .../starknet-chain-components/src/types/events/channel.rs | 2 +- .../starknet-chain-components/src/types/events/connection.rs | 2 +- .../crates/starknet-chain-components/src/types/events/erc20.rs | 2 +- .../crates/starknet-chain-components/src/types/events/ics20.rs | 2 +- .../crates/starknet-chain-components/src/types/events/packet.rs | 2 +- .../starknet-chain-components/src/types/message_response.rs | 2 +- .../src/types/message_responses/create_client.rs | 2 +- .../src/types/messages/erc20/deploy.rs | 2 +- .../src/types/messages/erc20/transfer.rs | 2 +- .../starknet-chain-components/src/types/messages/ibc/channel.rs | 2 +- .../src/types/messages/ibc/connection.rs | 2 +- .../starknet-chain-components/src/types/messages/ibc/denom.rs | 2 +- .../src/types/messages/ibc/ibc_transfer.rs | 2 +- .../starknet-chain-components/src/types/messages/ibc/packet.rs | 2 +- .../starknet-chain-components/src/types/payloads/client.rs | 2 +- relayer/crates/starknet-chain-components/src/types/register.rs | 2 +- relayer/crates/starknet-chain-context/src/contexts/chain.rs | 2 +- .../starknet-chain-context/src/contexts/encoding/cairo.rs | 2 +- .../starknet-chain-context/src/contexts/encoding/event.rs | 2 +- .../starknet-chain-context/src/contexts/encoding/protobuf.rs | 2 +- .../crates/starknet-chain-context/src/impls/build_account.rs | 2 +- relayer/crates/starknet-chain-context/src/impls/error.rs | 2 +- relayer/crates/starknet-cli/src/commands/all.rs | 2 +- relayer/crates/starknet-cli/src/commands/bootstrap.rs | 2 +- relayer/crates/starknet-cli/src/commands/create/subcommand.rs | 2 +- relayer/crates/starknet-cli/src/commands/query/subcommand.rs | 2 +- relayer/crates/starknet-cli/src/commands/start.rs | 2 +- relayer/crates/starknet-cli/src/commands/update/subcommand.rs | 2 +- relayer/crates/starknet-cli/src/contexts/app.rs | 2 +- .../crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs | 2 +- .../crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs | 2 +- relayer/crates/starknet-cli/src/impls/build.rs | 2 +- relayer/crates/starknet-cli/src/impls/create_client.rs | 2 +- relayer/crates/starknet-cli/src/impls/error.rs | 2 +- .../starknet-integration-tests/src/contexts/chain_driver.rs | 2 +- .../src/contexts/cosmos_starknet_relay_driver.rs | 2 +- .../src/contexts/osmosis_bootstrap.rs | 2 +- relayer/crates/starknet-integration-tests/src/contexts/setup.rs | 2 +- .../src/contexts/starknet_bootstrap.rs | 2 +- .../src/contexts/starknet_cosmos_relay_driver.rs | 2 +- .../starknet-integration-tests/src/contexts/test_driver.rs | 2 +- .../starknet-integration-tests/src/impls/build_bootstrap.rs | 2 +- .../crates/starknet-integration-tests/src/utils/init_setup.rs | 2 +- relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs | 2 +- relayer/crates/starknet-madara-tests/src/contexts/chain.rs | 2 +- .../crates/starknet-madara-tests/src/contexts/chain_driver.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/build_account.rs | 2 +- .../starknet-madara-tests/src/impls/build_chain_driver.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/contract/call.rs | 2 +- .../crates/starknet-madara-tests/src/impls/contract/declare.rs | 2 +- .../crates/starknet-madara-tests/src/impls/contract/deploy.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/error/account.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/error/handler.rs | 2 +- .../crates/starknet-madara-tests/src/impls/error/provider.rs | 2 +- .../crates/starknet-madara-tests/src/impls/error/starknet.rs | 2 +- .../src/impls/payload_builders/update_client.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/queries/block.rs | 2 +- .../starknet-madara-tests/src/impls/queries/block_events.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs | 2 +- .../crates/starknet-madara-tests/src/impls/queries/status.rs | 2 +- .../starknet-madara-tests/src/impls/queries/tx_response.rs | 2 +- relayer/crates/starknet-madara-tests/src/impls/send_message.rs | 2 +- relayer/crates/starknet-madara-tests/src/presets/chain.rs | 2 +- relayer/crates/starknet-madara-tests/src/tests/erc20.rs | 2 +- relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs | 2 +- relayer/crates/starknet-madara-tests/src/traits/account.rs | 2 +- relayer/crates/starknet-relayer/src/contexts/builder.rs | 2 +- .../starknet-relayer/src/contexts/cosmos_starknet_birelay.rs | 2 +- .../starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs | 2 +- .../starknet-relayer/src/contexts/starknet_cosmos_birelay.rs | 2 +- .../starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs | 2 +- relayer/crates/starknet-relayer/src/impls/error.rs | 2 +- .../src/impls/bootstrap/bootstrap_chain.rs | 2 +- .../src/impls/bootstrap/deploy_contracts.rs | 2 +- .../starknet-test-components/src/impls/bootstrap/start_chain.rs | 2 +- .../src/impls/bootstrap_madara/bootstrap_chain.rs | 2 +- .../src/impls/bootstrap_madara/start_all.rs | 2 +- .../src/impls/bootstrap_madara/start_anvil.rs | 2 +- .../src/impls/bootstrap_madara/start_madara.rs | 2 +- .../src/impls/bootstrap_madara/start_pathfinder.rs | 2 +- .../starknet-test-components/src/impls/types/genesis_config.rs | 2 +- .../starknet-test-components/src/impls/types/node_config.rs | 2 +- .../starknet-test-components/src/traits/deploy_contracts.rs | 2 +- relayer/crates/tools/src/commands/starknet/subcommand.rs | 2 +- relayer/crates/tools/src/commands/starknet/transfer_args.rs | 2 +- relayer/crates/tools/src/commands/subcommand.rs | 2 +- relayer/crates/tools/src/contexts/app.rs | 2 +- 247 files changed, 249 insertions(+), 241 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index 4c21c4125..dd28a4318 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -1147,6 +1147,7 @@ dependencies = [ "derive_more 0.99.19", "hermes-cosmos-encoding-components", "hermes-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc-client-cw", "ibc-client-starknet-types", @@ -1174,6 +1175,7 @@ dependencies = [ "derive_more 0.99.19", "hermes-cosmos-encoding-components", "hermes-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc-core", "ibc-proto", diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml index 2212fca2a..42013122a 100644 --- a/light-client/Cargo.toml +++ b/light-client/Cargo.toml @@ -33,6 +33,7 @@ ibc-proto = { version = "0.51.1", default-features = false } tendermint = { version = "0.40.0", default-features = false } cgp = { version = "0.4.0" } +hermes-prelude = { version = "0.1.0" } hermes-encoding-components = { version = "0.1.0" } hermes-protobuf-encoding-components = { version = "0.1.0" } hermes-cosmos-encoding-components = { version = "0.1.0" } diff --git a/light-client/ibc-client-starknet-types/Cargo.toml b/light-client/ibc-client-starknet-types/Cargo.toml index c5ef7b4e3..d9fce8ec0 100644 --- a/light-client/ibc-client-starknet-types/Cargo.toml +++ b/light-client/ibc-client-starknet-types/Cargo.toml @@ -21,6 +21,7 @@ derive_more = { workspace = true } prost = { workspace = true } serde = { workspace = true, optional = true } cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-encoding-components = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } hermes-cosmos-encoding-components = { workspace = true } diff --git a/light-client/ibc-client-starknet-types/src/client_state.rs b/light-client/ibc-client-starknet-types/src/client_state.rs index c91c398e2..beea6777d 100644 --- a/light-client/ibc-client-starknet-types/src/client_state.rs +++ b/light-client/ibc-client-starknet-types/src/client_state.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use ibc_core::client::types::Height; use ibc_core::host::types::identifiers::ChainId; diff --git a/light-client/ibc-client-starknet-types/src/consensus_state.rs b/light-client/ibc-client-starknet-types/src/consensus_state.rs index 2779f5414..29bdc6450 100644 --- a/light-client/ibc-client-starknet-types/src/consensus_state.rs +++ b/light-client/ibc-client-starknet-types/src/consensus_state.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use ibc_core::commitment_types::commitment::CommitmentRoot; use ibc_core::primitives::Timestamp; diff --git a/light-client/ibc-client-starknet-types/src/encoding/components.rs b/light-client/ibc-client-starknet-types/src/encoding/components.rs index ae96fe43e..1fb98b53c 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/components.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/components.rs @@ -1,13 +1,13 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::{UseContext, UseDelegate}; - use cgp::prelude::*; use hermes_cosmos_encoding_components::components::CosmosEncodingComponents; use hermes_encoding_components::traits::{ ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, SchemaGetterComponent, SchemaTypeComponent, }; + use hermes_prelude::*; use hermes_protobuf_encoding_components::impl_type_url; use hermes_protobuf_encoding_components::impls::{ DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, EncodeProtoWithMutBuffer, EncodeViaAny, diff --git a/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs b/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs index 626af91ca..e3799fe92 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs @@ -1,8 +1,8 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_cosmos_encoding_components::impls::EncodeChainIdField; use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::{ DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField, }; diff --git a/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs b/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs index 8e74be963..0a31598c1 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs @@ -1,7 +1,7 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::{ DecodeRequiredProtoField, EncodeLengthDelimitedProtoField, }; diff --git a/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs b/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs index 817f4e788..319815d4f 100644 --- a/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs +++ b/light-client/ibc-client-starknet-types/src/encoding/impls/header.rs @@ -1,7 +1,7 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer}; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::{ DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField, }; diff --git a/light-client/ibc-client-starknet-types/src/header.rs b/light-client/ibc-client-starknet-types/src/header.rs index 72a1e3759..58156d70c 100644 --- a/light-client/ibc-client-starknet-types/src/header.rs +++ b/light-client/ibc-client-starknet-types/src/header.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use ibc_core::client::types::Height; use crate::StarknetConsensusState; diff --git a/light-client/ibc-client-starknet/Cargo.toml b/light-client/ibc-client-starknet/Cargo.toml index acd642461..88ff50c86 100644 --- a/light-client/ibc-client-starknet/Cargo.toml +++ b/light-client/ibc-client-starknet/Cargo.toml @@ -20,6 +20,7 @@ serde = { workspace = true, optional = true } prost = { workspace = true } prost-types = { workspace = true } cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-encoding-components = { workspace = true } hermes-protobuf-encoding-components = { workspace = true } hermes-cosmos-encoding-components = { workspace = true } diff --git a/light-client/ibc-client-starknet/src/encoding/context.rs b/light-client/ibc-client-starknet/src/encoding/context.rs index fd9f57ade..dc3905a0b 100644 --- a/light-client/ibc-client-starknet/src/encoding/context.rs +++ b/light-client/ibc-client-starknet/src/encoding/context.rs @@ -6,10 +6,10 @@ use core::str::Utf8Error; use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProvider, ErrorTypeProviderComponent, }; -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanConvert, CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; +use hermes_prelude::*; use hermes_protobuf_encoding_components::impls::{ InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index c663c9660..b27bd4bec 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -1834,6 +1834,7 @@ version = "0.1.0" dependencies = [ "cgp", "hermes-encoding-components", + "hermes-prelude", "hermes-relayer-components", "starknet 0.14.0", ] @@ -3018,6 +3019,7 @@ dependencies = [ "derive_more 0.99.19", "hermes-cosmos-encoding-components", "hermes-encoding-components", + "hermes-prelude", "hermes-protobuf-encoding-components", "ibc-core", "ibc-proto", diff --git a/relayer/crates/cairo-encoding-components/Cargo.toml b/relayer/crates/cairo-encoding-components/Cargo.toml index a0df88d61..609b84059 100644 --- a/relayer/crates/cairo-encoding-components/Cargo.toml +++ b/relayer/crates/cairo-encoding-components/Cargo.toml @@ -14,6 +14,7 @@ workspace = true [dependencies] cgp = { workspace = true } +hermes-prelude = { workspace = true } hermes-relayer-components = { workspace = true } hermes-encoding-components = { workspace = true } diff --git a/relayer/crates/cairo-encoding-components/src/components/encode_mut.rs b/relayer/crates/cairo-encoding-components/src/components/encode_mut.rs index a41b1da5e..8bc37f8e6 100644 --- a/relayer/crates/cairo-encoding-components/src/components/encode_mut.rs +++ b/relayer/crates/cairo-encoding-components/src/components/encode_mut.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use starknet::core::types::{ByteArray, Felt, U256}; use crate::impls::encode_mut::array::EncodeArray; diff --git a/relayer/crates/cairo-encoding-components/src/components/encoding.rs b/relayer/crates/cairo-encoding-components/src/components/encoding.rs index 7073d850d..bde9d7764 100644 --- a/relayer/crates/cairo-encoding-components/src/components/encoding.rs +++ b/relayer/crates/cairo-encoding-components/src/components/encoding.rs @@ -1,11 +1,11 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; use hermes_encoding_components::traits::{ DecodeBufferBuilderComponent, DecodeBufferPeekerComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, }; + use hermes_prelude::*; use crate::impls::encode::buffer::EncodeWithMutBuffer; use crate::impls::types::decode_buffer::ProvideVecIterDecodeBuffer; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs b/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs index adb86b21e..9fb086314 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode/buffer.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanBuildDecodeBuffer, CanDecodeMut, CanEncodeMut, CanFinalizedEncodeBuffer, Decoder, DecoderComponent, Encoder, EncoderComponent, MutDecoder, }; +use hermes_prelude::*; use crate::impls::encode_mut::end::DecodeEnd; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs index bb052e6da..0fa782c99 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/array.rs @@ -1,9 +1,9 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeArray; 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 baac98181..f9d794ccd 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,9 +1,9 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct EncodeBool; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs index 6f0601a41..cf41f5f51 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/byte_array.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::{ByteArray, Felt}; pub struct EncodeByteArray; 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 1e52ed04e..69c24d12e 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,11 +1,11 @@ use core::marker::PhantomData; use cgp::core::error::HasAsyncErrorType; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncoderCons(pub PhantomData<(EncoderA, EncoderB)>); diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs index 46b68d177..1ff21f619 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/display.rs @@ -1,10 +1,10 @@ use core::fmt::Display; use core::str::FromStr; -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeDisplay; 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 58998d040..e5cc11e4e 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,7 +1,7 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_encoding_components::traits::{HasDecodeBufferType, MutDecoder, MutDecoderComponent}; +use hermes_prelude::*; pub struct DecodeEnd; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs index 89b18d476..cc4f0c69d 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/enum_fields.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use crate::impls::encode_mut::variant::SumEncoders; use crate::types::nat::Z; 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 bc2f7e222..66de0d2a6 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,10 +1,10 @@ use core::iter; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct EncodeFelt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs index 847dee020..969c8bed1 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeFrom(pub PhantomData<(Intermediate, InEncoder)>); diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs index 63d29a1ca..fdb0166ef 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_felt.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{CanEncodeMut, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct EncodeFromFelt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs index 1076e270b..869ab40a3 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/from_i128.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeFromI128; 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 cbd1285ff..e37e039d0 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,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeFromU128; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs index b6763a113..d15248d30 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/i128.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct EncodeI128; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs index 2c01aac03..fbba1b0ae 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/iter.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{CanEncodeMut, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; pub struct EncodeArray; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs index 817ce8037..8951daabe 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/option.rs @@ -1,9 +1,9 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, TransformerRef, }; +use hermes_prelude::*; use crate::impls::encode_mut::variant_from::EncodeVariantFrom; 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 f3f69fd6a..15e4a8bee 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,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncoderPair(pub PhantomData<(EncoderA, EncoderB)>); diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs index c889e90fa..1f7a5ad16 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/reference.rs @@ -1,7 +1,7 @@ use core::ops::Deref; -use cgp::prelude::*; use hermes_encoding_components::traits::{CanEncodeMut, MutEncoder, MutEncoderComponent}; +use hermes_prelude::*; pub struct EncodeDeref; 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 2e44bc721..ff3a23ca8 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,9 +1,9 @@ use std::string::FromUtf8Error; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, MutDecoder, MutDecoderComponent, MutEncoderComponent, }; +use hermes_prelude::*; use crate::impls::encode_mut::byte_array::EncodeByteArray; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs index a3a85c609..2ca5ed357 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u128.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, MutDecoder, MutDecoderComponent, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::encode_mut::from_felt::EncodeFromFelt; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs index 9d1542f0e..e7e2c0ae5 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/u256.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::U256; pub struct EncodeU256; 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 aed502ee5..4f8b264b0 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,8 +1,8 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeNothing; 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 744058ccd..41b3023bc 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,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, CanPeekDecodeBuffer, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::encode_mut::felt::UnexpectedEndOfBuffer; 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 41dc5aac1..2439b2c3e 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,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_encoding_components::traits::{ HasDecodeBufferType, HasEncodeBufferType, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, TransformerRef, }; +use hermes_prelude::*; use crate::impls::encode_mut::variant::SumEncoders; use crate::types::nat::Z; diff --git a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs index bf5819505..829db026f 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/encode_mut/vec.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub struct EncodeList; diff --git a/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs b/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs index 4e7a4d20c..c8988bc95 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/types/decode_buffer.rs @@ -2,12 +2,12 @@ use core::iter::Peekable; use core::ops::Deref; use core::slice::Iter; -use cgp::prelude::*; use hermes_encoding_components::traits::{ DecodeBufferBuilder, DecodeBufferBuilderComponent, DecodeBufferPeeker, DecodeBufferPeekerComponent, DecodeBufferTypeComponent, HasDecodeBufferType, HasEncodedType, ProvideDecodeBufferType, }; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct ProvideVecIterDecodeBuffer; diff --git a/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs b/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs index ec9eb1535..7a3f9ff38 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/types/encode_buffer.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{ EncodeBufferFinalizer, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, HasEncodeBufferType, HasEncodedType, ProvideEncodeBufferType, }; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct ProvideVecEncodeBuffer; diff --git a/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs b/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs index c9d2f785e..d5095a8a3 100644 --- a/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs +++ b/relayer/crates/cairo-encoding-components/src/impls/types/encoded.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_encoding_components::traits::{EncodedTypeComponent, ProvideEncodedType}; +use hermes_prelude::*; use starknet::core::types::Felt; pub struct ProvideVecFeltEncodedType; diff --git a/relayer/crates/cairo-encoding-components/src/traits/size.rs b/relayer/crates/cairo-encoding-components/src/traits/size.rs index e38aeeea8..345d78135 100644 --- a/relayer/crates/cairo-encoding-components/src/traits/size.rs +++ b/relayer/crates/cairo-encoding-components/src/traits/size.rs @@ -1,4 +1,4 @@ -use cgp::prelude::{Either, Void}; +use hermes_prelude::{Either, Void}; use crate::types::nat::{S, Z}; diff --git a/relayer/crates/starknet-chain-components/src/components/chain.rs b/relayer/crates/starknet-chain-components/src/components/chain.rs index 239a5814b..af9317792 100644 --- a/relayer/crates/starknet-chain-components/src/components/chain.rs +++ b/relayer/crates/starknet-chain-components/src/components/chain.rs @@ -1,7 +1,6 @@ #[cgp::re_export_imports] mod preset { use cgp::core::types::UseDelegatedType; - use cgp::prelude::*; use hermes_core::chain_components::impls::{ BuildChannelHandshakePayload, BuildConnectionHandshakePayload, BuildPacketPayloads, ProvideBytesPacketCommitment, ProvideBytesPacketReceipt, ProvideChannelPayloadTypes, @@ -95,6 +94,7 @@ mod preset { ProvideCosmosInitChannelOptionsType, ProvideCosmosInitConnectionOptionsType, ProvideNoCreateClientMessageOptionsType, QueryCounterpartyConnectionId, }; + use hermes_prelude::*; use ibc::core::host::types::identifiers::ChainId; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs index f02c1813e..ccc1759e4 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs @@ -3,7 +3,6 @@ mod preset { use core::time::Duration; use cgp::core::component::{UseContext, UseDelegate}; - use cgp::prelude::*; use hermes_cairo_encoding_components::components::encode_mut::CairoEncodeMutComponents; use hermes_cairo_encoding_components::components::encoding::*; use hermes_cairo_encoding_components::impls::encode_mut::cons::EncoderCons; @@ -20,6 +19,7 @@ mod preset { DecoderComponent, EncodeBufferFinalizerComponent, EncodeBufferTypeComponent, EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent, }; + use hermes_prelude::*; use ibc::clients::tendermint::types::{Header as TendermintLcHeader, TrustThreshold}; use ibc::core::commitment_types::specs::ProofSpecs; use ibc::core::host::types::identifiers::ChainId; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/event.rs b/relayer/crates/starknet-chain-components/src/components/encoding/event.rs index cb9e626c2..9378f22f3 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/event.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/event.rs @@ -1,10 +1,10 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::UseDelegate; - use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; pub use hermes_core::encoding_components::traits::DecoderComponent; use hermes_core::encoding_components::traits::{EncodedTypeComponent, ProvideEncodedType}; + use hermes_prelude::*; use crate::impls::encoding::class_hash::DecodeOptionalByClassHash; use crate::impls::encoding::contract_address::DecodeOptionalByContractAddress; diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs index c48b4b577..84a1ef4ec 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/protobuf.rs @@ -1,7 +1,6 @@ #[cgp::re_export_imports] mod preset { use cgp::core::component::{UseContext, UseDelegate}; - use cgp::prelude::*; use hermes_core::encoding_components::impls::{ProvideEncodedBytes, ProvideStringSchema}; use hermes_core::encoding_components::traits::{ ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent, @@ -22,6 +21,7 @@ mod preset { use hermes_cosmos_core::wasm_encoding_components::types::{ WasmClientMessage, WasmClientState, WasmConsensusState, }; + use hermes_prelude::*; use ibc::clients::wasm_types::client_message::ClientMessage; use ibc::core::client::types::Height; use ibc::core::commitment_types::commitment::CommitmentRoot; 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 3ebfd619c..3f5daff03 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,7 +1,6 @@ #[cgp::re_export_imports] mod preset { use cgp::core::types::WithType; - use cgp::prelude::*; use hermes_core::chain_components::traits::{ AckPacketMessageBuilderComponent, ChannelOpenAckMessageBuilderComponent, ChannelOpenConfirmMessageBuilderComponent, ChannelOpenInitMessageBuilderComponent, @@ -27,6 +26,7 @@ mod preset { BuildCosmosPacketMessages, CosmosPacketFieldReader, }; use hermes_cosmos_core::chain_preset::presets::CosmosToCosmosComponents; + use hermes_prelude::*; use crate::impls::starknet_to_cosmos::connection_message::BuildStarknetToCosmosConnectionHandshake; use crate::impls::starknet_to_cosmos::counterparty_message_height::GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/components/types.rs b/relayer/crates/starknet-chain-components/src/components/types.rs index 8cc3b57ff..11af5bbee 100644 --- a/relayer/crates/starknet-chain-components/src/components/types.rs +++ b/relayer/crates/starknet-chain-components/src/components/types.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChannelEndTypeComponent, ChannelIdTypeComponent, ClientIdTypeComponent, ConnectionEndTypeComponent, ConnectionIdTypeComponent, }; +use hermes_prelude::*; use crate::types::channel_id::{ChannelEnd, ChannelId}; use crate::types::client_id::ClientId; diff --git a/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs b/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs index 32023776d..9a6cd543a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs +++ b/relayer/crates/starknet-chain-components/src/impls/assert/assert_duration.rs @@ -1,9 +1,9 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::test_components::chain::traits::{ PollAssertDurationGetter, PollAssertDurationGetterComponent, }; +use hermes_prelude::*; pub struct ProvidePollAssertDuration; diff --git a/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs b/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs index fe5ce6302..dbaf024c9 100644 --- a/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs +++ b/relayer/crates/starknet-chain-components/src/impls/commitment_prefix.rs @@ -1,9 +1,9 @@ use std::sync::LazyLock; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ HasCommitmentPrefixType, IbcCommitmentPrefixGetter, IbcCommitmentPrefixGetterComponent, }; +use hermes_prelude::*; pub struct GetStarknetCommitmentPrefix; diff --git a/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs index ca9418c84..008299635 100644 --- a/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/commitment_proof.rs @@ -1,7 +1,7 @@ use core::num::TryFromIntError; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use indexmap::IndexMap; use starknet::core::crypto::pedersen_hash; use starknet::core::types::{Felt, MerkleNode, StorageProof}; 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 c46d5dba3..a42b48712 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/call.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/call.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasHeightType; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use starknet::core::types::{BlockId, BlockTag, Felt, FunctionCall}; use starknet::providers::{Provider, ProviderError}; 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 74cb62007..1b8dac7fc 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/declare.rs @@ -5,8 +5,8 @@ use cairo_lang_starknet_classes::casm_contract_class::{ }; use cairo_lang_starknet_classes::contract_class::ContractClass; use cgp::core::error::CanRaiseAsyncError; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_prelude::*; use starknet::accounts::Account; use starknet::core::types::contract::{ CompiledClass, ComputeClassHashError, JsonError, SierraClass, 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 27cb975b2..a80c187e2 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/deploy.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_prelude::*; use starknet::contract::ContractFactory; use starknet::core::types::{Felt, RevertedInvocation}; use starknet::macros::felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs b/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs index 535e41430..8497f5c4a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/invoke.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::CanSendSingleMessage; +use hermes_prelude::*; use crate::traits::contract::invoke::{ContractInvoker, ContractInvokerComponent}; use crate::traits::contract::message::CanBuildInvokeContractMessage; diff --git a/relayer/crates/starknet-chain-components/src/impls/contract/message.rs b/relayer/crates/starknet-chain-components/src/impls/contract/message.rs index 40c81f08b..885ee5fc0 100644 --- a/relayer/crates/starknet-chain-components/src/impls/contract/message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/contract/message.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasMessageType; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs index e66b5b305..c1e986d40 100644 --- a/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/counterparty_message_height.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, HasMessageType, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use crate::impls::types::message::StarknetMessage; diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs index 496f5eebd..f3594ee73 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/class_hash.rs @@ -2,8 +2,8 @@ use core::marker::PhantomData; use std::collections::HashSet; use std::sync::OnceLock; -use cgp::prelude::*; use hermes_core::encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::types::event::StarknetEvent; diff --git a/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs b/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs index c364a9277..cfc0bef49 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/contract_address.rs @@ -2,8 +2,8 @@ use core::marker::PhantomData; use std::collections::HashSet; use std::sync::OnceLock; -use cgp::prelude::*; use hermes_core::encoding_components::traits::{CanDecode, Decoder, DecoderComponent}; +use hermes_prelude::*; use crate::impls::types::address::StarknetAddress; use crate::types::event::StarknetEvent; 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 c45e3d28b..bcbadbd00 100644 --- a/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs +++ b/relayer/crates/starknet-chain-components/src/impls/encoding/events.rs @@ -1,6 +1,6 @@ -use cgp::prelude::HasAsyncErrorType; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_core::encoding_components::traits::{CanDecode, HasEncodedType}; +use hermes_prelude::HasAsyncErrorType; pub trait CanFilterDecodeEvents: HasEncodedType + HasAsyncErrorType { fn filter_decode_events(&self, encoded: &[Self::Encoded]) -> Result, 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 c8490aab9..3d86945b6 100644 --- a/relayer/crates/starknet-chain-components/src/impls/error/account.rs +++ b/relayer/crates/starknet-chain-components/src/impls/error/account.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use starknet::accounts::AccountError; use starknet::providers::ProviderError; 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 3a24f9b3d..995c7d593 100644 --- a/relayer/crates/starknet-chain-components/src/impls/error/provider.rs +++ b/relayer/crates/starknet-chain-components/src/impls/error/provider.rs @@ -1,5 +1,5 @@ use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use starknet::core::types::StarknetError; use starknet::providers::ProviderError; 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 bc365ddb5..356d3c1ef 100644 --- a/relayer/crates/starknet-chain-components/src/impls/error/starknet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/error/starknet.rs @@ -1,5 +1,5 @@ use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use starknet::core::types::StarknetError; pub struct RaiseStarknetError; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/ack.rs b/relayer/crates/starknet-chain-components/src/impls/events/ack.rs index ed2558f89..08e4fb0de 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/ack.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/ack.rs @@ -1,7 +1,6 @@ use core::marker::PhantomData; use std::str::FromStr; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; @@ -11,6 +10,7 @@ use hermes_core::chain_components::traits::{ PacketFromWriteAckEventBuilderComponent, ProvideWriteAckEvent, WriteAckEventComponent, }; use hermes_core::encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; +use hermes_prelude::*; use ibc::apps::transfer::types::{Amount, BaseDenom, Memo, PrefixedDenom, TracePath}; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::host::types::error::{DecodingError, IdentifierError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/channel.rs b/relayer/crates/starknet-chain-components/src/impls/events/channel.rs index 2618b0f91..a5b8ebf17 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/channel.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs b/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs index 9fb181c6b..dc73f5169 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/connection_id.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs b/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs index 5e23971fe..5ae7f1b4a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/create_client.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -9,6 +8,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::encoding_components::traits::{CanDecode, HasDefaultEncoding, HasEncodedType}; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::events::UseStarknetEvents; diff --git a/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs b/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs index b69b0a26c..83c050b18 100644 --- a/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/events/send_packet.rs @@ -1,7 +1,6 @@ use core::marker::PhantomData; use std::str::FromStr; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; @@ -11,6 +10,7 @@ use hermes_core::chain_components::traits::{ PacketFromSendPacketEventBuilderComponent, ProvideSendPacketEvent, SendPacketEventComponent, }; use hermes_core::encoding_components::traits::{CanDecode, HasEncodedType, HasEncoding}; +use hermes_prelude::*; use ibc::apps::transfer::types::{Amount, BaseDenom, Memo, PrefixedDenom, TracePath}; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; diff --git a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs index a95018d32..27a68e399 100644 --- a/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/ibc_amount.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_components::traits::{HasChannelIdType, HasPortIdType}; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; use hermes_core::test_components::chain::traits::{ IbcTransferredAmountConverter, IbcTransferredAmountConverterComponent, }; use hermes_cosmos_core::test_components::chain::types::Amount; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs b/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs index 90b26a983..130849b60 100644 --- a/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs +++ b/relayer/crates/starknet-chain-components/src/impls/json_rpc.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelTrace; +use hermes_prelude::*; use serde::{Deserialize, Serialize}; use crate::traits::json_rpc::{JsonRpcRequestSender, JsonRpcRequestSenderComponent}; 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 7c4bc9750..a45b4bb19 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/channel.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -20,6 +19,7 @@ use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEnc use hermes_cosmos_core::chain_components::types::{ CosmosCommitmentProof, CosmosInitChannelOptions, }; +use hermes_prelude::*; use ibc::core::channel::types::channel::{ChannelEnd, Order as IbcOrder}; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId as IbcPortId}; 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 c3cce3208..4f401081a 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/connection.rs @@ -3,7 +3,6 @@ use core::num::ParseIntError; use core::str::Utf8Error; use core::time::Duration; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -25,6 +24,7 @@ use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEnc use hermes_cosmos_core::chain_components::types::{ CosmosCommitmentProof, CosmosInitConnectionOptions, }; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; use ibc::core::host::types::identifiers::{ 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 c3f0a1679..24c702bd5 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::CosmosCreateClientPayload; +use hermes_prelude::*; use starknet::core::types::Felt; use starknet::macros::{selector, short_string}; diff --git a/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs b/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs index 64383f0f8..06b9b2201 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/ibc_transfer.rs @@ -1,7 +1,6 @@ use std::marker::PhantomData; use std::str::FromStr; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -12,6 +11,7 @@ use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedT use hermes_core::test_components::chain::traits::{ HasMemoType, IbcTokenTransferMessageBuilder, IbcTokenTransferMessageBuilderComponent, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::PortId; use ibc::primitives::Timestamp; use starknet::core::types::{Felt, U256}; 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 6d9bd2bbe..de609bfae 100644 --- a/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/messages/packet.rs @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -16,6 +15,7 @@ use hermes_core::chain_components::types::payloads::packet::{ use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::CosmosCommitmentProof; +use hermes_prelude::*; use ibc::apps::transfer::types::packet::PacketData as IbcIcs20PacketData; use ibc::core::channel::types::packet::Packet as IbcPacket; use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; 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 88576cac7..a8f6ac163 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::encoding_components::traits::{CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::CosmosUpdateClientPayload; +use hermes_prelude::*; use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader; use ibc_proto::Protobuf; use starknet::core::types::{ByteArray, Felt}; diff --git a/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs b/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs index 5ee37d6ba..d4e632419 100644 --- a/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs +++ b/relayer/crates/starknet-chain-components/src/impls/packet_fields.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ HasChannelIdType, HasOutgoingPacketType, PacketSrcChannelIdGetter, PacketSrcChannelIdGetterComponent, }; +use hermes_prelude::*; use ibc::core::channel::types::packet::Packet; use crate::types::channel_id::ChannelId; 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 704d798b7..4c7e2ca19 100644 --- a/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs +++ b/relayer/crates/starknet-chain-components/src/impls/packet_filter.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ HasIncomingPacketType, HasOutgoingPacketType, IncomingPacketFilter, IncomingPacketFilterComponent, OutgoingPacketFilter, OutgoingPacketFilterComponent, }; +use hermes_prelude::*; pub struct FilterStarknetPackets; 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 00fbba150..ede99a307 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,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanQueryBlock, CanQueryChainHeight, CreateClientPayloadBuilder, CreateClientPayloadBuilderComponent, HasChainId, HasCreateClientPayloadOptionsType, HasCreateClientPayloadType, }; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ChainId; 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 6ccd5bf1b..efd8806ce 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,3 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanQueryBlock, HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, UpdateClientPayloadBuilderComponent, @@ -7,6 +6,7 @@ use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaProtobuf; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::primitives::Timestamp; use ibc_client_starknet_types::header::StarknetHeader; 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 2faeae2b7..252456217 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{AckPath, Path}; use starknet::core::types::Felt; 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 ab8bc31c9..2ff971950 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/balance.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType, HasDenomType}; use hermes_core::encoding_components::traits::{CanDecode, HasEncoding}; use hermes_core::test_components::chain::traits::{BalanceQuerier, BalanceQuerierComponent}; +use hermes_prelude::*; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs index 4739d9bdc..afcf849e0 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; use hermes_cosmos_core::chain_components::types::Time; +use hermes_prelude::*; use starknet::core::types::{BlockId, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs b/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs index 2b6a49fad..5edc2b30b 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/block_events.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockEventsQuerier, BlockEventsQuerierComponent, HasEventType, HasHeightType, }; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use starknet::core::types::{BlockId, EventFilter}; use starknet::providers::{Provider, ProviderError}; 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 82895b429..27de53467 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::host::types::path::{ChannelEndPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 6946d7fc9..bb152f5ca 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::host::types::path::{ClientStatePath, Path}; use starknet::core::types::Felt; use starknet::macros::selector; 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 180296d53..9bf27ae85 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -11,6 +10,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::host::types::path::{ConnectionPath, Path}; use ibc_proto::Protobuf; use starknet::core::types::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 a28ba2439..4095d5aba 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -11,6 +10,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::client::types::Height as IbcHeight; use ibc::core::host::types::path::{ClientConsensusStatePath, Path}; use starknet::core::types::Felt; 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 fd445d97e..4c05e5665 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 @@ -1,8 +1,8 @@ use core::marker::PhantomData; use std::sync::OnceLock; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use crate::traits::queries::contract_address::{ ContractAddressQuerier, ContractAddressQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs b/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs index 462a06013..0fff36790 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/counterparty_chain_id.rs @@ -1,12 +1,12 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanQueryChainHeight, CanQueryChannelEnd, CanQueryClientState, CanQueryConnectionEnd, CounterpartyChainIdQuerier, CounterpartyChainIdQuerierComponent, HasChannelEndType, HasChannelIdType, HasClientIdType, HasClientStateFields, HasConnectionEndType, HasConnectionIdType, HasPortIdType, }; +use hermes_prelude::*; use crate::types::channel_id::ChannelEnd; use crate::types::client_id::ClientId; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs b/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs index 9d74d64e8..99d1fc2a1 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/nonce.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; +use hermes_prelude::*; use starknet::accounts::ConnectedAccount; use starknet::core::types::Felt; use starknet::providers::ProviderError; 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 26a19c4ba..6ac080254 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{CommitmentPath, Path}; use starknet::core::types::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 641f1b9c8..2556cbd3a 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -10,6 +9,7 @@ use hermes_core::chain_components::traits::{ }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use ibc::core::host::types::path::{Path, ReceiptPath}; use starknet::core::types::Felt; 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 f758dccd7..d3db87aab 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 @@ -1,6 +1,5 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::{ @@ -8,6 +7,7 @@ use hermes_core::chain_components::traits::{ HasPortIdType, HasSequenceType, PacketIsReceivedQuerier, PacketIsReceivedQuerierComponent, }; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{PortId as IbcPortId, Sequence as IbcSequence}; use starknet::core::types::Felt; use starknet::macros::selector; 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 f76d11875..e2395d846 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/status.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; use hermes_cosmos_core::chain_components::types::Time; +use hermes_prelude::*; use starknet::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs b/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs index 17e021106..5caf76414 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/storage_proof.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasHeightType; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelTrace; +use hermes_prelude::*; use serde::de::DeserializeOwned; use serde::Serialize; use starknet::core::types::{Felt, StorageProof}; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs index 749b08921..94aa3d1ca 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/create.rs @@ -1,11 +1,11 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::CanSendSingleMessage; use hermes_core::chain_type_components::traits::{HasAddressType, HasDenomType}; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_prelude::*; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs index 54fcc4980..2669421d2 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get.rs @@ -1,10 +1,10 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_type_components::traits::HasDenomType; use hermes_core::encoding_components::traits::{CanDecode, CanEncode, HasEncodedType, HasEncoding}; +use hermes_prelude::*; use poseidon::Poseidon3Hasher; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs index f6e4b339d..31e61211f 100644 --- a/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs +++ b/relayer/crates/starknet-chain-components/src/impls/queries/token_address/get_or_create.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasDenomType; +use hermes_prelude::*; use crate::impls::queries::token_address::{ CreateCosmosTokenAddressOnStarknet, GetCosmosTokenAddressOnStarknet, 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 0b4fcb2c9..657f21f0b 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,8 +1,8 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::encoding_components::traits::{CanDecode, HasEncoding}; +use hermes_prelude::*; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 4a0570177..bbac76bd0 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,5 @@ use core::fmt::Debug; -use cgp::prelude::*; use hermes_core::chain_components::traits::HasMessageType; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::relayer_components::transaction::traits::{ @@ -8,6 +7,7 @@ use hermes_core::relayer_components::transaction::traits::{ MessagesWithSignerAndNonceSender, MessagesWithSignerAndNonceSenderComponent, TxMessageResponseParser, TxMessageResponseParserComponent, }; +use hermes_prelude::*; use starknet::accounts::Account; use starknet::core::types::{ Call, ExecuteInvocation, Felt, FunctionInvocation, RevertedInvocation, TransactionTrace, 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 20dad158a..ee34e69ae 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 @@ -1,6 +1,5 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanQueryChainHeight, ConnectionOpenAckMessageBuilder, ConnectionOpenAckMessageBuilderComponent, ConnectionOpenConfirmMessageBuilder, ConnectionOpenConfirmMessageBuilderComponent, @@ -20,6 +19,7 @@ use hermes_cosmos_core::chain_components::types::{ CosmosConnectionOpenAckMessage, CosmosConnectionOpenConfirmMessage, CosmosConnectionOpenInitMessage, CosmosConnectionOpenTryMessage, CosmosInitConnectionOptions, }; +use hermes_prelude::*; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as CosmosHeight; use ibc::core::connection::types::version::Version as CosmosConnectionVersion; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs index b313116ff..8d7db2c98 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/counterparty_message_height.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CounterpartyMessageHeightGetter, CounterpartyMessageHeightGetterComponent, HasHeightType, HasMessageType, }; use hermes_cosmos_core::chain_components::traits::CosmosMessage; +use hermes_prelude::*; pub struct GetCosmosCounterpartyMessageStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs index 92239dd20..176795d68 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/create_client_message.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CreateClientMessageBuilder, CreateClientMessageBuilderComponent, HasClientStateType, HasConsensusStateType, HasCreateClientMessageOptionsType, HasCreateClientPayloadType, @@ -8,6 +7,7 @@ use hermes_core::encoding_components::traits::{CanConvert, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_core::chain_components::types::CosmosCreateClientMessage; +use hermes_prelude::*; use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs index a5f944cc4..4e3d97018 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/ibc_amount.rs @@ -1,7 +1,6 @@ use core::marker::PhantomData; use std::string::FromUtf8Error; -use cgp::prelude::*; use hermes_core::chain_components::traits::{HasChannelIdType, HasPortIdType}; use hermes_core::chain_type_components::traits::{HasAmountType, HasDenomType}; use hermes_core::test_components::chain::traits::{ @@ -9,6 +8,7 @@ use hermes_core::test_components::chain::traits::{ }; use hermes_cosmos_core::test_components::chain::impls::derive_ibc_denom; use hermes_cosmos_core::test_components::chain::types::{Amount, Denom}; +use hermes_prelude::*; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use crate::types::amount::StarknetAmount; diff --git a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs index 7a5f636a1..07f27daf3 100644 --- a/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs +++ b/relayer/crates/starknet-chain-components/src/impls/starknet_to_cosmos/packet_fields.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ HasChannelIdType, HasHeightType, HasOutgoingPacketType, PacketDstChannelIdGetter, PacketDstChannelIdGetterComponent, PacketTimeoutHeightGetter, PacketTimeoutHeightGetterComponent, }; +use hermes_prelude::*; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::TimeoutHeight; 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 f6a049425..63b802a9d 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,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ConsensusStateHeightsQuerier, ConsensusStateHeightsQuerierComponent, HasHeightType, HasIbcChainTypes, }; use hermes_cosmos_core::chain_components::traits::HasGrpcAddress; +use hermes_prelude::*; use http::uri::InvalidUri; use http::Uri; use ibc::core::host::types::identifiers::ClientId; 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 4a71a1dc6..aa4a61119 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 @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ HasIbcChainTypes, HasMessageType, HasUpdateClientPayloadType, UpdateClientMessageBuilder, UpdateClientMessageBuilderComponent, @@ -8,6 +7,7 @@ use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::traits::{CosmosMessage, ToCosmosMessage}; use hermes_cosmos_core::chain_components::types::CosmosUpdateClientMessage; use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaProtobuf; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ClientId; use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader}; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/impls/storage_proof.rs b/relayer/crates/starknet-chain-components/src/impls/storage_proof.rs index b61ca38a6..9e841276c 100644 --- a/relayer/crates/starknet-chain-components/src/impls/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/storage_proof.rs @@ -1,4 +1,4 @@ -use cgp::prelude::{CanRaiseError, HasErrorType}; +use hermes_prelude::{CanRaiseError, HasErrorType}; use indexmap::IndexMap; use starknet::core::crypto::pedersen_hash; use starknet::core::types::{ContractsProof, Felt, MerkleNode, StorageProof}; diff --git a/relayer/crates/starknet-chain-components/src/impls/transfer.rs b/relayer/crates/starknet-chain-components/src/impls/transfer.rs index 6d702d003..b3e20eb8b 100644 --- a/relayer/crates/starknet-chain-components/src/impls/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/impls/transfer.rs @@ -1,6 +1,5 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanSendSingleMessage, HasHeightType, HasTimeType, HasTimeoutType, }; @@ -9,6 +8,7 @@ use hermes_core::test_components::chain::traits::{ IbcTransferTimeoutCalculator, IbcTransferTimeoutCalculatorComponent, }; use hermes_cosmos_core::chain_components::types::Time; +use hermes_prelude::*; use ibc::primitives::Timestamp; use starknet::core::types::Felt; use starknet::macros::selector; 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 89b2722ce..f2ec35dfa 100644 --- a/relayer/crates/starknet-chain-components/src/impls/tx_response.rs +++ b/relayer/crates/starknet-chain-components/src/impls/tx_response.rs @@ -1,10 +1,10 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; use hermes_core::runtime_components::traits::{CanSleep, HasRuntime}; +use hermes_prelude::*; use starknet::core::types::{Felt, StarknetError}; use starknet::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/address.rs b/relayer/crates/starknet-chain-components/src/impls/types/address.rs index 497ba2f0b..a21e027b7 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/address.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/address.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use derive_more::{Constructor, Deref, Display, From, FromStr}; +use hermes_prelude::*; use serde::{Deserialize, Serialize}; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/amount.rs b/relayer/crates/starknet-chain-components/src/impls/types/amount.rs index 08c635bf9..a415eb14e 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/amount.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/amount.rs @@ -1,5 +1,4 @@ use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{ AmountDenomGetter, AmountDenomGetterComponent, AmountTypeProviderComponent, HasAmountType, HasDenomType, @@ -9,6 +8,7 @@ use hermes_core::test_components::chain::traits::{AmountMethodsComponent, Provid use hermes_core::test_components::chain_driver::traits::{ HasChainType, RandomAmountGenerator, RandomAmountGeneratorComponent, }; +use hermes_prelude::*; use super::address::StarknetAddress; use crate::types::amount::StarknetAmount; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/block.rs b/relayer/crates/starknet-chain-components/src/impls/types/block.rs index 02d2c38b1..7ee585c6d 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/block.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/block.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{BlockTypeComponent, ProvideBlockType}; +use hermes_prelude::*; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/client.rs b/relayer/crates/starknet-chain-components/src/impls/types/client.rs index d727ae5b3..590e4b877 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/client.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/client.rs @@ -1,11 +1,11 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, ConsensusStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, ProvideClientStateType, ProvideConsensusStateType, }; +use hermes_prelude::*; use ibc::core::host::types::identifiers::ChainId; use crate::types::client_state::WasmStarknetClientState; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs index ea0c0c0d6..512afcfa1 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/commitment_proof.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CommitmentProofBytesGetter, CommitmentProofBytesGetterComponent, CommitmentProofHeightGetter, CommitmentProofHeightGetterComponent, CommitmentProofTypeProviderComponent, HasCommitmentProofType, HasHeightType, }; +use hermes_prelude::*; use crate::types::commitment_proof::StarknetCommitmentProof; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/contract.rs b/relayer/crates/starknet-chain-components/src/impls/types/contract.rs index 579b817a9..27c17d5bf 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/contract.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/contract.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use starknet::core::types::contract::SierraClass; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/denom.rs b/relayer/crates/starknet-chain-components/src/impls/types/denom.rs index f8754a6ff..93a96e732 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/denom.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/denom.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{ DenomTypeComponent, HasAddressType, ProvideDenomType, }; +use hermes_prelude::*; pub struct ProvideTokenAddressDenom; 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 58c5b97fa..bd2b403f5 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/height.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/height.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ HasHeightType, HeightAdjuster, HeightAdjusterComponent, HeightFieldComponent, HeightFieldGetter, HeightIncrementer, HeightIncrementerComponent, HeightTypeProviderComponent, }; +use hermes_prelude::*; pub struct ProvideStarknetHeight; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/method.rs b/relayer/crates/starknet-chain-components/src/impls/types/method.rs index 6a6b8d799..0db76837c 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/method.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/method.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::traits::types::method::{ProvideSelectorType, SelectorTypeComponent}; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs b/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs index 03868b68a..0bc1ad1fd 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/payloads.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CreateClientPayloadOptionsTypeComponent, CreateClientPayloadTypeComponent, ProvideCreateClientPayloadOptionsType, ProvideCreateClientPayloadType, ProvideUpdateClientPayloadType, UpdateClientPayloadTypeComponent, }; +use hermes_prelude::*; use crate::types::payloads::client::{ StarknetCreateClientPayload, StarknetCreateClientPayloadOptions, StarknetUpdateClientPayload, diff --git a/relayer/crates/starknet-chain-components/src/impls/types/status.rs b/relayer/crates/starknet-chain-components/src/impls/types/status.rs index 20b7bf2d3..9645617cb 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/status.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/status.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusTypeComponent, HasHeightType, ProvideChainStatusType, }; use hermes_core::chain_type_components::traits::HasTimeType; use hermes_cosmos_core::chain_components::types::Time; +use hermes_prelude::*; use crate::types::status::StarknetChainStatus; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs b/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs index e44ecd118..ca4e40077 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/timestamp.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{ProvideTimeType, TimeTypeComponent}; +use hermes_prelude::*; pub struct ProvideStarknetTimeType; diff --git a/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs b/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs index 6f11d3f28..7c97816de 100644 --- a/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs +++ b/relayer/crates/starknet-chain-components/src/impls/types/wallet.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::relayer_components::transaction::traits::HasSignerType; use hermes_core::test_components::chain::traits::{ HasWalletType, ProvideWalletType, WalletSignerComponent, WalletSignerProvider, WalletTypeComponent, }; +use hermes_prelude::*; use crate::impls::types::address::StarknetAddress; use crate::types::wallet::StarknetWallet; diff --git a/relayer/crates/starknet-chain-components/src/traits/account.rs b/relayer/crates/starknet-chain-components/src/traits/account.rs index 59de411d4..0ec750c5a 100644 --- a/relayer/crates/starknet-chain-components/src/traits/account.rs +++ b/relayer/crates/starknet-chain-components/src/traits/account.rs @@ -1,6 +1,6 @@ use cgp::core::macros::blanket_trait; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::HasSignerType; +use hermes_prelude::*; use starknet::accounts::{Account, AccountError, ConnectedAccount}; #[cgp_type { diff --git a/relayer/crates/starknet-chain-components/src/traits/client.rs b/relayer/crates/starknet-chain-components/src/traits/client.rs index 52d6cc639..77638d8f5 100644 --- a/relayer/crates/starknet-chain-components/src/traits/client.rs +++ b/relayer/crates/starknet-chain-components/src/traits/client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { provider: StarknetClientTypeProvider, diff --git a/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs b/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs index 51dffd429..fdae186e6 100644 --- a/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/commitment_proof.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::traits::types::commitment::HasMerkleProofType; 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 e7dde8da7..fffc9907b 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/call.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/call.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasHeightType}; +use hermes_prelude::*; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; 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 add5f22fb..b6d8b1cb9 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/declare.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/declare.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::traits::types::contract_class::{HasContractClassHashType, HasContractClassType}; 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 8ac711b18..fb695137a 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/deploy.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use crate::traits::types::blob::HasBlobType; use crate::traits::types::contract_class::HasContractClassHashType; 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 bff0615d8..85f533f83 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/invoke.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasMessageResponseType}; +use hermes_prelude::*; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; diff --git a/relayer/crates/starknet-chain-components/src/traits/contract/message.rs b/relayer/crates/starknet-chain-components/src/traits/contract/message.rs index 7d09176ad..7a9139099 100644 --- a/relayer/crates/starknet-chain-components/src/traits/contract/message.rs +++ b/relayer/crates/starknet-chain-components/src/traits/contract/message.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasMessageType; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use crate::traits::types::blob::HasBlobType; use crate::traits::types::method::HasSelectorType; diff --git a/relayer/crates/starknet-chain-components/src/traits/json_rpc.rs b/relayer/crates/starknet-chain-components/src/traits/json_rpc.rs index 2c1f4d50d..c58671a91 100644 --- a/relayer/crates/starknet-chain-components/src/traits/json_rpc.rs +++ b/relayer/crates/starknet-chain-components/src/traits/json_rpc.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { provider: JsonRpcRequestSender, 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 813f4379a..b2712e043 100644 --- a/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/messages/transfer.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasMessageType; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; #[cgp_component { name: TransferTokenMessageBuilderComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/proof_signer.rs b/relayer/crates/starknet-chain-components/src/traits/proof_signer.rs index a31ca34ca..108a1e88c 100644 --- a/relayer/crates/starknet-chain-components/src/traits/proof_signer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/proof_signer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type { provider: StarknetProofSignerTypeProvider, diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs index 2e57c9c45..7f81f8520 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/contract_address.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; #[cgp_component { name: ContractAddressQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs b/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs index 729326d82..5c194239e 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/storage_proof.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasHeightType; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use crate::traits::types::storage_proof::{HasStorageKeyType, HasStorageProofType}; diff --git a/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs b/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs index 6606ca799..f6e8460cd 100644 --- a/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs +++ b/relayer/crates/starknet-chain-components/src/traits/queries/token_address.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasDenomType; +use hermes_prelude::*; use crate::types::messages::ibc::denom::PrefixedDenom; 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 44ad5546a..e543aa46f 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 @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; #[cgp_component { name: TokenBalanceQuerierComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/rpc_client.rs b/relayer/crates/starknet-chain-components/src/traits/rpc_client.rs index 4db360342..ff0e8d287 100644 --- a/relayer/crates/starknet-chain-components/src/traits/rpc_client.rs +++ b/relayer/crates/starknet-chain-components/src/traits/rpc_client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use reqwest::Client; use url::Url; diff --git a/relayer/crates/starknet-chain-components/src/traits/signer.rs b/relayer/crates/starknet-chain-components/src/traits/signer.rs index 93f2f8ba1..bcad324ca 100644 --- a/relayer/crates/starknet-chain-components/src/traits/signer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/signer.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use hermes_core::relayer_components::transaction::traits::HasSignerType; #[cgp_getter { diff --git a/relayer/crates/starknet-chain-components/src/traits/transfer.rs b/relayer/crates/starknet-chain-components/src/traits/transfer.rs index b4fc2cddb..5a1a7aadc 100644 --- a/relayer/crates/starknet-chain-components/src/traits/transfer.rs +++ b/relayer/crates/starknet-chain-components/src/traits/transfer.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; +use hermes_prelude::*; #[cgp_component { name: TokenTransferComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/types/blob.rs b/relayer/crates/starknet-chain-components/src/traits/types/blob.rs index 2dd99e453..62540f368 100644 --- a/relayer/crates/starknet-chain-components/src/traits/types/blob.rs +++ b/relayer/crates/starknet-chain-components/src/traits/types/blob.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasBlobType: Async { diff --git a/relayer/crates/starknet-chain-components/src/traits/types/commitment.rs b/relayer/crates/starknet-chain-components/src/traits/types/commitment.rs index 44067786a..70fab3a82 100644 --- a/relayer/crates/starknet-chain-components/src/traits/types/commitment.rs +++ b/relayer/crates/starknet-chain-components/src/traits/types/commitment.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; /** A Starknet Merkle proof is a part of the larger storage proof, diff --git a/relayer/crates/starknet-chain-components/src/traits/types/contract_class.rs b/relayer/crates/starknet-chain-components/src/traits/types/contract_class.rs index 7c80d0e06..f3f6a60c5 100644 --- a/relayer/crates/starknet-chain-components/src/traits/types/contract_class.rs +++ b/relayer/crates/starknet-chain-components/src/traits/types/contract_class.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_type] pub trait HasContractClassType: Async { diff --git a/relayer/crates/starknet-chain-components/src/traits/types/method.rs b/relayer/crates/starknet-chain-components/src/traits/types/method.rs index 3548fa2df..1b0bd44b1 100644 --- a/relayer/crates/starknet-chain-components/src/traits/types/method.rs +++ b/relayer/crates/starknet-chain-components/src/traits/types/method.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[cgp_component { name: SelectorTypeComponent, diff --git a/relayer/crates/starknet-chain-components/src/traits/types/storage_proof.rs b/relayer/crates/starknet-chain-components/src/traits/types/storage_proof.rs index 74d148ac6..0c2af3dc7 100644 --- a/relayer/crates/starknet-chain-components/src/traits/types/storage_proof.rs +++ b/relayer/crates/starknet-chain-components/src/traits/types/storage_proof.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; /** A storage proof contains multiple Merkle proofs that are relative to the global state root. diff --git a/relayer/crates/starknet-chain-components/src/types/channel_id.rs b/relayer/crates/starknet-chain-components/src/types/channel_id.rs index 85b0ef35f..381f83fd3 100644 --- a/relayer/crates/starknet-chain-components/src/types/channel_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/channel_id.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub use ibc::core::channel::types::channel::{ ChannelEnd, Counterparty as ChannelCounterparty, State as ChannelState, }; diff --git a/relayer/crates/starknet-chain-components/src/types/client_id.rs b/relayer/crates/starknet-chain-components/src/types/client_id.rs index df8aadba3..f5c1c8c88 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_id.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub use ibc::core::host::types::identifiers::ClientId; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/types/client_state.rs b/relayer/crates/starknet-chain-components/src/types/client_state.rs index c5caef63e..ab4d4644b 100644 --- a/relayer/crates/starknet-chain-components/src/types/client_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/client_state.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvert, CanDecode, CanEncode, Converter, ConverterComponent, HasEncodedType, }; use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaAny; use hermes_cosmos_core::wasm_encoding_components::types::WasmClientState; +use hermes_prelude::*; pub use ibc_client_starknet_types::StarknetClientState; use prost_types::Any; diff --git a/relayer/crates/starknet-chain-components/src/types/connection_id.rs b/relayer/crates/starknet-chain-components/src/types/connection_id.rs index 2dd778d2a..5459cf302 100644 --- a/relayer/crates/starknet-chain-components/src/types/connection_id.rs +++ b/relayer/crates/starknet-chain-components/src/types/connection_id.rs @@ -1,11 +1,11 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, TransformerRef, }; +use hermes_prelude::*; pub use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; 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 b259a338d..a7de48a76 100644 --- a/relayer/crates/starknet-chain-components/src/types/consensus_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/consensus_state.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{Converter, ConverterComponent}; use hermes_cosmos_core::wasm_encoding_components::impls::{ DecodeViaWasmConsensusState, EncodeViaWasmConsensusState, }; +use hermes_prelude::*; pub use ibc_client_starknet_types::StarknetConsensusState; use prost_types::Any; 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 15c5d9251..3beea1f1e 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,6 @@ use core::time::Duration; use cgp::core::types::WithType; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ClientStateFieldsComponent, ClientStateFieldsGetter, ClientStateTypeComponent, HasChainIdType, HasClientStateType, HasHeightType, @@ -9,6 +8,7 @@ use hermes_core::chain_components::traits::{ use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; use ibc::clients::tendermint::types::{ AllowUpdate, ClientState as IbcCometClientState, TrustThreshold, }; diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/consensus_state.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/consensus_state.rs index afb0a5c9f..be308cc8e 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/consensus_state.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/consensus_state.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; #[derive(Debug, HasField, HasFields)] pub struct CometConsensusState { diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs index 589b42d7d..630bd3c22 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/height.rs @@ -1,9 +1,9 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_core::encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; use hermes_core::encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, }; +use hermes_prelude::*; #[derive(Debug, Clone, HasField)] pub struct Height { diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs index 09ca05165..1355a5416 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/timestamp.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub use ibc::primitives::Timestamp; pub struct EncodeTimestamp; diff --git a/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs b/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs index 4c7edea9d..b58eeb5ef 100644 --- a/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs +++ b/relayer/crates/starknet-chain-components/src/types/cosmos/update.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, TransformerRef, }; +use hermes_prelude::*; use ibc::clients::tendermint::types::Header as TendermintLcHeader; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as IbcHeight; 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 2b2af6fa0..ecd1e0e7a 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/channel.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/channel.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; +use hermes_prelude::*; use starknet::core::types::Felt; use starknet::macros::selector; 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 53d29a443..e717ba765 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/connection.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/connection.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; +use hermes_prelude::*; use starknet::core::types::Felt; use starknet::macros::selector; 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 41ef3ab7b..c3f008e91 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/erc20.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/erc20.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; +use hermes_prelude::*; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 803a211ab..76b38c53f 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/ics20.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/ics20.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; +use hermes_prelude::*; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; 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 a60edd9ed..09f44ccd5 100644 --- a/relayer/crates/starknet-chain-components/src/types/events/packet.rs +++ b/relayer/crates/starknet-chain-components/src/types/events/packet.rs @@ -1,9 +1,9 @@ -use cgp::prelude::{CanRaiseAsyncError, *}; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::traits::{ CanDecode, Decoder, DecoderComponent, HasEncodedType, HasEncoding, }; +use hermes_prelude::{CanRaiseAsyncError, *}; use starknet::core::types::Felt; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/types/message_response.rs b/relayer/crates/starknet-chain-components/src/types/message_response.rs index 44886bf7a..8487df283 100644 --- a/relayer/crates/starknet-chain-components/src/types/message_response.rs +++ b/relayer/crates/starknet-chain-components/src/types/message_response.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasEventType; use hermes_core::chain_type_components::traits::{ HasMessageResponseType, MessageResponseEventsGetter, MessageResponseEventsGetterComponent, MessageResponseTypeComponent, ProvideMessageResponseType, }; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::types::event::StarknetEvent; diff --git a/relayer/crates/starknet-chain-components/src/types/message_responses/create_client.rs b/relayer/crates/starknet-chain-components/src/types/message_responses/create_client.rs index c5fc6da23..1b0e70d0a 100644 --- a/relayer/crates/starknet-chain-components/src/types/message_responses/create_client.rs +++ b/relayer/crates/starknet-chain-components/src/types/message_responses/create_client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::types::client_id::ClientId; use crate::types::cosmos::height::Height; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/erc20/deploy.rs b/relayer/crates/starknet-chain-components/src/types/messages/erc20/deploy.rs index 8f43c9b56..647d98b56 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/erc20/deploy.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/erc20/deploy.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use crate::impls::types::address::StarknetAddress; #[derive(HasField, HasFields)] 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 3529aae81..3550fa7e4 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 @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::chain_components::traits::HasMessageType; use hermes_core::chain_type_components::traits::{HasAddressType, HasAmountType}; use hermes_core::encoding_components::traits::{CanEncode, HasEncoding}; +use hermes_prelude::*; use starknet::core::types::{Felt, U256}; use starknet::macros::selector; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs index ba51f1bbf..332123c68 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/channel.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cairo_encoding_components::impls::encode_mut::variant_from::EncodeVariantFrom; use hermes_core::encoding_components::traits::{ MutDecoderComponent, MutEncoderComponent, Transformer, TransformerRef, }; +use hermes_prelude::*; pub use ibc::core::channel::types::channel::Order as ChannelOrdering; pub use ibc::core::channel::types::Version as AppVersion; pub use ibc::core::host::types::identifiers::PortId; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs index 801832bc7..df1b09e7e 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/connection.rs @@ -1,9 +1,9 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, }; +use hermes_prelude::*; pub use ibc::core::commitment_types::commitment::CommitmentPrefix as BasePrefix; pub use ibc::core::connection::types::version::Version as ConnectionVersion; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/denom.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/denom.rs index 49594cb43..d4793168a 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/denom.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/denom.rs @@ -1,7 +1,7 @@ use std::fmt::Display; use std::str::FromStr; -use cgp::prelude::*; +use hermes_prelude::*; use ibc::apps::transfer::types::PrefixedDenom as IbcPrefixedDenom; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/ibc_transfer.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/ibc_transfer.rs index df753dd84..329b57691 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/ibc_transfer.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/ibc_transfer.rs @@ -1,6 +1,6 @@ use std::fmt::Display; -use cgp::prelude::*; +use hermes_prelude::*; use starknet::core::types::U256; use super::channel::PortId; diff --git a/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs b/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs index 9383a4a3a..a98a290b0 100644 --- a/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs +++ b/relayer/crates/starknet-chain-components/src/types/messages/ibc/packet.rs @@ -1,10 +1,10 @@ use cgp::core::component::UseContext; -use cgp::prelude::*; use hermes_core::encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField}; use hermes_core::encoding_components::traits::{ CanDecodeMut, CanEncodeMut, MutDecoder, MutDecoderComponent, MutEncoder, MutEncoderComponent, Transformer, }; +use hermes_prelude::*; pub use ibc::core::host::types::identifiers::Sequence; use starknet::core::types::Felt; diff --git a/relayer/crates/starknet-chain-components/src/types/payloads/client.rs b/relayer/crates/starknet-chain-components/src/types/payloads/client.rs index 28195a9b9..c67bfdfd5 100644 --- a/relayer/crates/starknet-chain-components/src/types/payloads/client.rs +++ b/relayer/crates/starknet-chain-components/src/types/payloads/client.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::ChainId; use ibc_client_starknet_types::header::StarknetHeader; diff --git a/relayer/crates/starknet-chain-components/src/types/register.rs b/relayer/crates/starknet-chain-components/src/types/register.rs index 6b8c02594..65427efac 100644 --- a/relayer/crates/starknet-chain-components/src/types/register.rs +++ b/relayer/crates/starknet-chain-components/src/types/register.rs @@ -1,4 +1,4 @@ -use cgp::prelude::*; +use hermes_prelude::*; use starknet::core::types::Felt; use crate::impls::types::address::StarknetAddress; diff --git a/relayer/crates/starknet-chain-context/src/contexts/chain.rs b/relayer/crates/starknet-chain-context/src/contexts/chain.rs index 90fa35b86..aac8435a8 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/chain.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/chain.rs @@ -5,7 +5,6 @@ use std::sync::{Arc, OnceLock}; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::WithField; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; @@ -78,6 +77,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; use hermes_starknet_chain_components::components::starknet_to_cosmos::StarknetToCosmosComponents; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; 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 edd311bc4..754a898af 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/cairo.rs @@ -4,7 +4,6 @@ use core::time::Duration; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::impls::GetDefaultEncoding; @@ -15,6 +14,7 @@ use hermes_core::encoding_components::traits::{ }; use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::error::types::HermesError; +use hermes_prelude::*; use hermes_starknet_chain_components::components::encoding::cairo::*; use hermes_starknet_chain_components::types::channel_id::{ChannelEnd, ChannelId}; use hermes_starknet_chain_components::types::client_id::ClientId; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs index 2620db728..8d7bed68d 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/event.rs @@ -3,7 +3,6 @@ use std::sync::OnceLock; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_core::encoding_components::traits::{ @@ -11,6 +10,7 @@ use hermes_core::encoding_components::traits::{ EncodingTypeProviderComponent, HasEncodedType, HasEncoding, }; use hermes_cosmos::error::impls::UseHermesError; +use hermes_prelude::*; use hermes_starknet_chain_components::components::encoding::event::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::types::event::StarknetEvent; diff --git a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs index 9410dbb93..73d70f567 100644 --- a/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs +++ b/relayer/crates/starknet-chain-context/src/contexts/encoding/protobuf.rs @@ -1,6 +1,5 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::encoding_components::traits::{ CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut, }; @@ -8,6 +7,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::protobuf_encoding_components::types::any::Any; use hermes_cosmos::protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf}; use hermes_cosmos::wasm_encoding_components::types::{WasmClientState, WasmConsensusState}; +use hermes_prelude::*; use hermes_starknet_chain_components::components::encoding::protobuf::*; use hermes_starknet_chain_components::types::client_state::{ StarknetClientState, WasmStarknetClientState, diff --git a/relayer/crates/starknet-chain-context/src/impls/build_account.rs b/relayer/crates/starknet-chain-context/src/impls/build_account.rs index 1f22d96f7..5733c717a 100644 --- a/relayer/crates/starknet-chain-context/src/impls/build_account.rs +++ b/relayer/crates/starknet-chain-context/src/impls/build_account.rs @@ -1,9 +1,9 @@ use core::str::FromStr; use std::sync::Arc; -use cgp::prelude::*; use hermes_core::chain_components::traits::HasChainId; use hermes_core::relayer_components::transaction::traits::HasSignerType; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::account::{ AccountFromSignerBuilder, AccountFromSignerBuilderComponent, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-chain-context/src/impls/error.rs b/relayer/crates/starknet-chain-context/src/impls/error.rs index 1ba600040..fe916712d 100644 --- a/relayer/crates/starknet-chain-context/src/impls/error.rs +++ b/relayer/crates/starknet-chain-context/src/impls/error.rs @@ -5,7 +5,6 @@ use core::str::Utf8Error; use std::string::FromUtf8Error; use cairo_lang_starknet_classes::casm_contract_class::StarknetSierraCompilationError; -use cgp::prelude::*; use eyre::Report; use hermes_cairo_encoding_components::impls::encode_mut::bool::DecodeBoolError; use hermes_cairo_encoding_components::impls::encode_mut::end::NonEmptyBuffer; @@ -30,6 +29,7 @@ use hermes_cosmos::protobuf_encoding_components::impls::{ InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType, }; use hermes_cosmos::runtime::types::error::TokioRuntimeError; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::error::account::RaiseAccountError; use hermes_starknet_chain_components::impls::error::provider::RaiseProviderError; use hermes_starknet_chain_components::impls::error::starknet::RaiseStarknetError; diff --git a/relayer/crates/starknet-cli/src/commands/all.rs b/relayer/crates/starknet-cli/src/commands/all.rs index 184929b25..482effab5 100644 --- a/relayer/crates/starknet-cli/src/commands/all.rs +++ b/relayer/crates/starknet-cli/src/commands/all.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; use crate::commands::bootstrap::BootstrapSubCommand; use crate::commands::create::subcommand::CreateSubCommand; diff --git a/relayer/crates/starknet-cli/src/commands/bootstrap.rs b/relayer/crates/starknet-cli/src/commands/bootstrap.rs index 3e2397d7a..13b3dafff 100644 --- a/relayer/crates/starknet-cli/src/commands/bootstrap.rs +++ b/relayer/crates/starknet-cli/src/commands/bootstrap.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; use crate::impls::bootstrap::osmosis_chain::BootstrapOsmosisChainArgs; use crate::impls::bootstrap::starknet_chain::BootstrapStarknetChainArgs; diff --git a/relayer/crates/starknet-cli/src/commands/create/subcommand.rs b/relayer/crates/starknet-cli/src/commands/create/subcommand.rs index 05bf8ee1d..7a1bc9a98 100644 --- a/relayer/crates/starknet-cli/src/commands/create/subcommand.rs +++ b/relayer/crates/starknet-cli/src/commands/create/subcommand.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_cli::commands::{CreateChannelArgs, CreateCosmosClientArgs}; use hermes_cli_components::impls::CreateConnectionArgs; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; use crate::impls::create_client::CreateStarknetClientArgs; diff --git a/relayer/crates/starknet-cli/src/commands/query/subcommand.rs b/relayer/crates/starknet-cli/src/commands/query/subcommand.rs index e173060de..b3aa235d6 100644 --- a/relayer/crates/starknet-cli/src/commands/query/subcommand.rs +++ b/relayer/crates/starknet-cli/src/commands/query/subcommand.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cli_components::impls::{ QueryBalanceArgs, QueryChainStatusArgs, QueryClientStateArgs, QueryConsensusStateArgs, }; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; #[derive(Debug, clap::Subcommand)] pub enum QuerySubCommand { diff --git a/relayer/crates/starknet-cli/src/commands/start.rs b/relayer/crates/starknet-cli/src/commands/start.rs index cc402ffa2..91506cdab 100644 --- a/relayer/crates/starknet-cli/src/commands/start.rs +++ b/relayer/crates/starknet-cli/src/commands/start.rs @@ -1,7 +1,7 @@ use cgp::core::field::Index; -use cgp::prelude::*; use hermes_cli_components::impls::{RunStartRelayerCommand, StartRelayerArgs}; use hermes_cli_components::traits::{CommandRunner, CommandRunnerComponent, HasOutputType}; +use hermes_prelude::*; #[derive(Debug, clap::Subcommand)] pub enum StartSubCommand { diff --git a/relayer/crates/starknet-cli/src/commands/update/subcommand.rs b/relayer/crates/starknet-cli/src/commands/update/subcommand.rs index 9b5f28702..b839259ed 100644 --- a/relayer/crates/starknet-cli/src/commands/update/subcommand.rs +++ b/relayer/crates/starknet-cli/src/commands/update/subcommand.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_cli_components::impls::UpdateClientArgs; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; #[derive(Debug, clap::Subcommand)] pub enum UpdateSubCommand { diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index 3ab88fdee..ef56bae87 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -4,7 +4,6 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::Index; use cgp::core::types::WithType; -use cgp::prelude::*; use hermes_cli::commands::{CreateChannelArgs, CreateCosmosClientArgs}; use hermes_cli::impls::ParseInitCosmosChannelOptions; use hermes_cli_components::impls::{ @@ -33,6 +32,7 @@ use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::config::{ StarknetChainConfig, StarknetContractAddresses, StarknetContractClasses, StarknetRelayerConfig, diff --git a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs index d622fe207..e87ddbb62 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/osmosis_chain.rs @@ -1,10 +1,10 @@ use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; use hermes_cosmos::chain_components::types::{DynamicGasConfig, EipQueryType}; use hermes_cosmos::error::HermesError; use hermes_cosmos::relayer::contexts::CosmosBuilder; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_integration_tests::contexts::osmosis_bootstrap::OsmosisBootstrap; use hermes_starknet_integration_tests::utils::load_wasm_client; use tracing::info; 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 bf41ff6ea..bcb2d0c27 100644 --- a/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs +++ b/relayer/crates/starknet-cli/src/impls/bootstrap/starknet_chain.rs @@ -1,10 +1,10 @@ use std::sync::Arc; -use cgp::prelude::*; use hermes_cli_components::traits::{BootstrapLoader, BootstrapLoaderComponent, HasBootstrapType}; use hermes_core::runtime_components::traits::{CanReadFileAsString, HasRuntime}; use hermes_cosmos::runtime::types::error::TokioRuntimeError; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_integration_tests::contexts::starknet_bootstrap::{ StarknetBootstrap, StarknetBootstrapFields, }; diff --git a/relayer/crates/starknet-cli/src/impls/build.rs b/relayer/crates/starknet-cli/src/impls/build.rs index 9e6a5a327..8f0ff4736 100644 --- a/relayer/crates/starknet-cli/src/impls/build.rs +++ b/relayer/crates/starknet-cli/src/impls/build.rs @@ -1,10 +1,10 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{ BuilderLoader, BuilderLoaderComponent, CanLoadConfig, HasBuilderType, HasConfigType, }; use hermes_core::runtime_components::traits::HasRuntime; use hermes_cosmos::relayer::contexts::CosmosBuilder; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-cli/src/impls/create_client.rs b/relayer/crates/starknet-cli/src/impls/create_client.rs index 57ddbceaa..806721664 100644 --- a/relayer/crates/starknet-cli/src/impls/create_client.rs +++ b/relayer/crates/starknet-cli/src/impls/create_client.rs @@ -1,12 +1,12 @@ use core::time::Duration; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_cli::commands::CreateCosmosClientArgs; use hermes_cli_components::impls::{CreateClientOptionsParser, CreateClientOptionsParserComponent}; use hermes_cosmos::chain_components::types::CosmosCreateClientOptions; use hermes_cosmos::error::HermesError; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_prelude::*; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hex::FromHex; diff --git a/relayer/crates/starknet-cli/src/impls/error.rs b/relayer/crates/starknet-cli/src/impls/error.rs index a829bc5fb..460f0e494 100644 --- a/relayer/crates/starknet-cli/src/impls/error.rs +++ b/relayer/crates/starknet-cli/src/impls/error.rs @@ -5,13 +5,13 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ ErrorRaiser, ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent, }; -use cgp::prelude::*; use eyre::Report; use hermes_core::relayer_components::error::traits::RetryableErrorComponent; use hermes_cosmos::error::handlers::{DisplayError, HandleInfallible, ReportError, ReturnError}; use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::error::types::Error; use hermes_cosmos::runtime::types::error::TokioRuntimeError; +use hermes_prelude::*; use ibc::core::channel::types::error::ChannelError; use ibc::core::host::types::error::{DecodingError, IdentifierError}; use starknet_types_core::felt::FromStrError; 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 5328f7652..12f01fd01 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/chain_driver.rs @@ -4,7 +4,6 @@ use std::path::PathBuf; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; @@ -17,6 +16,7 @@ use hermes_core::test_components::chain_driver::traits::{ }; use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; use hermes_starknet_chain_components::types::wallet::StarknetWallet; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs index 0464c1d8c..efb53d141 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/cosmos_starknet_relay_driver.rs @@ -1,7 +1,6 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::extra::run::CanRun; -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::{ BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, }; @@ -15,6 +14,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::error::Error; use hermes_cosmos::integration_tests::contexts::AbortOnDrop; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_prelude::*; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::cosmos_starknet_birelay::CosmosStarknetBiRelay; use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; 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 14545150e..70588c737 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/osmosis_bootstrap.rs @@ -1,7 +1,6 @@ use std::path::PathBuf; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, @@ -41,6 +40,7 @@ use hermes_cosmos_core::wasm_test_components::impls::bootstrap::{ use hermes_cosmos_core::wasm_test_components::traits::bootstrap::{ GovernanceProposalAuthorityGetterComponent, WasmClientByteCodeGetterComponent, }; +use hermes_prelude::*; /** A bootstrap context for bootstrapping a new Cosmos chain, and builds diff --git a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs index 45f428e3b..87141a5c8 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/setup.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/setup.rs @@ -1,6 +1,5 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::BiRelayTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::chain_at::ChainTypeProviderAtComponent; use hermes_core::relayer_components::multi::traits::relay_at::RelayTypeProviderAtComponent; @@ -25,6 +24,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::integration_tests::impls::UseCosmosInitChannelOptions; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_prelude::*; use hermes_starknet_chain_components::types::payloads::client::StarknetCreateClientPayloadOptions; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs index c0d9ccd27..98b3bd4e8 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_bootstrap.rs @@ -4,7 +4,6 @@ use std::sync::Arc; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, @@ -20,6 +19,7 @@ use hermes_cosmos::test_components::bootstrap::traits::{ ChainGenesisConfigTypeComponent, ChainNodeConfigTypeComponent, ChainStoreDirGetterComponent, }; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use hermes_starknet_test_components::impls::bootstrap::bootstrap_chain::BootstrapStarknetDevnet; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs index a01f92f71..f3778bd0d 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/starknet_cosmos_relay_driver.rs @@ -1,7 +1,6 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; use cgp::extra::run::CanRun; -use cgp::prelude::*; use hermes_core::relayer_components::multi::traits::birelay_at::{ BiRelayGetterAtComponent, BiRelayTypeProviderAtComponent, }; @@ -15,6 +14,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::error::Error; use hermes_cosmos::integration_tests::contexts::AbortOnDrop; use hermes_cosmos::relayer::contexts::CosmosChain; +use hermes_prelude::*; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_relayer::contexts::cosmos_to_starknet_relay::CosmosToStarknetRelay; use hermes_starknet_relayer::contexts::starknet_cosmos_birelay::StarknetCosmosBiRelay; diff --git a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs index c02dd128b..6213a93b6 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/test_driver.rs @@ -1,6 +1,5 @@ use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::Index; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::relayer_components::multi::traits::birelay_at::{ BiRelayTypeProviderAtComponent, HasBiRelayTypeAt, @@ -24,6 +23,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::integration_tests::contexts::CosmosChainDriver; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_starknet_chain_components::types::channel_id::ChannelId; use hermes_starknet_chain_components::types::connection_id::ConnectionId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; diff --git a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs index 5ba84d957..b1b90923d 100644 --- a/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/impls/build_bootstrap.rs @@ -3,7 +3,6 @@ use alloc::sync::Arc; use std::sync::OnceLock; use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; use hermes_core::test_components::chain::traits::HasWalletType; @@ -16,6 +15,7 @@ use hermes_cosmos::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; +use hermes_prelude::*; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; use hermes_starknet_test_components::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs index 3cb56235e..cb5be8baf 100644 --- a/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs +++ b/relayer/crates/starknet-integration-tests/src/utils/init_setup.rs @@ -1,7 +1,7 @@ -use cgp::prelude::CanRaiseError; use hermes_core::test_components::setup::traits::CanBuildTestDriver; use hermes_cosmos::error::Error; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::CanRaiseError; use hermes_starknet_relayer::contexts::builder::StarknetBuilder; use crate::contexts::setup::StarknetTestSetup; diff --git a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs index abe4f0f75..1b7b2cacf 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/bootstrap.rs @@ -4,7 +4,6 @@ use std::sync::Arc; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, @@ -19,6 +18,7 @@ use hermes_cosmos_core::test_components::bootstrap::traits::{ }; use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_test_components::impls::bootstrap_madara::{ BootstrapMadara, StartMadaraSequencer, diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs index bba16f00a..43592d396 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain.rs @@ -5,7 +5,6 @@ use std::sync::{Arc, OnceLock}; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::WithField; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; @@ -30,6 +29,7 @@ use hermes_core::runtime_components::traits::{ use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::commitment_proof::{ VerifyStarknetMerkleProof, VerifyStarknetStorageProof, diff --git a/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs b/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs index 84fd687a8..d92ef9d74 100644 --- a/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/contexts/chain_driver.rs @@ -4,7 +4,6 @@ use std::path::PathBuf; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ RuntimeGetterComponent, RuntimeTypeProviderComponent, }; @@ -16,6 +15,7 @@ use hermes_core::test_components::chain_driver::traits::{ WalletGetterComponent, }; use hermes_error::impls::UseHermesError; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::amount::UseU256Amount; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_account.rs b/relayer/crates/starknet-madara-tests/src/impls/build_account.rs index 88a32a5c5..176ee5f14 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_account.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_account.rs @@ -1,9 +1,9 @@ use core::str::FromStr; use std::sync::Arc; -use cgp::prelude::*; use hermes_core::chain_components::traits::HasChainId; use hermes_core::relayer_components::transaction::traits::HasSignerType; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::account::{ AccountFromSignerBuilder, AccountFromSignerBuilderComponent, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs index f7602a726..7bb01cebf 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/build_chain_driver.rs @@ -3,7 +3,6 @@ use alloc::sync::Arc; use std::sync::OnceLock; use cgp::extra::runtime::HasRuntime; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::runtime_components::traits::{CanCreateDir, CanSleep, CanWriteStringToFile}; use hermes_core::test_components::chain::traits::HasWalletType; @@ -14,6 +13,7 @@ use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; +use hermes_prelude::*; use hermes_runtime::types::error::TokioRuntimeError; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::types::wallet::StarknetWallet; diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs index e5c7d0f9e..0a3ec6da0 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/call.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::HasHeightType; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::contract::call::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs index 6a7228274..1174dba0c 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/declare.rs @@ -5,8 +5,8 @@ use cairo_lang_starknet_classes::casm_contract_class::{ }; use cairo_lang_starknet_classes::contract_class::ContractClass; use cgp::core::error::CanRaiseAsyncError; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::account::CanBuildAccountFromSigner; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::contract::declare::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs b/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs index 2cd8ad3fb..620b91efe 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/contract/deploy.rs @@ -1,6 +1,6 @@ -use cgp::prelude::*; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::relayer_components::transaction::traits::{CanPollTxResponse, HasDefaultSigner}; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::account::CanBuildAccountFromSigner; use hermes_starknet_chain_components::traits::contract::deploy::{ diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/account.rs b/relayer/crates/starknet-madara-tests/src/impls/error/account.rs index 49f5ab6fa..56b1db44a 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/account.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/account.rs @@ -1,7 +1,7 @@ use core::fmt::Debug; use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use starknet_v13::accounts::AccountError; use starknet_v13::providers::ProviderError; diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs index e9919579c..3bb0add53 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/handler.rs @@ -5,7 +5,6 @@ use core::str::Utf8Error; use std::string::FromUtf8Error; use cairo_lang_starknet_classes::casm_contract_class::StarknetSierraCompilationError; -use cgp::prelude::*; use eyre::Report; use hermes_cairo_encoding_components::impls::encode_mut::bool::DecodeBoolError; use hermes_cairo_encoding_components::impls::encode_mut::end::NonEmptyBuffer; @@ -29,6 +28,7 @@ use hermes_error::handlers::{ DebugError, DisplayError, HandleInfallible, ReportError, ReturnError, }; use hermes_error::types::Error; +use hermes_prelude::*; use hermes_runtime::types::error::TokioRuntimeError; use hermes_starknet_chain_components::impls::queries::consensus_state::ConsensusStateNotFound; use hermes_starknet_chain_components::impls::queries::contract_address::ContractAddressNotFound; diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/provider.rs b/relayer/crates/starknet-madara-tests/src/impls/error/provider.rs index 88a9299ba..6029ce257 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/provider.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/provider.rs @@ -1,5 +1,5 @@ use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use starknet_v13::core::types::StarknetError; use starknet_v13::providers::ProviderError; diff --git a/relayer/crates/starknet-madara-tests/src/impls/error/starknet.rs b/relayer/crates/starknet-madara-tests/src/impls/error/starknet.rs index 441a55e36..a5e333a6d 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/error/starknet.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/error/starknet.rs @@ -1,5 +1,5 @@ use cgp::core::error::{ErrorRaiser, ErrorRaiserComponent}; -use cgp::prelude::*; +use hermes_prelude::*; use starknet_v13::core::types::StarknetError; pub struct RaiseStarknetError; diff --git a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs index cf89c3969..a8f448396 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/payload_builders/update_client.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanQueryBlock, HasClientStateType, HasHeightType, HasUpdateClientPayloadType, UpdateClientPayloadBuilder, UpdateClientPayloadBuilderComponent, @@ -7,6 +6,7 @@ use hermes_core::encoding_components::traits::{CanEncode, HasDefaultEncoding}; use hermes_core::encoding_components::types::AsBytes; use hermes_cosmos_core::chain_components::types::Secp256k1KeyPair; use hermes_cosmos_core::protobuf_encoding_components::types::strategy::ViaProtobuf; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::proof_signer::HasStarknetProofSigner; use hermes_starknet_chain_components::types::consensus_state::StarknetConsensusState; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs index 5962ef890..d7ff9127d 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockQuerier, BlockQuerierComponent, HasBlockType, HasHeightType, }; use hermes_cosmos_core::chain_components::types::Time; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs index 116d23667..5fb1ef5da 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/block_events.rs @@ -1,11 +1,11 @@ use core::marker::PhantomData; use std::sync::Arc; -use cgp::prelude::*; use hermes_core::chain_components::traits::{ BlockEventsQuerier, BlockEventsQuerierComponent, HasEventType, HasHeightType, }; use hermes_core::chain_type_components::traits::HasAddressType; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::traits::queries::contract_address::CanQueryContractAddress; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs index e44fba831..000b14126 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/nonce.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ HasNonceType, HasSignerType, NonceQuerier, NonceQuerierComponent, }; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::account::{ CanBuildAccountFromSigner, HasStarknetAccountType, }; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs index 465679e3e..428ed76a0 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/status.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ ChainStatusQuerier, ChainStatusQuerierComponent, HasChainStatusType, }; use hermes_cosmos_core::chain_components::types::Time; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use hermes_starknet_chain_components::types::status::StarknetChainStatus; use starknet_v13::core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs b/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs index 784fc6f3c..9fba73021 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/queries/tx_response.rs @@ -1,10 +1,10 @@ use core::time::Duration; -use cgp::prelude::*; use hermes_core::relayer_components::transaction::traits::{ HasTxHashType, HasTxResponseType, TxResponseQuerier, TxResponseQuerierComponent, }; use hermes_core::runtime_components::traits::{CanSleep, HasRuntime}; +use hermes_prelude::*; use hermes_starknet_chain_components::traits::client::HasStarknetClient; use starknet_v13::core::types::{Felt, StarknetError}; use starknet_v13::providers::{Provider, ProviderError}; diff --git a/relayer/crates/starknet-madara-tests/src/impls/send_message.rs b/relayer/crates/starknet-madara-tests/src/impls/send_message.rs index 39c3ca997..3fc6de3bf 100644 --- a/relayer/crates/starknet-madara-tests/src/impls/send_message.rs +++ b/relayer/crates/starknet-madara-tests/src/impls/send_message.rs @@ -1,7 +1,6 @@ use core::fmt::Debug; use std::sync::Arc; -use cgp::prelude::*; use hermes_core::chain_components::traits::HasMessageType; use hermes_core::chain_type_components::traits::HasMessageResponseType; use hermes_core::relayer_components::transaction::traits::{ @@ -9,6 +8,7 @@ use hermes_core::relayer_components::transaction::traits::{ MessagesWithSignerAndNonceSender, MessagesWithSignerAndNonceSenderComponent, TxMessageResponseParser, TxMessageResponseParserComponent, }; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::account::{ diff --git a/relayer/crates/starknet-madara-tests/src/presets/chain.rs b/relayer/crates/starknet-madara-tests/src/presets/chain.rs index 9288d4188..3c6c056df 100644 --- a/relayer/crates/starknet-madara-tests/src/presets/chain.rs +++ b/relayer/crates/starknet-madara-tests/src/presets/chain.rs @@ -1,6 +1,6 @@ #[cgp::re_export_imports] mod preset { - use cgp::prelude::*; + use hermes_prelude::*; use hermes_starknet_chain_components::components::chain::StarknetChainComponents; use starknet_v13::core::types::contract::SierraClass; use StarknetChainComponents::re_exports::*; diff --git a/relayer/crates/starknet-madara-tests/src/tests/erc20.rs b/relayer/crates/starknet-madara-tests/src/tests/erc20.rs index a437c173c..dc66144eb 100644 --- a/relayer/crates/starknet-madara-tests/src/tests/erc20.rs +++ b/relayer/crates/starknet-madara-tests/src/tests/erc20.rs @@ -1,4 +1,3 @@ -use cgp::prelude::*; use hermes_core::chain_components::traits::{ CanQueryBlock, CanQueryChainHeight, CanQueryChainStatus, CanSendSingleMessage, }; @@ -6,6 +5,7 @@ use hermes_core::encoding_components::traits::CanEncode; use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; use hermes_error::Error; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::encoding::events::CanFilterDecodeEvents; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; use hermes_starknet_chain_components::traits::contract::deploy::CanDeployContract; diff --git a/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs b/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs index 60956bcf9..7cc16bcbc 100644 --- a/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs +++ b/relayer/crates/starknet-madara-tests/src/tests/raw_storage.rs @@ -1,11 +1,11 @@ use core::fmt::Display; -use cgp::prelude::*; use hermes_core::chain_components::traits::CanQueryChainHeight; use hermes_core::chain_type_components::traits::HasAddressType; use hermes_core::runtime_components::traits::CanReadFileAsString; use hermes_core::test_components::bootstrap::traits::CanBootstrapChain; use hermes_error::Error; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::traits::commitment_proof::CanVerifyStarknetStorageProof; use hermes_starknet_chain_components::traits::contract::call::CanCallContract; diff --git a/relayer/crates/starknet-madara-tests/src/traits/account.rs b/relayer/crates/starknet-madara-tests/src/traits/account.rs index 5a06f26cf..7edef183c 100644 --- a/relayer/crates/starknet-madara-tests/src/traits/account.rs +++ b/relayer/crates/starknet-madara-tests/src/traits/account.rs @@ -1,5 +1,5 @@ use cgp::core::macros::blanket_trait; -use cgp::prelude::CanRaiseAsyncError; +use hermes_prelude::CanRaiseAsyncError; use hermes_starknet_chain_components::traits::account::HasStarknetAccountType; use starknet_v13::accounts::{Account, AccountError, ConnectedAccount}; diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs index fcbd7c8aa..1bb97b619 100644 --- a/relayer/crates/starknet-relayer/src/contexts/builder.rs +++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs @@ -9,7 +9,6 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent}; use cgp::core::field::{Index, WithField}; use cgp::core::types::WithType; -use cgp::prelude::*; use eyre::eyre; use futures::lock::Mutex; use hermes_core::relayer_components::build::traits::builders::birelay_builder::{ @@ -39,6 +38,7 @@ use hermes_cosmos::error::types::Error; use hermes_cosmos::error::HermesError; use hermes_cosmos::relayer::contexts::{CosmosBuilder, CosmosChain}; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::config::StarknetChainConfig; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use hermes_starknet_chain_context::contexts::chain::{StarknetChain, StarknetChainFields}; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs index 4954fc219..c973397b9 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_starknet_birelay.rs @@ -2,7 +2,6 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::Index; use cgp::extra::run::RunnerComponent; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::relayer_components::birelay::traits::AutoBiRelayerComponent; use hermes_core::relayer_components::components::default::DefaultBiRelayComponents; @@ -17,6 +16,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; diff --git a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs index 3fbb8c8bf..e63046a7e 100644 --- a/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/cosmos_to_starknet_relay.rs @@ -2,7 +2,6 @@ use alloc::collections::BTreeSet; use alloc::sync::Arc; use core::ops::Deref; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, @@ -23,6 +22,7 @@ use hermes_core::relayer_components::relay::traits::{ }; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use ibc::core::host::types::identifiers::ClientId as CosmosClientId; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs index ba6cf1b0e..c8cf0c27d 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_cosmos_birelay.rs @@ -2,7 +2,6 @@ use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::field::Index; use cgp::extra::run::RunnerComponent; -use cgp::prelude::*; use hermes_core::logging_components::traits::LoggerComponent; use hermes_core::relayer_components::birelay::traits::AutoBiRelayerComponent; use hermes_core::relayer_components::components::default::DefaultBiRelayComponents; @@ -17,6 +16,7 @@ use hermes_cosmos::error::impls::UseHermesError; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::runtime::types::runtime::HermesRuntime; use hermes_cosmos::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; diff --git a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs index de0153350..37cb046f7 100644 --- a/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs +++ b/relayer/crates/starknet-relayer/src/contexts/starknet_to_cosmos_relay.rs @@ -2,7 +2,6 @@ use alloc::collections::BTreeSet; use alloc::sync::Arc; use core::ops::Deref; -use cgp::prelude::*; use futures::lock::Mutex; use hermes_core::relayer_components::multi::traits::chain_at::{ ChainGetterAtComponent, ChainTypeProviderAtComponent, @@ -23,6 +22,7 @@ use hermes_core::relayer_components::relay::traits::{ }; use hermes_cosmos::relayer::contexts::CosmosChain; use hermes_cosmos::runtime::types::runtime::HermesRuntime; +use hermes_prelude::*; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use hermes_starknet_chain_context::contexts::chain::StarknetChain; use ibc::core::host::types::identifiers::ClientId as CosmosClientId; diff --git a/relayer/crates/starknet-relayer/src/impls/error.rs b/relayer/crates/starknet-relayer/src/impls/error.rs index 8c38c09c5..c97f4f6e7 100644 --- a/relayer/crates/starknet-relayer/src/impls/error.rs +++ b/relayer/crates/starknet-relayer/src/impls/error.rs @@ -2,7 +2,6 @@ use core::convert::Infallible; use core::num::TryFromIntError; use std::string::FromUtf8Error; -use cgp::prelude::*; use eyre::Report; use hermes_core::chain_components::traits::{EmptyMessageResponse, HasChainIdType}; use hermes_core::relayer_components::relay::impls::{ @@ -15,6 +14,7 @@ use hermes_cosmos::error::handlers::{ }; use hermes_cosmos::error::types::Error; use hermes_cosmos::runtime::types::error::TokioRuntimeError; +use hermes_prelude::*; pub struct HandleStarknetRelayError; 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 2b0b7ec90..5f861de27 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 @@ -2,7 +2,6 @@ use std::collections::BTreeMap; use std::net::{IpAddr, Ipv4Addr}; use cgp::core::error::CanRaiseAsyncError; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, HasRuntime, @@ -16,6 +15,7 @@ use hermes_cosmos_core::test_components::bootstrap::traits::{ CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; +use hermes_prelude::*; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use starknet::macros::felt; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs index e282daf67..79f88afdb 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap/deploy_contracts.rs @@ -4,7 +4,6 @@ use std::collections::{BTreeMap, HashSet}; use std::sync::OnceLock; use cgp::extra::runtime::HasRuntimeType; -use cgp::prelude::*; use hermes_cairo_encoding_components::strategy::ViaCairo; use hermes_cairo_encoding_components::types::as_felt::AsFelt; use hermes_cairo_encoding_components::types::as_starknet_event::AsStarknetEvent; @@ -21,6 +20,7 @@ use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainDriverBuilder, ChainDriverBuilderComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; use hermes_starknet_chain_components::impls::types::address::StarknetAddress; use hermes_starknet_chain_components::impls::types::message::StarknetMessage; use hermes_starknet_chain_components::traits::contract::declare::CanDeclareContract; 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 3ad4a8f87..219bf38eb 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,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanStartChildProcess, HasFilePathType, HasRuntime}; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; use crate::types::genesis_config::StarknetGenesisConfig; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs index 16954d0b6..9a630545a 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/bootstrap_chain.rs @@ -2,7 +2,6 @@ use std::collections::BTreeMap; use std::net::{IpAddr, Ipv4Addr}; use cgp::core::error::CanRaiseAsyncError; -use cgp::prelude::*; use hermes_core::runtime_components::traits::{ CanCreateDir, CanGenerateRandom, CanReserveTcpPort, HasChildProcessType, HasFilePathType, HasRuntime, @@ -16,6 +15,7 @@ use hermes_cosmos_core::test_components::bootstrap::traits::{ CanBuildChainDriver, CanStartChainFullNodes, HasChainGenesisConfigType, HasChainNodeConfigType, HasChainStoreDir, }; +use hermes_prelude::*; use hermes_starknet_chain_components::types::wallet::StarknetWallet; use starknet::macros::felt; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs index 0c5e80ad7..3a60978e0 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_all.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{HasChildProcessType, HasFilePathType, HasRuntime}; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; use crate::impls::bootstrap_madara::{StartAnvil, StartMadaraSequencer, StartPathfinder}; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs index d399923c7..fed0172c3 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_anvil.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs index bea193630..48244f2b2 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_madara.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainCommandPath, HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs index feaafd566..63b3152c3 100644 --- a/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs +++ b/relayer/crates/starknet-test-components/src/impls/bootstrap_madara/start_pathfinder.rs @@ -1,9 +1,9 @@ -use cgp::prelude::*; use hermes_core::runtime_components::traits::{CanCreateDir, CanStartChildProcess, HasRuntime}; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainFullNodeStarter, ChainFullNodeStarterComponent, HasChainGenesisConfigType, HasChainNodeConfigType, }; +use hermes_prelude::*; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs b/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs index 70e95872e..e92e6c856 100644 --- a/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs +++ b/relayer/crates/starknet-test-components/src/impls/types/genesis_config.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainGenesisConfigTypeComponent, ProvideChainGenesisConfigType, }; +use hermes_prelude::*; use crate::types::genesis_config::StarknetGenesisConfig; diff --git a/relayer/crates/starknet-test-components/src/impls/types/node_config.rs b/relayer/crates/starknet-test-components/src/impls/types/node_config.rs index c266892f9..881d05c21 100644 --- a/relayer/crates/starknet-test-components/src/impls/types/node_config.rs +++ b/relayer/crates/starknet-test-components/src/impls/types/node_config.rs @@ -1,7 +1,7 @@ -use cgp::prelude::*; use hermes_cosmos_core::test_components::bootstrap::traits::{ ChainNodeConfigTypeComponent, ProvideChainNodeConfigType, }; +use hermes_prelude::*; use crate::types::node_config::StarknetNodeConfig; diff --git a/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs b/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs index b7c4f009a..244645576 100644 --- a/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs +++ b/relayer/crates/starknet-test-components/src/traits/deploy_contracts.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_core::test_components::chain_driver::traits::HasChainType; +use hermes_prelude::*; #[cgp_component { provider: IbcContractsDeployer, diff --git a/relayer/crates/tools/src/commands/starknet/subcommand.rs b/relayer/crates/tools/src/commands/starknet/subcommand.rs index 7d6162c44..d133c6c75 100644 --- a/relayer/crates/tools/src/commands/starknet/subcommand.rs +++ b/relayer/crates/tools/src/commands/starknet/subcommand.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; use crate::commands::starknet::transfer_args::TransferArgs; diff --git a/relayer/crates/tools/src/commands/starknet/transfer_args.rs b/relayer/crates/tools/src/commands/starknet/transfer_args.rs index d55c1d37d..e2d2be6b9 100644 --- a/relayer/crates/tools/src/commands/starknet/transfer_args.rs +++ b/relayer/crates/tools/src/commands/starknet/transfer_args.rs @@ -1,8 +1,8 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CommandRunner, CommandRunnerComponent, HasOutputType}; use hermes_core::encoding_components::traits::CanEncode; use hermes_core::logging_components::traits::CanLog; use hermes_core::logging_components::types::LevelInfo; +use hermes_prelude::*; use hermes_starknet_chain_components::types::cosmos::height::Height; use hermes_starknet_chain_components::types::cosmos::timestamp::Timestamp; use hermes_starknet_chain_components::types::messages::ibc::channel::PortId; diff --git a/relayer/crates/tools/src/commands/subcommand.rs b/relayer/crates/tools/src/commands/subcommand.rs index 371dd0d42..28fcf1ac0 100644 --- a/relayer/crates/tools/src/commands/subcommand.rs +++ b/relayer/crates/tools/src/commands/subcommand.rs @@ -1,5 +1,5 @@ -use cgp::prelude::*; use hermes_cli_components::traits::{CanRunCommand, CommandRunner, CommandRunnerComponent}; +use hermes_prelude::*; use crate::commands::starknet::subcommand::StarknetSubCommand; diff --git a/relayer/crates/tools/src/contexts/app.rs b/relayer/crates/tools/src/contexts/app.rs index c1716cca1..cdb9104fe 100644 --- a/relayer/crates/tools/src/contexts/app.rs +++ b/relayer/crates/tools/src/contexts/app.rs @@ -3,7 +3,6 @@ use std::path::PathBuf; use cgp::core::component::UseDelegate; use cgp::core::error::{ErrorRaiserComponent, ErrorTypeProviderComponent, ErrorWrapperComponent}; use cgp::core::types::WithType; -use cgp::prelude::*; use hermes_cli_components::impls::{GetDefaultConfigField, LoadTomlConfig, WriteTomlConfig}; use hermes_cli_components::traits::{ BootstrapLoaderComponent, BootstrapTypeProviderComponent, BuilderLoaderComponent, @@ -18,6 +17,7 @@ use hermes_core::runtime_components::traits::{ HasRuntime, RuntimeGetterComponent, RuntimeTypeProviderComponent, }; use hermes_cosmos_core::tracing_logging_components::contexts::TracingLogger; +use hermes_prelude::*; use hermes_runtime::types::runtime::HermesRuntime; use hermes_starknet_chain_components::impls::types::config::StarknetRelayerConfig; use hermes_starknet_cli::impls::bootstrap::starknet_chain::{ From e1a48da122e19fc518094a07cea4c987c0b2a1bf Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Tue, 29 Apr 2025 08:05:58 +0000 Subject: [PATCH 13/13] Use back main branch --- light-client/Cargo.lock | 8 ++--- light-client/Cargo.toml | 8 ++--- relayer/Cargo.lock | 70 ++++++++++++++++++++--------------------- relayer/Cargo.toml | 70 ++++++++++++++++++++--------------------- 4 files changed, 78 insertions(+), 78 deletions(-) diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock index dd28a4318..1484bafd9 100644 --- a/light-client/Cargo.lock +++ b/light-client/Cargo.lock @@ -1024,7 +1024,7 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-encoding-components", @@ -1039,7 +1039,7 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-prelude", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "hermes-prelude" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "cgp-async", @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-encoding-components", diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml index 42013122a..1a754dd85 100644 --- a/light-client/Cargo.toml +++ b/light-client/Cargo.toml @@ -96,7 +96,7 @@ 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-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-prelude = { 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-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" } diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index b27bd4bec..46f9a97f1 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -1797,7 +1797,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermes-any-counterparty" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-core", @@ -1817,7 +1817,7 @@ dependencies = [ [[package]] name = "hermes-async-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "async-trait", "cgp", @@ -1842,7 +1842,7 @@ dependencies = [ [[package]] name = "hermes-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-chain-type-components", @@ -1854,7 +1854,7 @@ dependencies = [ [[package]] name = "hermes-chain-type-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-prelude", @@ -1863,7 +1863,7 @@ dependencies = [ [[package]] name = "hermes-cli" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "clap", @@ -1890,7 +1890,7 @@ dependencies = [ [[package]] name = "hermes-cli-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "clap", @@ -1906,7 +1906,7 @@ dependencies = [ [[package]] name = "hermes-cli-framework" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "clap", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-chain-type-components", @@ -1936,7 +1936,7 @@ dependencies = [ [[package]] name = "hermes-comet-light-client-context" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "eyre", @@ -1953,7 +1953,7 @@ dependencies = [ [[package]] name = "hermes-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-chain-components", @@ -1970,7 +1970,7 @@ dependencies = [ [[package]] name = "hermes-cosmos" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "hermes-comet-light-client-context", "hermes-core", @@ -1985,7 +1985,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-chain-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "bech32 0.9.1", "bitcoin", @@ -2034,7 +2034,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-chain-preset" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-core", @@ -2046,7 +2046,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-core" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "hermes-comet-light-client-components", "hermes-core", @@ -2069,7 +2069,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-encoding-components", @@ -2084,7 +2084,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-integration-tests" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "eyre", @@ -2110,7 +2110,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "dirs-next", @@ -2147,7 +2147,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hdpath", @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "hermes-cosmos-wasm-relayer" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "eyre", @@ -2210,7 +2210,7 @@ dependencies = [ [[package]] name = "hermes-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-prelude", @@ -2219,7 +2219,7 @@ dependencies = [ [[package]] name = "hermes-error" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "eyre", @@ -2231,7 +2231,7 @@ dependencies = [ [[package]] name = "hermes-ibc-test-suite" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-chain-components", @@ -2246,7 +2246,7 @@ dependencies = [ [[package]] name = "hermes-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-prelude", @@ -2255,7 +2255,7 @@ dependencies = [ [[package]] name = "hermes-prelude" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "cgp-async", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "hermes-protobuf-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-encoding-components", @@ -2276,7 +2276,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "futures", @@ -2291,7 +2291,7 @@ dependencies = [ [[package]] name = "hermes-relayer-components-extra" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "futures", @@ -2305,7 +2305,7 @@ dependencies = [ [[package]] name = "hermes-runtime" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-async-runtime-components", @@ -2320,7 +2320,7 @@ dependencies = [ [[package]] name = "hermes-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-prelude", @@ -2561,7 +2561,7 @@ dependencies = [ [[package]] name = "hermes-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-chain-type-components", @@ -2575,7 +2575,7 @@ dependencies = [ [[package]] name = "hermes-tokio-runtime-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "futures", @@ -2592,7 +2592,7 @@ dependencies = [ [[package]] name = "hermes-tracing-logging-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-core", @@ -2607,7 +2607,7 @@ dependencies = [ [[package]] name = "hermes-wasm-client-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-core", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "hermes-wasm-encoding-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-core", @@ -2642,7 +2642,7 @@ dependencies = [ [[package]] name = "hermes-wasm-test-components" version = "0.1.0" -source = "git+https://github.com/informalsystems/hermes-sdk.git?branch=soares/simplify-exports-2#eb7d6e9763dff5c46322eec078c2ec3fa647c559" +source = "git+https://github.com/informalsystems/hermes-sdk.git#027b5429940ddd6ec43d4574bf4cd528f1f5c731" dependencies = [ "cgp", "hermes-core", diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index e6be70efd..9e56c02a0 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -172,38 +172,38 @@ cgp-sync = { git = "https://github.com/contextgeneric/cgp.git" } cgp-inner = { git = "https://github.com/contextgeneric/cgp.git" } cgp-error-eyre = { git = "https://github.com/contextgeneric/cgp.git" } -hermes-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-chain-type-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-relayer-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-relayer-components-extra = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-async-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-tokio-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-runtime = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-error = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-tracing-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-ibc-test-suite = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-any-counterparty = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-core = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-chain-preset = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-relayer = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-wasm-relayer = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cosmos-integration-tests = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-comet-light-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-comet-light-client-context = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-wasm-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-wasm-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-wasm-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cli-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cli = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } -hermes-cli-framework = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "soares/simplify-exports-2" } +hermes-core = { git = "https://github.com/informalsystems/hermes-sdk.git" } +hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.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-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 = { git = "https://github.com/informalsystems/hermes-sdk.git" } +hermes-cosmos-core = { git = "https://github.com/informalsystems/hermes-sdk.git" } +hermes-cosmos-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git" } +hermes-cosmos-chain-preset = { 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-cli = { git = "https://github.com/informalsystems/hermes-sdk.git" } +hermes-cli-framework = { git = "https://github.com/informalsystems/hermes-sdk.git" }