From 686af77a50af2430805fe5012144381081d7ddf5 Mon Sep 17 00:00:00 2001 From: makemake Date: Thu, 5 Jun 2025 16:38:27 +0200 Subject: [PATCH 1/2] chore: da client --- Cargo.lock | 209 ++++++++++++++++++++++++++++++++++++++++++++++++----- Cargo.toml | 5 +- 2 files changed, 194 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 65c67a2..b3bbd96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-util", + "tokio-util 0.7.15", "tracing", ] @@ -1066,17 +1066,19 @@ dependencies = [ [[package]] name = "assertion-da-client" -version = "0.1.2" -source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.2#48edd1137fedbca4f84413ebb84adb2a9af67888" +version = "0.1.3" +source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.3#ee1370e944082bc329f7cf6fc6ddc2d3c64a4c81" dependencies = [ "alloy 0.11.1", - "assertion-da-core", + "assertion-da-core 0.1.3", "http", - "jsonrpsee", + "reqwest", + "serde", "serde_json", "thiserror 2.0.12", "tokio", - "tokio-util", + "tokio-util 0.6.10", + "url", ] [[package]] @@ -1088,6 +1090,15 @@ dependencies = [ "serde", ] +[[package]] +name = "assertion-da-core" +version = "0.1.3" +source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.3#ee1370e944082bc329f7cf6fc6ddc2d3c64a4c81" +dependencies = [ + "alloy 0.11.1", + "serde", +] + [[package]] name = "assertion-da-server" version = "0.1.2" @@ -1097,7 +1108,7 @@ dependencies = [ "alloy-dyn-abi", "alloy-json-abi", "anyhow", - "assertion-da-core", + "assertion-da-core 0.1.2", "bincode", "bollard", "clap", @@ -1115,7 +1126,7 @@ dependencies = [ "rand 0.8.5", "regex", "reqwest", - "rust-tracing", + "rust-tracing 0.1.3 (git+https://github.com/phylaxsystems/rust-tracing.git?rev=7c3861c83b880c40e1f2c6005892f1d915598081)", "serde", "serde_json", "simd-json", @@ -1124,7 +1135,51 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.15", + "tracing", + "tracing-subscriber", + "util", + "uuid", + "zerocopy 0.7.35", +] + +[[package]] +name = "assertion-da-server" +version = "0.1.3" +source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.3#ee1370e944082bc329f7cf6fc6ddc2d3c64a4c81" +dependencies = [ + "alloy 0.11.1", + "alloy-dyn-abi", + "alloy-json-abi", + "anyhow", + "assertion-da-core 0.1.3", + "bincode", + "bollard", + "clap", + "directories", + "ecdsa", + "futures", + "futures-util", + "hex", + "http-body-util", + "hyper", + "hyper-util", + "k256", + "metrics", + "metrics-exporter-prometheus 0.16.2", + "rand 0.8.5", + "regex", + "reqwest", + "rust-tracing 0.1.3 (git+https://github.com/phylaxsystems/rust-tracing.git?tag=0.1.3)", + "serde", + "serde_json", + "simd-json", + "sled", + "tempfile", + "thiserror 2.0.12", + "tokio", + "tokio-stream", + "tokio-util 0.6.10", "tracing", "tracing-subscriber", "util", @@ -1155,7 +1210,7 @@ dependencies = [ "alloy-transport-ws", "anyhow", "assertion-da-client", - "assertion-da-server", + "assertion-da-server 0.1.3", "assertion-executor", "bincode", "bollard", @@ -1178,7 +1233,7 @@ dependencies = [ "tempfile", "thiserror 1.0.64", "tokio", - "tokio-util", + "tokio-util 0.7.15", "tracing", "url", "zerocopy 0.8.3", @@ -1446,7 +1501,7 @@ dependencies = [ "serde_urlencoded", "thiserror 2.0.12", "tokio", - "tokio-util", + "tokio-util 0.7.15", "tower-service", "url", "winapi", @@ -1552,6 +1607,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -2545,7 +2606,7 @@ dependencies = [ "indexmap 2.8.0", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.15", "tracing", ] @@ -2747,6 +2808,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -3006,14 +3068,14 @@ source = "git+https://github.com/phylaxsystems/int-test-utils.git?rev=6633976#66 dependencies = [ "alloy 0.11.1", "anyhow", - "assertion-da-server", + "assertion-da-server 0.1.2", "bollard", "rand 0.8.5", "sled", "tempfile", "thiserror 2.0.12", "tokio", - "tokio-util", + "tokio-util 0.7.15", "tracing", ] @@ -3153,7 +3215,7 @@ dependencies = [ "thiserror 1.0.64", "tokio", "tokio-rustls", - "tokio-util", + "tokio-util 0.7.15", "tracing", "url", ] @@ -3232,7 +3294,7 @@ dependencies = [ "thiserror 1.0.64", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.15", "tower 0.4.13", "tracing", ] @@ -4334,6 +4396,58 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls", + "socket2", + "thiserror 2.0.12", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +dependencies = [ + "bytes", + "getrandom 0.2.15", + "rand 0.8.5", + "ring", + "rustc-hash 2.1.1", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.12", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.40" @@ -4621,7 +4735,10 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", @@ -4629,11 +4746,13 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "windows-registry", ] @@ -4908,6 +5027,28 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" +[[package]] +name = "rust-tracing" +version = "0.1.3" +source = "git+https://github.com/phylaxsystems/rust-tracing.git?tag=0.1.3#7c3861c83b880c40e1f2c6005892f1d915598081" +dependencies = [ + "alloy 0.12.6", + "init4-from-env-derive", + "metrics", + "metrics-exporter-prometheus 0.17.0", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "serde", + "thiserror 2.0.12", + "tracing", + "tracing-core", + "tracing-opentelemetry", + "tracing-subscriber", + "url", +] + [[package]] name = "rust-tracing" version = "0.1.3" @@ -5056,6 +5197,9 @@ name = "rustls-pki-types" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +dependencies = [ + "web-time", +] [[package]] name = "rustls-platform-verifier" @@ -5869,6 +6013,21 @@ dependencies = [ "serde_json", ] +[[package]] +name = "tinyvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.45.0" @@ -5928,7 +6087,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.7.15", ] [[package]] @@ -5947,6 +6106,20 @@ dependencies = [ "webpki-roots", ] +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.15" diff --git a/Cargo.toml b/Cargo.toml index d9a75ef..bdb2a11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,8 @@ tracing = "0.1.40" zerocopy = { version = "0.8.3", features = ["derive"] } tempfile = "3.13.0" parking_lot = "0.12.1" -assertion-da-client = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.2" } +assertion-da-client = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.3" } +# assertion-da-client = { path = "../assertion-da/crates/client" } bincode = "1.3.3" anyhow = "1.0.89" clap = { version = "4.4.3", features = ["derive"] } @@ -75,7 +76,7 @@ rand = "0.8.0" serde_json = "1.0.133" tempfile = "3.13.0" alloy-eip7702 = "0.5.1" -assertion-da-server = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.2" } +assertion-da-server = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.3" } criterion = { version = "0.5.1" } bollard = "0.18" int-test-utils = { git = "https://github.com/phylaxsystems/int-test-utils.git", rev = "6633976" } From 830de3a61a195626b399899cf1d6a8258648ddd1 Mon Sep 17 00:00:00 2001 From: makemake Date: Thu, 5 Jun 2025 16:47:13 +0200 Subject: [PATCH 2/2] chore: bump versions --- Cargo.lock | 44 +++++++++++++++----------------------------- Cargo.toml | 6 +++--- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3bbd96..c4f31b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,7 +817,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-util 0.7.15", + "tokio-util", "tracing", ] @@ -1067,7 +1067,7 @@ dependencies = [ [[package]] name = "assertion-da-client" version = "0.1.3" -source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.3#ee1370e944082bc329f7cf6fc6ddc2d3c64a4c81" +source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.4#7eccceb798a35de0c6c1766ff40f8a8887de2fa7" dependencies = [ "alloy 0.11.1", "assertion-da-core 0.1.3", @@ -1077,7 +1077,7 @@ dependencies = [ "serde_json", "thiserror 2.0.12", "tokio", - "tokio-util 0.6.10", + "tokio-util", "url", ] @@ -1093,7 +1093,7 @@ dependencies = [ [[package]] name = "assertion-da-core" version = "0.1.3" -source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.3#ee1370e944082bc329f7cf6fc6ddc2d3c64a4c81" +source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.4#7eccceb798a35de0c6c1766ff40f8a8887de2fa7" dependencies = [ "alloy 0.11.1", "serde", @@ -1135,7 +1135,7 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tokio-stream", - "tokio-util 0.7.15", + "tokio-util", "tracing", "tracing-subscriber", "util", @@ -1146,7 +1146,7 @@ dependencies = [ [[package]] name = "assertion-da-server" version = "0.1.3" -source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.3#ee1370e944082bc329f7cf6fc6ddc2d3c64a4c81" +source = "git+https://github.com/phylaxsystems/assertion-da.git?tag=0.1.4#7eccceb798a35de0c6c1766ff40f8a8887de2fa7" dependencies = [ "alloy 0.11.1", "alloy-dyn-abi", @@ -1179,7 +1179,7 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tokio-stream", - "tokio-util 0.6.10", + "tokio-util", "tracing", "tracing-subscriber", "util", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "assertion-executor" -version = "0.1.3" +version = "0.1.4" dependencies = [ "alloy 0.11.1", "alloy-consensus 0.11.1", @@ -1233,7 +1233,7 @@ dependencies = [ "tempfile", "thiserror 1.0.64", "tokio", - "tokio-util 0.7.15", + "tokio-util", "tracing", "url", "zerocopy 0.8.3", @@ -1501,7 +1501,7 @@ dependencies = [ "serde_urlencoded", "thiserror 2.0.12", "tokio", - "tokio-util 0.7.15", + "tokio-util", "tower-service", "url", "winapi", @@ -2606,7 +2606,7 @@ dependencies = [ "indexmap 2.8.0", "slab", "tokio", - "tokio-util 0.7.15", + "tokio-util", "tracing", ] @@ -3075,7 +3075,7 @@ dependencies = [ "tempfile", "thiserror 2.0.12", "tokio", - "tokio-util 0.7.15", + "tokio-util", "tracing", ] @@ -3215,7 +3215,7 @@ dependencies = [ "thiserror 1.0.64", "tokio", "tokio-rustls", - "tokio-util 0.7.15", + "tokio-util", "tracing", "url", ] @@ -3294,7 +3294,7 @@ dependencies = [ "thiserror 1.0.64", "tokio", "tokio-stream", - "tokio-util 0.7.15", + "tokio-util", "tower 0.4.13", "tracing", ] @@ -6087,7 +6087,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.15", + "tokio-util", ] [[package]] @@ -6106,20 +6106,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.15" diff --git a/Cargo.toml b/Cargo.toml index bdb2a11..501382e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "assertion-executor" -version = "0.1.3" +version = "0.1.4" edition = "2021" [dependencies] @@ -13,7 +13,7 @@ tracing = "0.1.40" zerocopy = { version = "0.8.3", features = ["derive"] } tempfile = "3.13.0" parking_lot = "0.12.1" -assertion-da-client = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.3" } +assertion-da-client = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.4" } # assertion-da-client = { path = "../assertion-da/crates/client" } bincode = "1.3.3" anyhow = "1.0.89" @@ -76,7 +76,7 @@ rand = "0.8.0" serde_json = "1.0.133" tempfile = "3.13.0" alloy-eip7702 = "0.5.1" -assertion-da-server = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.3" } +assertion-da-server = { git = "https://github.com/phylaxsystems/assertion-da.git", tag = "0.1.4" } criterion = { version = "0.5.1" } bollard = "0.18" int-test-utils = { git = "https://github.com/phylaxsystems/int-test-utils.git", rev = "6633976" }