Skip to content

Add websocket support #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add websocket support #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4,270 changes: 1,244 additions & 3,026 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 14 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ resolver = "3"
members = [
"crates/rollup-boost",
"crates/websocket-proxy",
"crates/flashblocks-rpc",
# Temoporary removed from workspace as node shifted to base-node rpc
# Will be enabled back once we pull changes back
# "crates/flashblocks-rpc",
]

[workspace.dependencies]
Expand All @@ -25,7 +27,11 @@ url = "2.2.0"
sha2 = { version = "0.10", default-features = false }

# Reth deps
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.6.0" }
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" }
reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" }
reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" }

# Alloy libraries
alloy-rpc-types-engine = "1.0.23"
Expand All @@ -39,10 +45,12 @@ alloy-rpc-types = "1.0.23"
alloy-genesis = "1.0.23"
alloy-rpc-client = "1.0.23"
alloy-provider = "1.0.23"
op-alloy-network = "0.18.7"
op-alloy-rpc-types-engine = "0.18.7"
op-alloy-consensus = "0.18.7"
op-alloy-rpc-types = "0.18.7"
op-alloy-network = "0.19.0"
op-alloy-rpc-types-engine = "0.19.0"
op-alloy-consensus = "0.19.0"
op-alloy-rpc-types = "0.19.0"
op-alloy-rpc-jsonrpsee = { version = "0.19.0", features = ["client"] }

tokio-tungstenite = { version = "0.26.2", features = ["native-tls"] }
testcontainers = "0.23"
testcontainers-modules = { version = "0.11", features = ["redis"] }
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Based on https://depot.dev/blog/rust-dockerfile-best-practices
#
FROM rust:1.87.0 AS base
FROM rust:1.88.0 AS base

ARG FEATURES
ARG RELEASE=true
Expand Down
1 change: 1 addition & 0 deletions crates/flashblocks-rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ edition = "2024"
license = "MIT"

[dependencies]
# TODO: temorary disabled
rollup-boost.workspace = true

reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" }
Expand Down
4 changes: 2 additions & 2 deletions crates/flashblocks-rpc/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ pub struct Metrics {
#[metric(describe = "Count of times flashblocks get_balance is called")]
pub get_balance: Counter,

#[metric(describe = "Count of times flashblocks get_block_by_number is called")]
pub get_block_by_number: Counter,
#[metric(describe = "Count of times flashblocks block_by_number is called")]
pub block_by_number: Counter,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are there any docs that need updating for this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will check


#[metric(describe = "Number of flashblocks in a block")]
pub flashblocks_in_block: Histogram,
Expand Down
2 changes: 1 addition & 1 deletion crates/flashblocks-rpc/src/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ mod tests {
}

#[tokio::test]
async fn test_get_block_by_number_pending() -> eyre::Result<()> {
async fn test_block_by_number_pending() -> eyre::Result<()> {
reth_tracing::init_test_tracing();
let node = setup_node().await?;
let provider = node.provider().await?;
Expand Down
22 changes: 14 additions & 8 deletions crates/rollup-boost/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,30 @@ url.workspace = true
sha2.workspace = true

reth-optimism-payload-builder.workspace = true
reth-optimism-node.workspace = true
reth-optimism-rpc = { workspace = true, features = ["client"]}
reth-rpc-api = { workspace = true, features = ["client"]}
reth-rpc-eth-api.workspace = true

op-alloy-rpc-types-engine.workspace = true
op-alloy-rpc-jsonrpsee.workspace = true
op-alloy-network.workspace = true
alloy-rpc-types-engine.workspace = true
alloy-rpc-types-eth.workspace = true
alloy-primitives.workspace = true
alloy-serde.workspace = true
alloy-eips.workspace = true

tokio-tungstenite.workspace = true
metrics-derive.workspace = true
testcontainers.workspace = true

# TODO: update to latest release when it is published
# jsonrpsee = { version = "0.25.1", features = ["server", "http-client", "macros"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", rev = "f04afa740e55db60dce20d9839758792f035ffff", features = [
"server",
"http-client",
"macros",
] }
jsonrpsee = { version = "0.26.0", features = ["server", "http-client", "macros"] }
jsonrpsee-core = "0.26.0"
jsonrpsee-server = "0.26.0"
jsonrpsee-http-client = "0.26.0"
jsonrpsee-types = "0.26.0"

moka = { version = "0.12.10", features = ["future"] }
http = "1.1.0"
dotenvy = "0.15.7"
Expand Down Expand Up @@ -69,7 +76,6 @@ tokio-util = { version = "0.7.13" }
rand = "0.9.0"
time = { version = "0.3.36", features = ["macros", "formatting", "parsing"] }
op-alloy-consensus = "0.17.2"
alloy-eips = { version = "1.0.9", features = ["serde"] }
alloy-consensus = { version = "1.0.9", features = ["serde"] }
anyhow = "1.0"
assert_cmd = "2.0.10"
Expand Down
15 changes: 2 additions & 13 deletions crates/rollup-boost/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use tokio::signal::unix::{SignalKind, signal as unix_signal};
use tracing::{Level, info};

use crate::{
BlockSelectionPolicy, Flashblocks, FlashblocksArgs, ProxyLayer, RollupBoostServer, RpcClient,
BlockSelectionPolicy, Flashblocks, FlashblocksArgs, RollupBoostServer, RpcClient,
client::rpc::{BuilderArgs, L2ClientArgs},
debug_api::ExecutionMode,
get_version, init_metrics,
Expand Down Expand Up @@ -188,18 +188,7 @@ impl RollupBoostArgs {
// Build and start the server
info!("Starting server on :{}", self.rpc_port);

let http_middleware =
tower::ServiceBuilder::new()
.layer(probe_layer)
.layer(ProxyLayer::new(
l2_client_args.l2_url,
l2_auth_jwt,
l2_client_args.l2_timeout,
builder_args.builder_url,
builder_auth_jwt,
builder_args.builder_timeout,
));

let http_middleware = tower::ServiceBuilder::new().layer(probe_layer);
let server = Server::builder()
.set_http_middleware(http_middleware)
.build(format!("{}:{}", self.rpc_host, self.rpc_port).parse::<SocketAddr>()?)
Expand Down
Loading
Loading