Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.

Commit cb7f46b

Browse files
dartdart26dartdart26
committed
chore(deps): do not pin deps in Cargo.toml
Instead, rely on Cargo.lock for pinning versions. Also, update otel to 0.29 and redo the code as it no longer compiles. Add the aws-sdk-kms and rstest dependencies for use in the transaction-sender. Specify more common dependencies in the workspace Cargo.toml file.
1 parent 3c51693 commit cb7f46b

File tree

12 files changed

+486
-328
lines changed

12 files changed

+486
-328
lines changed

‎fhevm-engine/Cargo.lock

Lines changed: 372 additions & 231 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fhevm-engine/Cargo.toml

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,43 @@ edition = "2021"
99
license = "BSD-3-Clause-Clear"
1010

1111
[workspace.dependencies]
12-
alloy = { version = "=0.11.1", features = ["full", "provider-anvil-api", "provider-anvil-node", "sol-types"] }
13-
anyhow = "=1.0.97"
14-
bincode = "=1.3.3"
15-
clap = { version = "=4.5", features = ["derive"] }
16-
daggy = "=0.8.1"
17-
futures-util = "=0.3.31"
18-
prometheus = "=0.14.0"
19-
prost = "=0.13"
20-
rand = "=0.9.0"
21-
rayon = "=1.10.0"
22-
serde = "=1.0.219"
23-
sha3 = "=0.10.8"
24-
sqlx = { version = "=0.8.3", default-features = false, features = ["macros", "migrate", "runtime-tokio", "tls-native-tls", "time", "postgres", "uuid"] }
12+
alloy = { version = "0.11.1", features = ["full", "provider-anvil-api", "provider-anvil-node", "sol-types"] }
13+
alloy-primitives = "0.8.25"
14+
anyhow = "1.0.98"
15+
aws-config = "1.6.3"
16+
bigdecimal = "0.4.8"
17+
bincode = "1.3.3"
18+
clap = { version = "4.5.38", features = ["derive"] }
19+
daggy = "0.8.1"
20+
foundry-compilers = { version = "0.13.5", features = ["svm-solc"] }
21+
futures-util = "0.3.31"
22+
hex = "0.4.3"
23+
lru = "0.13.0"
24+
opentelemetry = "0.29.1"
25+
opentelemetry-otlp = { version = "0.29.0", features = ["grpc-tonic"] }
26+
opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio"] }
27+
opentelemetry-semantic-conventions = "0.29.0"
28+
prometheus = "0.14.0"
29+
prost = "0.13.5"
30+
rand = "0.9.1"
31+
rayon = "1.10.0"
32+
semver = "1.0.26"
33+
serde = "1.0.219"
34+
serde_json = "1.0.140"
35+
serial_test = "3.2.0"
36+
sha3 = "0.10.8"
37+
strum = { version = "0.26.3", features = ["derive"] }
38+
sqlx = { version = "0.8.5", default-features = false, features = ["macros", "migrate", "runtime-tokio", "tls-native-tls", "time", "postgres", "uuid"] }
39+
testcontainers = "0.24.0"
40+
thiserror = "2.0.12"
2541
tfhe = { version = "=1.1.2", features = ["boolean", "shortint", "integer", "zk-pok", "experimental-force_fft_algo_dif4"] }
2642
tfhe-versionable = "=0.5.0"
27-
tokio = { version = "=1.38.1", features = ["full"] }
28-
tokio-util = "=0.7"
29-
tonic = { version = "=0.12", features = ["server"] }
30-
tracing = "=0.1.41"
31-
tracing-subscriber = { version = "=0.3.19", features = ["fmt", "json"] }
32-
hex = "0.4"
33-
34-
# opentelemetry support
35-
opentelemetry = "0.25.0"
36-
opentelemetry-otlp = "0.25.0"
37-
opentelemetry_sdk = { version = "0.25.0", features = ["rt-tokio"] }
38-
opentelemetry-semantic-conventions = "0.27.0"
43+
tokio = { version = "1.45.0", features = ["full"] }
44+
tokio-util = "0.7.15"
45+
tonic = { version = "0.12.3", features = ["server"] }
46+
tonic-build = "0.12.3"
47+
tracing = "0.1.41"
48+
tracing-subscriber = { version = "0.3.19", features = ["fmt", "json"] }
3949

4050
[profile.dev.package.tfhe]
4151
overflow-checks = false

‎fhevm-engine/coprocessor/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@ license.workspace = true
99
[dependencies]
1010
# workspace dependencies
1111
alloy = { workspace = true }
12+
bigdecimal = { workspace = true }
1213
bincode = { workspace = true }
1314
clap = { workspace = true }
15+
hex = { workspace = true }
16+
lru = { workspace = true }
1417
prometheus = { workspace = true }
1518
prost = { workspace = true }
1619
rand = { workspace = true }
1720
rayon = { workspace = true }
21+
serde_json = { workspace = true }
1822
sha3 = { workspace = true }
23+
strum = { workspace = true }
1924
sqlx = { workspace = true }
2025
tfhe = { workspace = true }
2126
tokio = { workspace = true }
@@ -31,17 +36,12 @@ opentelemetry-semantic-conventions = { workspace = true }
3136

3237
# crates.io dependencies
3338
actix-web = "4.9.0"
34-
bigdecimal = "0.4"
35-
hex = "0.4"
3639
itertools = "0.13.0"
3740
lazy_static = "1.5.0"
38-
lru = "0.12.3"
39-
regex = "1.10.5"
40-
serde_json = "1.0"
41-
strum = { version = "0.26", features = ["derive"] }
42-
tonic-health = "0.12"
43-
tonic-types = "0.12"
44-
tonic-web = "0.12"
41+
regex = "1.10.6"
42+
tonic-health = "0.12.3"
43+
tonic-types = "0.12.3"
44+
tonic-web = "0.12.3"
4545

4646
# local dependencies
4747
fhevm-engine-common = { path = "../fhevm-engine-common" }
@@ -52,13 +52,13 @@ nightly-avx512 = ["tfhe/nightly-avx512"]
5252
gpu = ["tfhe/gpu", "scheduler/gpu", "fhevm-engine-common/gpu"]
5353

5454
[dev-dependencies]
55-
testcontainers = "0.21"
55+
testcontainers = { workspace = true }
5656
fhevm-listener = { path = "../fhevm-listener" }
5757
criterion = { version = "0.5.1", features = ["async_futures"] }
5858
serde = { workspace = true }
5959

6060
[build-dependencies]
61-
tonic-build = "0.12"
61+
tonic-build = { workspace = true }
6262

6363
[[bin]]
6464
name = "coprocessor"

‎fhevm-engine/fhevm-engine-common/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ license.workspace = true
88
[dependencies]
99
# workspace dependencies
1010
anyhow = { workspace = true }
11+
bigdecimal = { workspace = true }
1112
bincode = { workspace = true }
13+
hex = { workspace = true }
14+
lru = { workspace = true }
15+
prost = { workspace = true }
1216
rand = { workspace = true }
1317
serde = { workspace = true }
1418
sha3 = { workspace = true }
19+
strum = { workspace = true }
20+
sqlx = {workspace = true}
1521
tfhe = { workspace = true }
16-
prost = { workspace = true }
1722
tonic = { workspace = true }
18-
sqlx = {workspace = true}
1923
tokio = { workspace = true }
20-
lru = "0.13"
2124
tracing = { workspace = true }
2225

2326
# crates.io dependencies
24-
bigdecimal = "0.4.5"
25-
hex = "0.4"
2627
paste = "1.0.15"
2728
rand_chacha = "0.3.1"
28-
strum = { version = "0.26", features = ["derive"] }
2929

3030
# opentelemetry support
3131
opentelemetry = { workspace = true }
@@ -38,7 +38,7 @@ nightly-avx512 = ["tfhe/nightly-avx512"]
3838
gpu = ["tfhe/gpu"]
3939

4040
[build-dependencies]
41-
tonic-build = "0.12"
41+
tonic-build = { workspace = true }
4242

4343
[[bin]]
4444
name = "generate-keys"

‎fhevm-engine/fhevm-engine-common/src/telemetry.rs

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,32 @@ use opentelemetry::{
33
trace::{SpanBuilder, Status, TraceContextExt, Tracer},
44
Context, KeyValue,
55
};
6-
use opentelemetry_sdk::Resource;
6+
use opentelemetry_sdk::{trace::SdkTracerProvider, Resource};
77
use std::{sync::Arc, time::SystemTime};
88

99
use crate::utils::compact_hex;
1010

1111
pub fn setup_otlp(
1212
service_name: &str,
1313
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
14-
let otlp_exporter = opentelemetry_otlp::new_exporter().tonic();
15-
16-
let trace_provider = opentelemetry_otlp::new_pipeline()
17-
.tracing()
18-
.with_exporter(otlp_exporter)
19-
.with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
20-
Resource::new(vec![KeyValue::new(
21-
opentelemetry_semantic_conventions::resource::SERVICE_NAME.to_string(),
22-
service_name.to_string(),
23-
)]),
24-
))
25-
.install_batch(opentelemetry_sdk::runtime::Tokio)?;
14+
let otlp_exporter = opentelemetry_otlp::SpanExporter::builder()
15+
.with_tonic()
16+
.build()?;
17+
18+
let resource = Resource::builder_empty()
19+
.with_attributes(vec![KeyValue::new(
20+
opentelemetry_semantic_conventions::resource::SERVICE_NAME.to_string(),
21+
service_name.to_string(),
22+
)])
23+
.build();
24+
25+
let trace_provider = SdkTracerProvider::builder()
26+
.with_resource(resource)
27+
.with_batch_exporter(otlp_exporter)
28+
.build();
2629

2730
opentelemetry::global::set_tracer_provider(trace_provider);
31+
2832
Ok(())
2933
}
3034

‎fhevm-engine/fhevm-listener/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ bench = false
1212

1313
[dependencies]
1414
# external dependencies
15-
alloy-primitives = "0.8.21"
1615
alloy-provider = "0.11.1"
1716
alloy-eips = "0.11.1"
18-
alloy-rpc-types = "0.11"
19-
alloy-sol-types = "0.8"
17+
alloy-rpc-types = "0.11.1"
18+
alloy-sol-types = "0.8.25"
2019

21-
# workspace dependency
20+
# workspace dependencies
2221
alloy = { workspace = true, features = ["contract", "json", "providers", "provider-ws", "pubsub", "rpc-types", "sol-types"] }
22+
alloy-primitives = { workspace = true }
2323
clap = { workspace = true }
2424
futures-util = { workspace = true }
2525
serde = { workspace = true }
@@ -31,9 +31,9 @@ fhevm-engine-common = { path = "../fhevm-engine-common" }
3131

3232
[dev-dependencies]
3333
anyhow = { workspace = true }
34-
serial_test = "3.2.0"
34+
serial_test = { workspace = true }
3535

3636
[build-dependencies]
37-
foundry-compilers = { version = "=0.13.5", features = ["svm-solc"] }
38-
foundry-compilers-artifacts = "=0.13.5"
39-
semver = "1.0.26"
37+
foundry-compilers = { workspace = true }
38+
foundry-compilers-artifacts = "0.13"
39+
semver = { workspace = true }

‎fhevm-engine/gw-listener/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ tracing = { workspace = true }
1818
tracing-subscriber = { workspace = true }
1919

2020
[build-dependencies]
21-
foundry-compilers = { version = "0.13.0", features = ["svm-solc"] }
22-
semver = "1.0.26"
21+
foundry-compilers = { workspace = true }
22+
semver = { workspace = true }
2323

2424
[dev-dependencies]
25-
serial_test = "3.2.0"
25+
serial_test = { workspace = true }

‎fhevm-engine/gw-listener/src/gw_listener.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ use tracing::{error, info};
1010

1111
use crate::ConfigSettings;
1212

13-
const LOG_TARGET: &str = "gw_listener";
14-
1513
sol!(
1614
#[sol(rpc)]
1715
InputVerification,

‎fhevm-engine/sns-executor/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ license.workspace = true
77

88
[dependencies]
99
# workspace dependencies
10+
aws-config = { workspace = true }
1011
bincode = { workspace = true }
1112
clap = { workspace = true }
13+
hex = { workspace = true }
1214
prometheus = { workspace = true }
1315
prost = { workspace = true }
1416
rayon = { workspace = true }
17+
serde_json = { workspace = true }
1518
sha3 = { workspace = true }
19+
thiserror = { workspace = true }
1620
tfhe = { workspace = true}
1721
tokio = { workspace = true }
1822
tonic = { workspace = true }
@@ -25,14 +29,10 @@ tfhe-versionable = { workspace = true }
2529
tokio-util = { workspace = true }
2630

2731
# crates.io dependencies
28-
hex = "=0.4"
29-
aligned-vec = "=0.6"
30-
num-traits = "=0.2.19"
31-
thiserror = "=2.0"
32-
serde_json = "=1.0"
33-
aws-sdk-s3 = "=1.78"
34-
aws-config = "=1.5"
35-
bytesize = "=2.0.1"
32+
aligned-vec = "0.6.4"
33+
num-traits = "0.2.19"
34+
aws-sdk-s3 = "1.78.0"
35+
bytesize = "2.0.1"
3636

3737

3838
# local dependencies

‎fhevm-engine/test-harness/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ edition.workspace = true
66
license.workspace = true
77

88
[dependencies]
9-
# workspace dependencies
10-
tokio = { workspace = true }
11-
tracing = { workspace = true }
12-
sqlx = { workspace = true}
9+
# workspace dependencies
10+
alloy = { workspace = true }
11+
anyhow = { workspace = true }
12+
hex = { workspace = true }
1313
rand = { workspace = true}
14+
serde_json = { workspace = true }
15+
sqlx = { workspace = true}
16+
testcontainers = { workspace = true }
17+
tokio = { workspace = true }
1418
tokio-util = { workspace = true}
15-
alloy = { workspace = true }
16-
hex = "0.4"
17-
serde_json = "1.0"
18-
testcontainers = "0.23"
19-
anyhow = "1.0"
19+
tracing = { workspace = true }
2020

2121
# local dependencies
2222
fhevm-engine-common = { path = "../fhevm-engine-common" }

‎fhevm-engine/transaction-sender/Cargo.toml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ license.workspace = true
99
# workspace dependencies
1010
alloy = { workspace = true }
1111
anyhow = { workspace = true }
12+
aws-config = { workspace = true }
1213
clap = { workspace = true }
1314
futures-util = { workspace = true }
1415
rand = { workspace = true }
@@ -20,15 +21,19 @@ tracing-subscriber = { workspace = true }
2021
hex = { workspace = true }
2122

2223
# crates.io dependencies
23-
async-trait = "0.1.86"
24+
async-trait = "0.1.88"
25+
aws-sdk-kms = { version = "1.68.0", default-features = false }
26+
2427

2528
# local dependencies
2629
fhevm-engine-common = { path = "../fhevm-engine-common" }
2730

2831
[build-dependencies]
29-
foundry-compilers = { version = "0.13.0", features = ["svm-solc"] }
30-
semver = "1.0.26"
32+
foundry-compilers = { workspace = true }
33+
semver = { workspace = true }
3134

3235
[dev-dependencies]
33-
serial_test = "3.2.0"
36+
rstest = "0.25.0"
37+
serial_test = { workspace = true }
38+
testcontainers = { workspace = true }
3439
test-harness = { path = "../test-harness" }

‎fhevm-engine/zkproof-worker/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ license.workspace = true
77

88
[dependencies]
99
# workspace dependencies
10+
alloy-primitives = { workspace = true }
1011
clap = { workspace = true }
11-
tfhe = { workspace = true }
12+
hex = { workspace = true }
13+
lru = { workspace = true }
14+
rand = { workspace = true }
15+
sha3 = { workspace = true }
1216
sqlx = { workspace = true }
17+
tfhe = { workspace = true }
1318
tokio = { workspace = true }
1419
anyhow = { workspace = true }
1520
tokio-util = { workspace = true }
1621
bincode = { workspace = true }
17-
thiserror = { version = "=2.0" }
22+
thiserror = { workspace = true }
1823
tracing = { workspace = true }
1924
tracing-subscriber = { workspace = true }
20-
rand = {workspace = true}
21-
hex = {workspace = true}
22-
alloy-primitives = "=0.8.23"
23-
sha3 = "=0.10.8"
24-
lru = "=0.13"
2525

2626
# local dependencies
2727
fhevm-engine-common = { path = "../fhevm-engine-common" }

0 commit comments

Comments
 (0)