From 2ce7d2af13b51c302a42a0143edaa6da217dfe2d Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Fri, 21 Jun 2024 08:03:38 +0200 Subject: [PATCH] Fix formatting --- .cargo/config.toml | 74 ++++++------ Cargo.toml | 112 +++++++++--------- .../sovereign-chain-components/Cargo.toml | 76 ++++++------ .../sovereign-integration-tests/Cargo.toml | 64 +++++----- crates/relayer/sovereign-relayer/Cargo.toml | 66 +++++------ .../src/contexts/cosmos_to_sovereign_relay.rs | 3 +- .../src/contexts/sovereign_rollup.rs | 5 +- .../src/contexts/sovereign_to_cosmos_relay.rs | 3 +- .../sovereign-rollup-components/Cargo.toml | 72 +++++------ .../src/types/messages/ibc.rs | 3 +- .../sovereign-test-components/Cargo.toml | 58 ++++----- 11 files changed, 268 insertions(+), 268 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index c9a3d75d..ecdbcfb9 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -8,11 +8,11 @@ sov-ibc = { path = "crates/modules/sov-ibc" } sov-ibc-transfer = { path = "crates/modules/sov-ibc-transfer" } sov-consensus-state-tracker = { path = "crates/modules/sov-consensus-state-tracker" } -hermes-sovereign-chain-components = { path = "./crates/relayer/sovereign-chain-components" } -hermes-sovereign-rollup-components = { path = "./crates/relayer/sovereign-rollup-components" } -hermes-sovereign-relayer = { path = "./crates/relayer/sovereign-relayer" } -hermes-sovereign-test-components = { path = "./crates/relayer/sovereign-test-components" } -hermes-sovereign-integration-tests = { path = "./crates/relayer/sovereign-integration-tests" } +hermes-sovereign-chain-components = { path = "./crates/relayer/sovereign-chain-components" } +hermes-sovereign-rollup-components = { path = "./crates/relayer/sovereign-rollup-components" } +hermes-sovereign-relayer = { path = "./crates/relayer/sovereign-relayer" } +hermes-sovereign-test-components = { path = "./crates/relayer/sovereign-test-components" } +hermes-sovereign-integration-tests = { path = "./crates/relayer/sovereign-integration-tests" } ibc = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" } ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" } @@ -26,50 +26,50 @@ ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", branch = ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" } ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" } -hermes-relayer-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-relayer-components-extra = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-relayer-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-relayer-components-extra = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-async-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-tokio-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-runtime = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-async-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-tokio-runtime-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-runtime = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-tracing-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-tracing-logging-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-ibc-test-suite = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-ibc-test-suite = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-cli-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-cli-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-cosmos-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-cosmos-relayer = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-cosmos-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-cosmos-integration-tests = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-cosmos-chain-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-cosmos-relayer = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-cosmos-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-cosmos-integration-tests = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-celestia-chain = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-celestia-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-celestia-integration-tests = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-celestia-chain = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-celestia-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-celestia-integration-tests = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-wasm-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -hermes-wasm-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-wasm-client-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } +hermes-wasm-test-components = { git = "https://github.com/informalsystems/hermes-sdk.git", branch = "main" } -cgp-core = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-component = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-component-macro = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-error = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-error-eyre = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-async = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-async-macro = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-run = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -cgp-inner = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-core = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-component = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-component-macro = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-error = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-error-eyre = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-async = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-async-macro = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-run = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } +cgp-inner = { git = "https://github.com/informalsystems/cgp.git", branch = "main" } -ibc-relayer = { git = "https://github.com/informalsystems/hermes.git", rev = "d60057f8" } -ibc-telemetry = { git = "https://github.com/informalsystems/hermes.git", rev = "d60057f8" } -ibc-relayer-types = { git = "https://github.com/informalsystems/hermes.git", rev = "d60057f8" } +ibc-relayer = { git = "https://github.com/informalsystems/hermes.git", rev = "d60057f8" } +ibc-telemetry = { git = "https://github.com/informalsystems/hermes.git", rev = "d60057f8" } +ibc-relayer-types = { git = "https://github.com/informalsystems/hermes.git", rev = "d60057f8" } cosmrs = { git = "https://github.com/cosmos/cosmos-rust.git", rev = "4b1332e" } basecoin = { git = "https://github.com/informalsystems/basecoin-rs.git", branch = "rano/sov-support" } diff --git a/Cargo.toml b/Cargo.toml index fb2484b0..89dfbbef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,73 +103,73 @@ const-rollup-config = { version = "0.3.0" } # Hermes SDK relayer dependencies -hermes-runtime-components = { version = "0.1.0" } -hermes-async-runtime-components = { version = "0.1.0" } -hermes-tokio-runtime-components = { version = "0.1.0" } -hermes-runtime = { 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" } +hermes-runtime = { version = "0.1.0" } -hermes-encoding-components = { version = "0.1.0" } -hermes-protobuf-encoding-components = { version = "0.1.0" } +hermes-encoding-components = { version = "0.1.0" } +hermes-protobuf-encoding-components = { version = "0.1.0" } -hermes-logging-components = { version = "0.1.0" } +hermes-logging-components = { version = "0.1.0" } -hermes-relayer-components = { version = "0.1.0" } -hermes-relayer-components-extra = { version = "0.1.0" } +hermes-relayer-components = { version = "0.1.0" } +hermes-relayer-components-extra = { version = "0.1.0" } -hermes-test-components = { version = "0.1.0" } +hermes-test-components = { version = "0.1.0" } -hermes-cosmos-chain-components = { version = "0.1.0" } -hermes-cosmos-relayer = { version = "0.1.0" } -hermes-cosmos-test-components = { version = "0.1.0" } -hermes-cosmos-integration-tests = { version = "0.1.0" } +hermes-cosmos-chain-components = { version = "0.1.0" } +hermes-cosmos-relayer = { version = "0.1.0" } +hermes-cosmos-test-components = { version = "0.1.0" } +hermes-cosmos-integration-tests = { version = "0.1.0" } -hermes-wasm-client-components = { version = "0.1.0" } -hermes-wasm-test-components = { version = "0.1.0" } +hermes-wasm-client-components = { version = "0.1.0" } +hermes-wasm-test-components = { version = "0.1.0" } -hermes-celestia-chain = { version = "0.1.0" } -hermes-celestia-test-components = { version = "0.1.0" } -hermes-celestia-integration-tests = { version = "0.1.0" } +hermes-celestia-chain = { version = "0.1.0" } +hermes-celestia-test-components = { version = "0.1.0" } +hermes-celestia-integration-tests = { version = "0.1.0" } -hermes-sovereign-chain-components = { version = "0.1.0" } -hermes-sovereign-rollup-components = { version = "0.1.0" } -hermes-sovereign-relayer = { version = "0.1.0" } -hermes-sovereign-test-components = { version = "0.1.0" } -hermes-sovereign-integration-tests = { version = "0.1.0" } +hermes-sovereign-chain-components = { version = "0.1.0" } +hermes-sovereign-rollup-components = { version = "0.1.0" } +hermes-sovereign-relayer = { version = "0.1.0" } +hermes-sovereign-test-components = { version = "0.1.0" } +hermes-sovereign-integration-tests = { version = "0.1.0" } -ibc-relayer = { version = "0.27.3" } -ibc-relayer-types = { version = "0.27.3" } -ibc-telemetry = { version = "0.27.3" } +ibc-relayer = { version = "0.27.3" } +ibc-relayer-types = { version = "0.27.3" } +ibc-telemetry = { version = "0.27.3" } -cgp-core = { version = "0.1.0" } -cgp-error-eyre = { version = "0.1.0" } +cgp-core = { version = "0.1.0" } +cgp-error-eyre = { version = "0.1.0" } # external dependencies -anyhow = "1.0.68" -base64 = { version = "0.21", default-features = false } -borsh = { version = "0.10.3", features = [ "rc", "bytes" ] } -bytes = { version = "1.2.1", default-features = false } -derive_more = { version = "0.99.11", features = [ "from", "try_into" ] } -digest = "0.10.6" -hex = "0.4.3" -jmt = { version = "0.9.0" } -jsonrpsee = { version = "0.22.5", features = [ "jsonrpsee-types", "macros", "client", "server" ] } -prost = { version = "0.12", default-features = false } -prost-build = { version = "0.12", default-features = false } -sha2 = { version = "0.10.6", default-features = false } -serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] } -serde_json = "1.0" -schemars = { version = "0.8.12", features = [ "derive" ] } -tempfile = "3.5" -thiserror = "1.0.38" -tracing = { version = "0.1.40", default-features = false } -bech32 = { version = "0.9.1" } -eyre = { version = "0.6.12" } -tokio = { version = "1.36" } -tonic = { version = "0.11" } -ed25519-dalek = { version = "2.1.1" } -futures = { version = "0.3.30", default-features = false } -rand = { version = "0.8.5" } -toml = { version = "0.8.12" } -tracing-subscriber = { version = "0.3.18" } +anyhow = "1.0.68" +base64 = { version = "0.21", default-features = false } +borsh = { version = "0.10.3", features = [ "rc", "bytes" ] } +bytes = { version = "1.2.1", default-features = false } +derive_more = { version = "0.99.11", features = [ "from", "try_into" ] } +digest = "0.10.6" +hex = "0.4.3" +jmt = { version = "0.9.0" } +jsonrpsee = { version = "0.22.5", features = [ "jsonrpsee-types", "macros", "client", "server" ] } +prost = { version = "0.12", default-features = false } +prost-build = { version = "0.12", default-features = false } +sha2 = { version = "0.10.6", default-features = false } +serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] } +serde_json = "1.0" +schemars = { version = "0.8.12", features = [ "derive" ] } +tempfile = "3.5" +thiserror = "1.0.38" +tracing = { version = "0.1.40", default-features = false } +bech32 = { version = "0.9.1" } +eyre = { version = "0.6.12" } +tokio = { version = "1.36" } +tonic = { version = "0.11" } +ed25519-dalek = { version = "2.1.1" } +futures = { version = "0.3.30", default-features = false } +rand = { version = "0.8.5" } +toml = { version = "0.8.12" } +tracing-subscriber = { version = "0.3.18" } # Note: the `[patch.crates-io]` section is placed at `./cargo/config.toml` diff --git a/crates/relayer/sovereign-chain-components/Cargo.toml b/crates/relayer/sovereign-chain-components/Cargo.toml index 4894a0eb..f785d8b2 100644 --- a/crates/relayer/sovereign-chain-components/Cargo.toml +++ b/crates/relayer/sovereign-chain-components/Cargo.toml @@ -1,46 +1,46 @@ [package] -name = "hermes-sovereign-chain-components" -version = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } -authors = { workspace = true } +name = "hermes-sovereign-chain-components" +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } rust-version = { workspace = true } -readme = "README.md" -description = """ +readme = "README.md" +description = """ Context-generic client components for communicating with a Sovereign rollup node """ [dependencies] -cgp-core = { workspace = true } -cgp-error-eyre = { workspace = true } -hermes-runtime = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-sovereign-rollup-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-wasm-client-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-protobuf-encoding-components = { workspace = true } +cgp-core = { workspace = true } +cgp-error-eyre = { workspace = true } +hermes-runtime = { workspace = true } +hermes-relayer-components = { workspace = true } +hermes-runtime-components = { workspace = true } +hermes-sovereign-rollup-components = { workspace = true } +hermes-cosmos-chain-components = { workspace = true } +hermes-wasm-client-components = { workspace = true } +hermes-encoding-components = { workspace = true } +hermes-protobuf-encoding-components = { workspace = true } -ibc-proto = { workspace = true } -ibc-relayer = { workspace = true } -ibc-relayer-types = { workspace = true } -sov-celestia-client = { workspace = true, features = ["test-util"] } -ibc = { workspace = true } -ibc-query = { workspace = true } +ibc-proto = { workspace = true } +ibc-relayer = { workspace = true } +ibc-relayer-types = { workspace = true } +sov-celestia-client = { workspace = true, features = [ "test-util" ] } +ibc = { workspace = true } +ibc-query = { workspace = true } -tokio = { workspace = true } -eyre = { workspace = true } -jsonrpsee = { workspace = true, features = ["http-client"] } -prost = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -bech32 = { workspace = true } -borsh = { workspace = true } -tonic = { workspace = true } -ed25519-dalek = { version = "2.1.1" } -sha2 = { version = "0.10.8" } -hex = { version = "0.4.3" } -base64 = { version = "0.22.1" } -serde-json-wasm = { version = "1.0.1" } \ No newline at end of file +tokio = { workspace = true } +eyre = { workspace = true } +jsonrpsee = { workspace = true, features = [ "http-client" ] } +prost = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +bech32 = { workspace = true } +borsh = { workspace = true } +tonic = { workspace = true } +ed25519-dalek = { version = "2.1.1" } +sha2 = { version = "0.10.8" } +hex = { version = "0.4.3" } +base64 = { version = "0.22.1" } +serde-json-wasm = { version = "1.0.1" } diff --git a/crates/relayer/sovereign-integration-tests/Cargo.toml b/crates/relayer/sovereign-integration-tests/Cargo.toml index edb861c3..cdd7e627 100644 --- a/crates/relayer/sovereign-integration-tests/Cargo.toml +++ b/crates/relayer/sovereign-integration-tests/Cargo.toml @@ -1,41 +1,41 @@ [package] -name = "hermes-sovereign-integration-tests" -version = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } -authors = { workspace = true } +name = "hermes-sovereign-integration-tests" +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } rust-version = { workspace = true } -readme = "README.md" -description = """ +readme = "README.md" +description = """ Concrete integration test cases for testing Sovereign to Cosmos relaying """ [dependencies] -cgp-core = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-runtime = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-cosmos-relayer = { workspace = true } -hermes-cosmos-test-components = { workspace = true } -hermes-wasm-test-components = { workspace = true } -hermes-wasm-client-components = { workspace = true } -hermes-cosmos-integration-tests = { workspace = true } -hermes-celestia-test-components = { workspace = true } -hermes-celestia-integration-tests = { workspace = true } -hermes-sovereign-test-components = { workspace = true } -hermes-sovereign-chain-components = { workspace = true } -hermes-sovereign-rollup-components = { workspace = true } -hermes-sovereign-relayer = { workspace = true } +cgp-core = { workspace = true } +hermes-runtime-components = { workspace = true } +hermes-runtime = { workspace = true } +hermes-relayer-components = { workspace = true } +hermes-test-components = { workspace = true } +hermes-cosmos-chain-components = { workspace = true } +hermes-cosmos-relayer = { workspace = true } +hermes-cosmos-test-components = { workspace = true } +hermes-wasm-test-components = { workspace = true } +hermes-wasm-client-components = { workspace = true } +hermes-cosmos-integration-tests = { workspace = true } +hermes-celestia-test-components = { workspace = true } +hermes-celestia-integration-tests = { workspace = true } +hermes-sovereign-test-components = { workspace = true } +hermes-sovereign-chain-components = { workspace = true } +hermes-sovereign-rollup-components = { workspace = true } +hermes-sovereign-relayer = { workspace = true } -ibc-relayer = { workspace = true } -ibc-relayer-types = { workspace = true } -ibc-proto = { workspace = true } -ibc = { workspace = true } +ibc-relayer = { workspace = true } +ibc-relayer-types = { workspace = true } +ibc-proto = { workspace = true } +ibc = { workspace = true } -sov-celestia-client = { workspace = true, features = ["test-util"] } +sov-celestia-client = { workspace = true, features = [ "test-util" ] } eyre = { workspace = true } futures = { workspace = true } @@ -45,9 +45,9 @@ serde_json = { workspace = true } toml = { workspace = true } rand = { workspace = true } stable-eyre = { version = "0.2.2" } -jsonrpsee = { workspace = true, features = ["http-client", "ws-client"] } +jsonrpsee = { workspace = true, features = [ "http-client", "ws-client" ] } borsh = { workspace = true } sha2 = { workspace = true } hex = { version = "0.4.3" } tracing = { workspace = true } -tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } \ No newline at end of file +tracing-subscriber = { workspace = true, features = [ "env-filter", "json" ] } diff --git a/crates/relayer/sovereign-relayer/Cargo.toml b/crates/relayer/sovereign-relayer/Cargo.toml index b8f6e343..0647f92d 100644 --- a/crates/relayer/sovereign-relayer/Cargo.toml +++ b/crates/relayer/sovereign-relayer/Cargo.toml @@ -1,41 +1,41 @@ [package] -name = "hermes-sovereign-relayer" -version = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } -authors = { workspace = true } +name = "hermes-sovereign-relayer" +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } rust-version = { workspace = true } -readme = "README.md" -description = """ +readme = "README.md" +description = """ Concrete context implementation for building a Sovereign to Cosmos relayer """ [dependencies] -cgp-core = { workspace = true } -cgp-error-eyre = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-runtime = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-cosmos-relayer = { workspace = true } -hermes-celestia-chain = { workspace = true } -hermes-sovereign-chain-components = { workspace = true } -hermes-sovereign-rollup-components = { workspace = true } -hermes-sovereign-test-components = { workspace = true } -hermes-wasm-client-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-protobuf-encoding-components = { workspace = true } -hermes-logging-components = { workspace = true } +cgp-core = { workspace = true } +cgp-error-eyre = { workspace = true } +hermes-runtime-components = { workspace = true } +hermes-runtime = { workspace = true } +hermes-relayer-components = { workspace = true } +hermes-test-components = { workspace = true } +hermes-cosmos-relayer = { workspace = true } +hermes-celestia-chain = { workspace = true } +hermes-sovereign-chain-components = { workspace = true } +hermes-sovereign-rollup-components = { workspace = true } +hermes-sovereign-test-components = { workspace = true } +hermes-wasm-client-components = { workspace = true } +hermes-cosmos-chain-components = { workspace = true } +hermes-encoding-components = { workspace = true } +hermes-protobuf-encoding-components = { workspace = true } +hermes-logging-components = { workspace = true } -ibc = { workspace = true } -ibc-relayer = { workspace = true } -ibc-relayer-types = { workspace = true } -ibc-proto = { workspace = true } -sov-celestia-client = { workspace = true } +ibc = { workspace = true } +ibc-relayer = { workspace = true } +ibc-relayer-types = { workspace = true } +ibc-proto = { workspace = true } +sov-celestia-client = { workspace = true } -eyre = { workspace = true } -futures = { workspace = true } -ed25519-dalek = { workspace = true } -jsonrpsee = { workspace = true, features = ["http-client", "ws-client"] } +eyre = { workspace = true } +futures = { workspace = true } +ed25519-dalek = { workspace = true } +jsonrpsee = { workspace = true, features = [ "http-client", "ws-client" ] } diff --git a/crates/relayer/sovereign-relayer/src/contexts/cosmos_to_sovereign_relay.rs b/crates/relayer/sovereign-relayer/src/contexts/cosmos_to_sovereign_relay.rs index b9f5e02b..fc58a80f 100644 --- a/crates/relayer/sovereign-relayer/src/contexts/cosmos_to_sovereign_relay.rs +++ b/crates/relayer/sovereign-relayer/src/contexts/cosmos_to_sovereign_relay.rs @@ -15,9 +15,8 @@ use hermes_relayer_components::components::default::relay::{ DefaultRelayComponents, IsDefaultRelayComponent, }; use hermes_relayer_components::relay::impls::packet_filters::allow_all::AllowAll; -use hermes_relayer_components::relay::impls::packet_lock::PacketMutex; use hermes_relayer_components::relay::impls::packet_lock::{ - PacketMutexGetter, ProvidePacketLockWithMutex, + PacketMutex, PacketMutexGetter, ProvidePacketLockWithMutex, }; use hermes_relayer_components::relay::impls::packet_relayers::general::full_relay::FullCycleRelayer; use hermes_relayer_components::relay::traits::chains::{ diff --git a/crates/relayer/sovereign-relayer/src/contexts/sovereign_rollup.rs b/crates/relayer/sovereign-relayer/src/contexts/sovereign_rollup.rs index 1b017c99..17dbba29 100644 --- a/crates/relayer/sovereign-relayer/src/contexts/sovereign_rollup.rs +++ b/crates/relayer/sovereign-relayer/src/contexts/sovereign_rollup.rs @@ -200,8 +200,9 @@ use hermes_test_components::chain::traits::transfer::timeout::IbcTransferTimeout use hermes_test_components::chain::traits::types::address::AddressTypeComponent; use hermes_test_components::chain::traits::types::amount::AmountTypeComponent; use hermes_test_components::chain::traits::types::denom::DenomTypeComponent; -use hermes_test_components::chain::traits::types::memo::DefaultMemoGetterComponent; -use hermes_test_components::chain::traits::types::memo::{HasMemoType, MemoTypeComponent}; +use hermes_test_components::chain::traits::types::memo::{ + DefaultMemoGetterComponent, HasMemoType, MemoTypeComponent, +}; use hermes_test_components::chain::traits::types::wallet::WalletTypeComponent; use jsonrpsee::http_client::HttpClient; use jsonrpsee::ws_client::WsClient; diff --git a/crates/relayer/sovereign-relayer/src/contexts/sovereign_to_cosmos_relay.rs b/crates/relayer/sovereign-relayer/src/contexts/sovereign_to_cosmos_relay.rs index 8fb79123..fcbd3b4f 100644 --- a/crates/relayer/sovereign-relayer/src/contexts/sovereign_to_cosmos_relay.rs +++ b/crates/relayer/sovereign-relayer/src/contexts/sovereign_to_cosmos_relay.rs @@ -14,9 +14,8 @@ use hermes_relayer_components::components::default::relay::{ DefaultRelayComponents, IsDefaultRelayComponent, }; use hermes_relayer_components::relay::impls::packet_filters::allow_all::AllowAll; -use hermes_relayer_components::relay::impls::packet_lock::PacketMutex; use hermes_relayer_components::relay::impls::packet_lock::{ - PacketMutexGetter, ProvidePacketLockWithMutex, + PacketMutex, PacketMutexGetter, ProvidePacketLockWithMutex, }; use hermes_relayer_components::relay::traits::chains::{ CanRaiseRelayChainErrors, HasRelayChains, ProvideRelayChains, diff --git a/crates/relayer/sovereign-rollup-components/Cargo.toml b/crates/relayer/sovereign-rollup-components/Cargo.toml index db05ade5..c7f23c45 100644 --- a/crates/relayer/sovereign-rollup-components/Cargo.toml +++ b/crates/relayer/sovereign-rollup-components/Cargo.toml @@ -1,44 +1,44 @@ [package] -name = "hermes-sovereign-rollup-components" -version = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } -authors = { workspace = true } +name = "hermes-sovereign-rollup-components" +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } rust-version = { workspace = true } -readme = "README.md" -description = """ +readme = "README.md" +description = """ Context-generic client components for communicating with a Sovereign rollup node """ [dependencies] -cgp-core = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-cosmos-chain-components = { workspace = true } -hermes-wasm-client-components = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-encoding-components = { workspace = true } -hermes-protobuf-encoding-components = { workspace = true } +cgp-core = { workspace = true } +hermes-relayer-components = { workspace = true } +hermes-cosmos-chain-components = { workspace = true } +hermes-wasm-client-components = { workspace = true } +hermes-runtime-components = { workspace = true } +hermes-encoding-components = { workspace = true } +hermes-protobuf-encoding-components = { workspace = true } -ibc-proto = { workspace = true } -ibc-relayer = { workspace = true } -ibc-relayer-types = { workspace = true } -sov-celestia-client = { workspace = true, features = ["test-util"] } -ibc = { workspace = true } -ibc-query = { workspace = true, features = ["serde"] } +ibc-proto = { workspace = true } +ibc-relayer = { workspace = true } +ibc-relayer-types = { workspace = true } +sov-celestia-client = { workspace = true, features = [ "test-util" ] } +ibc = { workspace = true } +ibc-query = { workspace = true, features = [ "serde" ] } -tokio = { workspace = true } -eyre = { workspace = true } -jsonrpsee = { workspace = true, features = ["http-client"] } -prost = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -bech32 = { workspace = true } -borsh = { workspace = true } -futures = { workspace = true } -ed25519-dalek = { workspace = true } -jmt = { workspace = true } -sha2 = { workspace = true } -hex = { version = "0.4.3" } -base64 = { version = "0.22.1" } -serde-json-wasm = { version = "1.0.1" } \ No newline at end of file +tokio = { workspace = true } +eyre = { workspace = true } +jsonrpsee = { workspace = true, features = [ "http-client" ] } +prost = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +bech32 = { workspace = true } +borsh = { workspace = true } +futures = { workspace = true } +ed25519-dalek = { workspace = true } +jmt = { workspace = true } +sha2 = { workspace = true } +hex = { version = "0.4.3" } +base64 = { version = "0.22.1" } +serde-json-wasm = { version = "1.0.1" } diff --git a/crates/relayer/sovereign-rollup-components/src/types/messages/ibc.rs b/crates/relayer/sovereign-rollup-components/src/types/messages/ibc.rs index ac15b57d..a8942bb9 100644 --- a/crates/relayer/sovereign-rollup-components/src/types/messages/ibc.rs +++ b/crates/relayer/sovereign-rollup-components/src/types/messages/ibc.rs @@ -1,8 +1,9 @@ +use std::io::prelude::Write; + use borsh::BorshSerialize; use ibc::apps::transfer::types::msgs::transfer::MsgTransfer; use ibc_proto::google::protobuf::Any; use ibc_relayer_types::core::ics02_client::height::Height; -use std::io::prelude::Write; use crate::types::message::SovereignMessage; diff --git a/crates/relayer/sovereign-test-components/Cargo.toml b/crates/relayer/sovereign-test-components/Cargo.toml index 8314b4ea..e22224c6 100644 --- a/crates/relayer/sovereign-test-components/Cargo.toml +++ b/crates/relayer/sovereign-test-components/Cargo.toml @@ -1,37 +1,37 @@ [package] -name = "hermes-sovereign-test-components" -version = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } -authors = { workspace = true } +name = "hermes-sovereign-test-components" +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } +authors = { workspace = true } rust-version = { workspace = true } -readme = "README.md" -description = """ +readme = "README.md" +description = """ Dependencies for running Sovereign integration tests """ [dependencies] -cgp-core = { workspace = true } -hermes-runtime-components = { workspace = true } -hermes-runtime = { workspace = true } -hermes-relayer-components = { workspace = true } -hermes-test-components = { workspace = true } -hermes-cosmos-test-components = { workspace = true } -hermes-celestia-test-components = { workspace = true } -hermes-sovereign-chain-components = { workspace = true } -hermes-sovereign-rollup-components = { workspace = true } +cgp-core = { workspace = true } +hermes-runtime-components = { workspace = true } +hermes-runtime = { workspace = true } +hermes-relayer-components = { workspace = true } +hermes-test-components = { workspace = true } +hermes-cosmos-test-components = { workspace = true } +hermes-celestia-test-components = { workspace = true } +hermes-sovereign-chain-components = { workspace = true } +hermes-sovereign-rollup-components = { workspace = true } -ibc = { workspace = true } -ibc-relayer = { workspace = true } -ibc-relayer-types = { workspace = true } +ibc = { workspace = true } +ibc-relayer = { workspace = true } +ibc-relayer-types = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -toml = { workspace = true } -ed25519-dalek = { version = "2.1.1" } -sha2 = { version = "0.10.8" } -hex = { version = "0.4.3" } -rand = { workspace = true } -bech32 = { workspace = true } -jsonrpsee = { workspace = true, features = ["http-client"] } +serde = { workspace = true } +serde_json = { workspace = true } +toml = { workspace = true } +ed25519-dalek = { version = "2.1.1" } +sha2 = { version = "0.10.8" } +hex = { version = "0.4.3" } +rand = { workspace = true } +bech32 = { workspace = true } +jsonrpsee = { workspace = true, features = [ "http-client" ] }