Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,442 changes: 3,225 additions & 217 deletions Cargo.lock

Large diffs are not rendered by default.

47 changes: 25 additions & 22 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -113,28 +113,26 @@ tempfile = "3.23.0"
walkdir = "2.5.0"
wildmatch = "2.5.0"

# EVM-specific dependencies
alloy-node-bindings = "=1.0.42"
alloy-json-abi = "1.4.1"
alloy-primitives = { version = "1.4.1", features = ["serde"] }
alloy-provider = { version = "=1.0.42", features = ["ws", "pubsub"] }
alloy-sol-types = "1.4.1"
alloy-sol-macro = { version = "1.4.1", features = ["json"] }
alloy-transport = "=1.0.42"
alloy-contract = "=1.0.42"
alloy-signer = "=1.0.42"
alloy-signer-local = { version = "=1.0.42", features = ["mnemonic"] }
alloy-network = "=1.0.42"
alloy-rpc-types-eth = "=1.0.42"

alloy-consensus-any = "=1.0.42"
alloy-consensus = "=1.0.42"
alloy-eips = "=1.0.42"
alloy-network-primitives = "=1.0.42"
alloy-serde = "=1.0.42"
alloy-tx-macros = "=1.0.42"
alloy-eip2930 = "=0.2.1"
alloy-eip7702 = "=0.6.1"
# EVM-specific dependencies (aligned with reth v1.10.1)
alloy-node-bindings = "1.4.3"
alloy-json-abi = "1.5.0"
alloy-primitives = { version = "1.5.0", features = ["serde"] }
alloy-provider = { version = "1.4.3", features = ["ws", "pubsub"] }
alloy-sol-types = "1.5.0"
alloy-sol-macro = { version = "1.5.0", features = ["json"] }
alloy-transport = "1.4.3"
alloy-contract = "1.4.3"
alloy-signer = "1.4.3"
alloy-signer-local = { version = "1.4.3", features = ["mnemonic"] }
alloy-network = "1.4.3"
alloy-rpc-types-eth = "1.4.3"

alloy-consensus-any = "1.4.3"
alloy-consensus = "1.4.3"
alloy-eips = "1.4.3"
alloy-network-primitives = "1.4.3"
alloy-serde = "1.4.3"
alloy-rlp = "0.3.10"

layer-climb = "0.8.3"
layer-climb-address = { version = "0.8.3", features = [
Expand Down Expand Up @@ -197,6 +195,11 @@ hypercore-protocol = { version = "0.6.1", default-features = false, features = [
# database
lru = "0.16.1"

# gRPC
tonic = "0.12"
prost = "0.13"
tonic-build = "0.12"

# time
chrono = "0.4.42"
cron = { version = "0.15.0", features = ["serde"] }
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/chain_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ pub struct EvmChainConfig {
pub http_endpoint: Option<String>,
pub faucet_endpoint: Option<String>,
pub ws_priority_endpoint_index: Option<usize>,
/// Optional gRPC endpoint for reth remote ExEx notifications.
/// When set, WAVS will connect to the reth ExEx server instead of using WebSocket subscriptions.
/// Example: "http://[::1]:10000"
pub exex_endpoint: Option<String>,
}

impl From<&EvmChainConfig> for ChainKey {
Expand Down Expand Up @@ -362,6 +366,7 @@ impl ChainConfigs {
http_endpoint: evm_config.http_endpoint,
faucet_endpoint: evm_config.faucet_endpoint,
ws_priority_endpoint_index: evm_config.ws_priority_endpoint_index,
exex_endpoint: evm_config.exex_endpoint,
};
self.evm.insert(key.id, evm_config);
}
Expand Down Expand Up @@ -424,6 +429,8 @@ pub struct EvmChainConfigBuilder {
pub http_endpoint: Option<String>,
pub faucet_endpoint: Option<String>,
pub ws_priority_endpoint_index: Option<usize>,
/// Optional gRPC endpoint for reth remote ExEx notifications.
pub exex_endpoint: Option<String>,
}

impl EvmChainConfigBuilder {
Expand All @@ -434,6 +441,7 @@ impl EvmChainConfigBuilder {
http_endpoint: self.http_endpoint,
faucet_endpoint: self.faucet_endpoint,
ws_priority_endpoint_index: self.ws_priority_endpoint_index,
exex_endpoint: self.exex_endpoint,
}
}
}
2 changes: 1 addition & 1 deletion packages/utils/src/evm_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ impl EvmSigningClient {
let builder = ProviderBuilder::default()
.with_nonce_management(nonce_manager.clone())
.filler(GasFiller)
.filler(BlobGasFiller)
.filler(BlobGasFiller::default())
.filler(ChainIdFiller::new(None))
.wallet(wallet.clone());

Expand Down
1 change: 1 addition & 0 deletions packages/utils/src/test_utils/mock_chain_configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub fn mock_chain_configs() -> Arc<RwLock<ChainConfigs>> {
http_endpoint: Some("http://localhost:8545".to_string()),
faucet_endpoint: None,
ws_priority_endpoint_index: None,
exex_endpoint: None,
},
)]
.into_iter()
Expand Down
5 changes: 1 addition & 4 deletions packages/version-pins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version.workspace = true

[dependencies]
# This package exists solely to pin transitive dependency versions
# for Rust 1.86 compatibility in our Docker build environment.
# for compatibility in our Docker build environment.
alloy-provider = { workspace = true }
alloy-network = { workspace = true }
alloy-rpc-types-eth = { workspace = true }
Expand All @@ -18,7 +18,4 @@ alloy-consensus-any = { workspace = true }
alloy-eips = { workspace = true }
alloy-network-primitives = { workspace = true }
alloy-serde = { workspace = true }
alloy-tx-macros = { workspace = true }
alloy-eip2930 = { workspace = true }
alloy-eip7702 = { workspace = true }
alloy-transport = { workspace = true }
27 changes: 27 additions & 0 deletions packages/wavs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ publish = false
[features]
test-utils = []
dev = []
# Enable reth ExEx integration
reth-exex = [
"dep:reth-exex-types",
"dep:reth-execution-types",
"dep:reth-primitives-traits",
"dep:reth-ethereum-primitives",
"dep:alloy-consensus",
]

[dependencies]
wavs-types = { workspace = true, features = ["full"] }
Expand Down Expand Up @@ -68,6 +76,19 @@ hypercore = { workspace = true }
hypercore-protocol = { workspace = true }
hyperswarm = { workspace = true }
tokio-util = { workspace = true }
tonic = { workspace = true }
prost = { workspace = true }
serde_with = { version = "3.12", default-features = false, features = ["macros"] }

# reth dependencies (for ExEx integration)
reth-exex-types = { path = "../../../../crates/exex/types", features = ["serde", "serde-bincode-compat"], optional = true }
reth-execution-types = { path = "../../../../crates/evm/execution-types", features = ["serde", "serde-bincode-compat"], optional = true }
reth-primitives-traits = { path = "../../../../crates/primitives-traits", features = ["serde", "serde-bincode-compat"], optional = true }
reth-ethereum-primitives = { path = "../../../../crates/ethereum/primitives", features = ["serde", "serde-bincode-compat"], optional = true }
alloy-consensus = { workspace = true, optional = true }

[build-dependencies]
tonic-build = { workspace = true }

[dev-dependencies]
criterion = { workspace = true }
Expand All @@ -76,6 +97,12 @@ utils = { workspace = true, features = ["test-utils"] }
example-types = { workspace = true }
alloy-node-bindings = { workspace = true }

# ExEx integration testing
reth-exex-remote = { path = "../../../../crates/exex/remote" }
reth-execution-types = { path = "../../../../crates/evm/execution-types" }
reth-ethereum-primitives = { path = "../../../../crates/ethereum/primitives" }
reth-exex-types = { path = "../../../../crates/exex/types", features = ["serde", "serde-bincode-compat"] }


[[bench]]
name = "intervals"
Expand Down
6 changes: 6 additions & 0 deletions packages/wavs/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fn main() -> Result<(), Box<dyn std::error::Error>> {
tonic_build::configure()
.build_server(false)
.compile_protos(&["proto/exex.proto"], &["proto"])?;
Ok(())
}
20 changes: 20 additions & 0 deletions packages/wavs/proto/exex.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
syntax = "proto3";

package exex;

// RemoteExEx service streams execution notifications from reth to connected clients.
// The notifications are bincode-serialized ExExNotification structs.
service RemoteExEx {
// Subscribe to execution notifications stream.
// Returns a stream of bincode-encoded ExExNotification messages.
rpc Subscribe(SubscribeRequest) returns (stream ExExNotification) {}
}

// Empty request message for subscribing to the notification stream.
message SubscribeRequest {}

// Execution notification containing bincode-serialized ExExNotification data.
message ExExNotification {
// Bincode-serialized ExExNotification (ChainCommitted, ChainReorged, or ChainReverted).
bytes data = 1;
}
Loading