Skip to content

Commit b076784

Browse files
romacromac
authored
Use workspace dependencies (#3907)
1 parent 97c575e commit b076784

File tree

13 files changed

+2613
-435
lines changed

13 files changed

+2613
-435
lines changed

‎Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+99
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,105 @@ exclude = [
1818
"tools/query-events",
1919
]
2020

21+
[workspace.dependencies]
22+
# Hermes dependencies
23+
ibc-relayer-cli = { version = "1.8.2", path = "crates/relayer-cli" }
24+
ibc-relayer = { version = "0.27.2", path = "crates/relayer" }
25+
ibc-relayer-rest = { version = "0.27.2", path = "crates/relayer-rest" }
26+
ibc-relayer-types = { version = "0.27.2", path = "crates/relayer-types" }
27+
ibc-chain-registry = { version = "0.27.2", path = "crates/chain-registry" }
28+
ibc-telemetry = { version = "0.27.2", path = "crates/telemetry" }
29+
ibc-test-framework = { version = "0.27.2", path = "tools/test-framework" }
30+
ibc-integration-test = { version = "0.27.2", path = "tools/integration-test" }
31+
32+
# Tendermint dependencies
33+
tendermint = { version = "0.34.0", default-features = false }
34+
tendermint-light-client = { version = "0.34.0", default-features = false }
35+
tendermint-light-client-detector = { version = "0.34.0", default-features = false }
36+
tendermint-light-client-verifier = { version = "0.34.0", default-features = false }
37+
tendermint-proto = "0.34.1"
38+
tendermint-rpc = "0.34.0"
39+
tendermint-testgen = "0.34.0"
40+
41+
# Other dependencies
42+
abscissa_core = "=0.6.0"
43+
anyhow = "1.0"
44+
async-stream = "0.3.5"
45+
async-trait = "0.1.72"
46+
axum = "0.6.18"
47+
bech32 = "0.9.1"
48+
bitcoin = "0.31.1"
49+
bs58 = "0.5.0"
50+
byte-unit = { version = "4.0.19", default-features = false }
51+
bytes = "1.4.0"
52+
clap = "3.2"
53+
clap_complete = "3.2"
54+
color-eyre = "0.6"
55+
console = "0.15.5"
56+
crossbeam-channel = "0.5.11"
57+
dashmap = "5.4.0"
58+
derive_more = { version = "0.99.17", default-features = false }
59+
dialoguer = "0.11.0"
60+
digest = "0.10.6"
61+
dirs-next = "2.0.0"
62+
ed25519 = "2.2.2"
63+
ed25519-dalek = "2.0.0"
64+
ed25519-dalek-bip32 = "0.3.0"
65+
env_logger = "0.11.1"
66+
eyre = "0.6.12"
67+
flex-error = { version = "0.4.4", default-features = false }
68+
futures = "0.3.27"
69+
generic-array = "0.14.7"
70+
hdpath = "0.6.3"
71+
hex = "0.4.3"
72+
http = "0.2.9"
73+
humantime = "2.1.0"
74+
humantime-serde = "1.1.1"
75+
ibc-proto = "0.42.0"
76+
ics23 = "0.11.1"
77+
itertools = "0.10.5"
78+
moka = "0.12.5"
79+
num-bigint = "0.4"
80+
num-rational = "0.4.1"
81+
once_cell = "1.19.0"
82+
oneline-eyre = "0.1"
83+
opentelemetry = "0.19.0"
84+
opentelemetry-prometheus = "0.12.0"
85+
primitive-types = { version = "0.12.1", default-features = false }
86+
prometheus = "0.13.2"
87+
prost = "0.12"
88+
rand = "0.8.5"
89+
regex = "1.9.5"
90+
reqwest = { version = "0.11.16", default-features = false }
91+
retry = { version = "2.0.0", default-features = false }
92+
ripemd = "0.1.3"
93+
secp256k1 = "0.28.2"
94+
semver = "1.0.21"
95+
serde = "1.0.197"
96+
serde_derive = "1.0.104"
97+
serde_json = "1.0.111"
98+
serde_yaml = "0.9.31"
99+
serial_test = "3.0.0"
100+
sha2 = "0.10.6"
101+
signal-hook = "0.3.17"
102+
signature = "2.1.0"
103+
strum = "0.25"
104+
subtle-encoding = "0.5.1"
105+
tempfile = "3.10.1"
106+
test-log = "0.2.14"
107+
thiserror = "1.0.57"
108+
time = "0.3"
109+
tiny-bip39 = "1.0.0"
110+
tiny-keccak = { version = "2.0.2", default-features = false }
111+
tokio = "1.26.0"
112+
tokio-stream = "0.1.14"
113+
toml = "0.8.8"
114+
tonic = "0.10"
115+
tracing = { version = "0.1.36", default-features = false }
116+
tracing-subscriber = "0.3.14"
117+
uint = "0.9"
118+
uuid = "1.7.0"
119+
21120
[profile.release]
22121
overflow-checks = true
23122

‎crates/chain-registry/Cargo.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ description = """
1212
"""
1313

1414
[dependencies]
15-
ibc-relayer-types = { version = "0.27.2", path = "../relayer-types" }
16-
ibc-proto = { version = "0.42.0", features = ["serde"] }
17-
tendermint-rpc = { version = "0.34.0", features = ["http-client", "websocket-client"] }
15+
ibc-relayer-types = { workspace = true }
16+
ibc-proto = { workspace = true, features = ["serde"] }
17+
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client"] }
1818

19-
async-trait = "0.1.72"
20-
flex-error = { version = "0.4.4", default-features = false }
21-
futures = { version = "0.3.27", features = ["executor"] }
22-
http = "0.2"
23-
itertools = "0.10.5"
24-
reqwest = { version = "0.11.13", features = ["rustls-tls-native-roots", "json"], default-features = false }
25-
serde = "1.0.197"
26-
serde_json = "1"
27-
tokio = "1.17.0"
28-
tracing = "0.1.36"
19+
async-trait = { workspace = true }
20+
flex-error = { workspace = true }
21+
futures = { workspace = true, features = ["executor"] }
22+
http = { workspace = true }
23+
itertools = { workspace = true }
24+
reqwest = { workspace = true, features = ["rustls-tls-native-roots", "json"] }
25+
serde = { workspace = true }
26+
serde_json = { workspace = true }
27+
tokio = { workspace = true }
28+
tracing = { workspace = true }

‎crates/relayer-cli/Cargo.toml

+37-47
Original file line numberDiff line numberDiff line change
@@ -25,53 +25,43 @@ telemetry = ["ibc-relayer/telemetry", "ibc-telemetry"]
2525
rest-server = ["ibc-relayer-rest"]
2626

2727
[dependencies]
28-
ibc-relayer-types = { version = "0.27.2", path = "../relayer-types" }
29-
ibc-relayer = { version = "0.27.2", path = "../relayer" }
30-
ibc-telemetry = { version = "0.27.2", path = "../telemetry", optional = true }
31-
ibc-relayer-rest = { version = "0.27.2", path = "../relayer-rest", optional = true }
32-
ibc-chain-registry = { version = "0.27.2" , path = "../chain-registry" }
28+
ibc-relayer-types = { workspace = true }
29+
ibc-relayer = { workspace = true }
30+
ibc-telemetry = { workspace = true, optional = true }
31+
ibc-relayer-rest = { workspace = true, optional = true }
32+
ibc-chain-registry = { workspace = true }
3333

34-
clap = { version = "3.2", features = ["cargo"] }
35-
clap_complete = "3.2"
36-
color-eyre = "0.6"
37-
console = "0.15.5"
38-
crossbeam-channel = "0.5.11"
39-
dialoguer = "0.11.0"
40-
dirs-next = "2.0.0"
41-
eyre = "0.6.12"
42-
flex-error = { version = "0.4.4", default-features = false, features = ["std", "eyre_tracer"] }
43-
futures = "0.3.27"
44-
hdpath = "0.6.3"
45-
http = "0.2"
46-
humantime = "2.1"
47-
itertools = "0.10.5"
48-
oneline-eyre = "0.1"
49-
regex = "1.9.5"
50-
serde = { version = "1.0", features = ["serde_derive"] }
51-
serde_json = "1"
52-
signal-hook = "0.3.17"
53-
subtle-encoding = "0.5"
54-
tokio = { version = "1.0", features = ["full"] }
55-
tracing = "0.1.36"
56-
tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"]}
57-
time = "0.3"
58-
[dependencies.tendermint]
59-
version = "0.34.0"
60-
features = ["secp256k1"]
61-
62-
[dependencies.tendermint-rpc]
63-
version = "0.34.0"
64-
features = ["http-client", "websocket-client"]
65-
66-
[dependencies.tendermint-light-client-verifier]
67-
version = "0.34.0"
68-
69-
[dependencies.abscissa_core]
70-
version = "=0.6.0"
71-
features = ["options"]
34+
abscissa_core = { workspace = true, features = ["options"] }
35+
clap = { workspace = true, features = ["cargo"] }
36+
clap_complete = { workspace = true }
37+
color-eyre = { workspace = true }
38+
console = { workspace = true }
39+
crossbeam-channel = { workspace = true }
40+
dialoguer = { workspace = true }
41+
dirs-next = { workspace = true }
42+
eyre = { workspace = true }
43+
flex-error = { workspace = true, features = ["std", "eyre_tracer"] }
44+
futures = { workspace = true }
45+
hdpath = { workspace = true }
46+
http = { workspace = true }
47+
humantime = { workspace = true }
48+
itertools = { workspace = true }
49+
oneline-eyre = { workspace = true }
50+
regex = { workspace = true }
51+
serde = { workspace = true, features = ["serde_derive"] }
52+
serde_json = { workspace = true }
53+
signal-hook = { workspace = true }
54+
subtle-encoding = { workspace = true }
55+
tendermint-light-client-verifier = { workspace = true }
56+
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client"] }
57+
tendermint = { workspace = true, features = ["secp256k1"] }
58+
time = { workspace = true }
59+
tokio = { workspace = true, features = ["full"] }
60+
tracing = { workspace = true }
61+
tracing-subscriber = { workspace = true, features = ["fmt", "env-filter", "json"] }
7262

7363
[dev-dependencies]
74-
abscissa_core = { version = "=0.6.0", features = ["testing"] }
75-
once_cell = "1.19"
76-
regex = "1.9"
77-
serial_test = "3.0.0"
64+
abscissa_core = { workspace = true, features = ["testing"] }
65+
once_cell = { workspace = true }
66+
regex = { workspace = true }
67+
serial_test = { workspace = true }

‎crates/relayer-rest/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ description = """
1414
"""
1515

1616
[dependencies]
17-
ibc-relayer-types = { version = "0.27.2", path = "../relayer-types" }
18-
ibc-relayer = { version = "0.27.2", path = "../relayer" }
17+
ibc-relayer-types = { workspace = true }
18+
ibc-relayer = { workspace = true }
1919

20-
crossbeam-channel = "0.5"
21-
serde = "1.0"
22-
tracing = "0.1"
23-
axum = "0.6"
24-
tokio = "1.26"
20+
axum = { workspace = true }
21+
crossbeam-channel = { workspace = true }
22+
serde = { workspace = true }
23+
tokio = { workspace = true }
24+
tracing = { workspace = true }
2525

2626
[dev-dependencies]
27-
reqwest = { version = "0.11.16", features = ["json"], default-features = false }
28-
toml = "0.8.8"
27+
reqwest = { workspace = true, features = ["json"] }
28+
toml = { workspace = true }

‎crates/relayer-types/Cargo.toml

+26-38
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,31 @@ clock = []
2323
mocks = ["tendermint-testgen", "clock"]
2424

2525
[dependencies]
26-
# Proto definitions for all IBC-related interfaces, e.g., connections or channels.
27-
ibc-proto = { version = "0.42.0", features = ["serde"] }
28-
ics23 = { version = "0.11.1", features = ["std", "host-functions"] }
29-
time = { version = "0.3" }
30-
serde_derive = { version = "1.0.104" }
31-
serde = { version = "1.0" }
32-
serde_json = { version = "1" }
33-
prost = { version = "0.12" }
34-
bytes = { version = "1.4.0" }
35-
subtle-encoding = { version = "0.5" }
36-
flex-error = { version = "0.4.4" }
37-
derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
38-
uint = { version = "0.9" }
39-
itertools = { version = "0.10.3" }
40-
primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std"] }
41-
num-rational = "0.4.1"
42-
regex = "1"
43-
44-
[dependencies.tendermint]
45-
version = "0.34.0"
46-
features = ["clock"]
47-
48-
[dependencies.tendermint-proto]
49-
version = "0.34.1"
50-
51-
[dependencies.tendermint-light-client-verifier]
52-
version = "0.34.0"
53-
features = ["rust-crypto"]
54-
55-
[dependencies.tendermint-testgen]
56-
version = "0.34.0"
57-
optional = true
26+
bytes = { workspace = true }
27+
derive_more = { workspace = true, features = ["from", "into", "display"] }
28+
flex-error = { workspace = true }
29+
ibc-proto = { workspace = true, features = ["serde"] }
30+
ics23 = { workspace = true, features = ["std", "host-functions"] }
31+
itertools = { workspace = true }
32+
num-rational = { workspace = true }
33+
primitive-types = { workspace = true, features = ["serde_no_std"] }
34+
prost = { workspace = true }
35+
regex = { workspace = true }
36+
serde = { workspace = true }
37+
serde_derive = { workspace = true }
38+
serde_json = { workspace = true }
39+
subtle-encoding = { workspace = true }
40+
tendermint-light-client-verifier = { workspace = true, features = ["rust-crypto"] }
41+
tendermint-proto = { workspace = true }
42+
tendermint-testgen = { workspace = true, optional = true }
43+
tendermint = { workspace = true, features = ["clock"] }
44+
time = { workspace = true }
45+
uint = { workspace = true }
5846

5947
[dev-dependencies]
60-
env_logger = "0.11.1"
61-
tracing = { version = "0.1.36", default-features = false }
62-
tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"] }
63-
test-log = { version = "0.2.14", features = ["trace"] }
64-
tendermint-rpc = { version = "0.34.0", features = ["http-client", "websocket-client"] }
65-
tendermint-testgen = { version = "0.34.0" } # Needed for generating (synthetic) light blocks.
48+
env_logger = { workspace = true }
49+
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client"] }
50+
tendermint-testgen = { workspace = true } # Needed for generating (synthetic) light blocks.
51+
test-log = { workspace = true, features = ["trace"] }
52+
tracing = { workspace = true }
53+
tracing-subscriber = { workspace = true, features = ["fmt", "env-filter", "json"] }

0 commit comments

Comments
 (0)