Skip to content

Commit

Permalink
Use Cargo workspace to manage Cargo metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
soareschen committed Nov 9, 2023
1 parent f44fe65 commit 010707d
Show file tree
Hide file tree
Showing 13 changed files with 374 additions and 513 deletions.
306 changes: 89 additions & 217 deletions Cargo.lock

Large diffs are not rendered by default.

60 changes: 48 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,65 @@
resolver = "2"

members = [
"crates/cosmos-client-components",
"crates/relayer-components",
"crates/relayer-components-extra",
"crates/relayer-subscription",
"crates/relayer-runtime",
"crates/cosmos-client-components",
"crates/relayer-cosmos",
"crates/relayer-solomachine",
"crates/relayer-cosmos-mock",
"crates/relayer-runtime",
"crates/relayer-solomachine",
"crates/relayer-subscription",
"crates/relayer-mock",
"tools/integration-test",
"tools/test-framework",
]

[workspace.package]
version = "0.1.0"
edition = "2021"
license = "Apache-2.0"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/hermes-sdk"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.72"

[workspace.dependencies]
async-trait = { version = "0.1.56" }
ibc = { version = "0.47.0" }
ibc-proto = { version = "0.38.0" }
ibc-relayer = { version = "0.26.0" }
ibc-relayer-types = { version = "0.26.0" }
ibc-telemetry = { version = "0.26.0" }
tendermint = { version = "0.34" }
tendermint-rpc = { version = "0.34" }
tendermint-testgen = { version = "0.34" }
basecoin-app = { version = "0.1.0" }
basecoin-store = { version = "0.1.0" }
cgp-core = { version = "0.1.0" }
prost = { version = "0.12.0" }
serde = { version = "1.0" }
serde_derive = { version = "1.0" }
serde_json = { version = "1.0" }
tokio = { version = "1.34" }
tracing = { version = "0.1.40" }
tonic = { version = "0.10" }
futures = { version = "0.3" }
eyre = { version = "0.6.8" }
itertools = { version = "0.11" }
http = { version = "0.2.10" }
flex-error = { version = "0.4.4", default-features = false }
ibc-relayer-components = { version = "0.1.0", path = "./crates/relayer-components" }
ibc-relayer-components-extra = { version = "0.1.0", path = "./crates/relayer-components-extra" }
ibc-relayer-runtime = { version = "0.1.0", path = "./crates/relayer-runtime" }
ibc-relayer-subscription = { version = "0.1.0", path = "./crates/relayer-subscription" }
ibc-cosmos-client-components = { version = "0.1.0", path = "./crates/cosmos-client-components" }
ibc-relayer-cosmos = { version = "0.1.0", path = "./crates/relayer-cosmos" }
ibc-relayer-solomachine = { version = "0.1.0", path = "./crates/relayer-solomachine" }

[profile.release]
overflow-checks = true

[patch.crates-io]
ibc-relayer-components = { path = "./crates/relayer-components" }
ibc-relayer-components-extra = { path = "./crates/relayer-components-extra" }
ibc-relayer-runtime = { path = "./crates/relayer-runtime" }
ibc-relayer-subscription = { path = "./crates/relayer-subscription" }
ibc-cosmos-client-components = { path = "./crates/cosmos-client-components" }
ibc-relayer-cosmos = { path = "./crates/relayer-cosmos" }
ibc-relayer-solomachine = { path = "./crates/relayer-solomachine" }

ibc = { git = "https://github.com/cosmos/ibc-rs.git", branch = "main" }
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", branch = "main" }
ibc-derive = { git = "https://github.com/cosmos/ibc-rs.git", branch = "main" }
Expand All @@ -39,10 +73,12 @@ cgp-component-macro = { git = "https://github.com/informalsystems/cgp.git", bran
cgp-error = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
cgp-async = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
cgp-run = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }

# ibc-relayer-types = { git = "https://github.com/informalsystems/hermes.git", branch = "master" }
# ibc-relayer = { git = "https://github.com/informalsystems/hermes.git", branch = "master" }
# ibc-telemetry = { git = "https://github.com/informalsystems/hermes.git", branch = "master" }
# ibc-proto = { git = "https://github.com/cosmos/ibc-proto-rs.git", branch = "main" }

# tendermint = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
# tendermint-rpc = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
# tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
Expand Down
66 changes: 27 additions & 39 deletions crates/cosmos-client-components/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,49 +1,37 @@
[package]
name = "ibc-cosmos-client-components"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }
readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/ibc-rs"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.72"
description = """
Implementation of an IBC Relayer in Rust, as a library
"""

[package.metadata.docs.rs]
all-features = true

[features]
default = ["flex-error/std", "flex-error/eyre_tracer"]

[dependencies]
ibc-proto = { version = "0.38.0" }
ibc-relayer = { version = "0.26.0" }
ibc-relayer-types = { version = "0.26.0" }
cgp-core = { version = "0.1.0" }
ibc-relayer-runtime = { version = "0.1.0" }
ibc-relayer-components = { version = "0.1.0" }
ibc-relayer-components-extra = { version = "0.1.0" }
ibc-relayer-subscription = { version = "0.1.0" }

async-trait = "0.1.56"
flex-error = { version = "0.4.4", default-features = false }
prost = { version = "0.12" }
eyre = "0.6.8"
tokio = "1.0"
itertools = "0.10.3"
futures = "0.3"
tracing = "0.1.36"
http = "0.2.10"
tonic = { version = "0.10", features = ["tls", "tls-roots"] }

[dependencies.tendermint]
version = "0.34"
features = ["secp256k1"]
ibc-proto = { workspace = true }
ibc-relayer = { workspace = true }
ibc-relayer-types = { workspace = true }
cgp-core = { workspace = true }
ibc-relayer-runtime = { workspace = true }
ibc-relayer-components = { workspace = true }
ibc-relayer-components-extra = { workspace = true }
ibc-relayer-subscription = { workspace = true }
tendermint = { workspace = true, features = ["secp256k1"] }
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client"] }

[dependencies.tendermint-rpc]
version = "0.34"
features = ["http-client", "websocket-client"]
async-trait = { workspace = true }
flex-error = { workspace = true }
prost = { workspace = true }
eyre = { workspace = true }
tokio = { workspace = true }
itertools = { workspace = true }
futures = { workspace = true }
tracing = { workspace = true }
http = { workspace = true }
tonic = { workspace = true, features = ["tls", "tls-roots"] }

21 changes: 9 additions & 12 deletions crates/relayer-components-extra/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
[package]
name = "ibc-relayer-components-extra"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }
readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/ibc-rs"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.72"
description = """
Implementation of an IBC Relayer in Rust, as a library
"""

[package.metadata.docs.rs]
all-features = true

[dependencies]
cgp-core = { version = "0.1.0" }
ibc-relayer-components = { version = "0.1.0" }
cgp-core = { workspace = true }
ibc-relayer-components = { workspace = true }
19 changes: 8 additions & 11 deletions crates/relayer-components/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
[package]
name = "ibc-relayer-components"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }
readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/ibc-rs"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.72"
description = """
Implementation of an IBC Relayer in Rust, as a library
"""

[package.metadata.docs.rs]
all-features = true

[dependencies]
cgp-core = { version = "0.1.0" }
cgp-core = { workspace = true }
45 changes: 21 additions & 24 deletions crates/relayer-cosmos-mock/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ibc-relayer-cosmos-mock"
version = "0.1.0"
version = { workspace = true }
edition = "2021"
license = "Apache-2.0"
readme = "README.md"
Expand All @@ -15,26 +15,23 @@ description = """
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1.56"
basecoin-app = { version = "0.1.0" }
basecoin-store = { version = "0.1.0" }
ibc = { version = "0.47.0", features = ["mocks"] }
ibc-proto = "0.38.0"
cgp-core = { version = "0.1.0" }
ibc-relayer-components = { version = "0.1.0" }
ibc-relayer-components-extra = { version = "0.1.0" }
ibc-relayer-runtime = { version = "0.1.0" }
ibc-relayer-types = { version = "0.26.0" }
ibc-cosmos-client-components = { version = "0.1.0" }
primitive-types = { version = "0.12.0", default-features = false}
prost = "0.12.0"
serde_json = "1.0"
sha2 = { version = "0.10", default-features = false }
subtle-encoding = { version = "0.5", default-features = false }
rand = "0.8.5"
tendermint = { version = "0.34", features = ["rust-crypto"] }
tendermint-testgen = "0.34"
tracing = "0.1.36"
tokio = { version = "1.0", features = ["full"] }
tower-abci = "0.10"
tower = { version = "0.4", features = ["full"] }
async-trait = { workspace = true }
basecoin-app = { workspace = true }
basecoin-store = { workspace = true }
ibc = { workspace = true, features = ["mocks"] }
ibc-proto = { workspace = true }
cgp-core = { workspace = true }
ibc-relayer-components = { workspace = true }
ibc-relayer-components-extra = { workspace = true }
ibc-relayer-runtime = { workspace = true }
ibc-relayer-types = { workspace = true }
ibc-cosmos-client-components = { workspace = true }
tendermint = { workspace = true, features = ["rust-crypto"] }
tendermint-testgen = { workspace = true }
prost = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tracing = { workspace = true }
serde_json = { workspace = true }

primitive-types = { version = "0.12.0", default-features = false}
tower = { version = "0.4", features = ["full"] }
75 changes: 33 additions & 42 deletions crates/relayer-cosmos/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,55 +1,46 @@
[package]
name = "ibc-relayer-cosmos"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
rust-version = { workspace = true }
readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/ibc-rs"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.72"
description = """
Implementation of an IBC Relayer in Rust, as a library
"""

[package.metadata.docs.rs]
all-features = true

[features]
default = ["flex-error/std", "flex-error/eyre_tracer"]

[dependencies]
ibc-proto = { version = "0.38.0" }
ibc-relayer = { version = "0.26.0" }
ibc-relayer-types = { version = "0.26.0" }
ibc-telemetry = { version = "0.26.0" }
cgp-core = { version = "0.1.0" }
ibc-relayer-runtime = { version = "0.1.0" }
ibc-relayer-components = { version = "0.1.0" }
ibc-relayer-components-extra = { version = "0.1.0" }
ibc-relayer-subscription = { version = "0.1.0" }
ibc-cosmos-client-components = { version = "0.1.0" }

serde = "1.0"
serde_derive = "1.0"
async-trait = "0.1.56"
flex-error = { version = "0.4.4", default-features = false }
prost = { version = "0.12" }
eyre = "0.6.8"
tokio = "1.24"
itertools = "0.10.3"
futures = "0.3"
tracing = "0.1.36"
http = "0.2.9"
opentelemetry = { version = "0.17.0", features = ["metrics"] }
tonic = { version = "0.9", features = ["tls", "tls-roots"] }
moka = { version = "0.11", features = ["future"] }

[dependencies.tendermint]
version = "0.34"
features = ["secp256k1"]
ibc-proto = { workspace = true }
ibc-relayer = { workspace = true }
ibc-relayer-types = { workspace = true }
ibc-telemetry = { workspace = true }
cgp-core = { workspace = true }
ibc-relayer-runtime = { workspace = true }
ibc-relayer-components = { workspace = true }
ibc-relayer-components-extra = { workspace = true }
ibc-relayer-subscription = { workspace = true }
ibc-cosmos-client-components = { workspace = true }
tendermint = { workspace = true, features = ["secp256k1"] }
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client"] }

[dependencies.tendermint-rpc]
version = "0.34"
features = ["http-client", "websocket-client"]
async-trait = { workspace = true }
eyre = { workspace = true }
flex-error = { workspace = true }
prost = { workspace = true }
tracing = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true, features = ["tls", "tls-roots"] }
serde = { workspace = true }
serde_derive = { workspace = true }
itertools = { workspace = true }
futures = { workspace = true }
http = { workspace = true }

opentelemetry = { version = "0.17.0", features = ["metrics"] }
moka = { version = "0.11", features = ["future"] }
Loading

0 comments on commit 010707d

Please sign in to comment.