Skip to content

refactor(api): serve remaining services via axum (rm tide 2/5) #4704

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

Draft
sveitser wants to merge 25 commits into
base: main
Choose a base branch
from
Draft

refactor(api): serve remaining services via axum (rm tide 2/5) #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
041b34a
refactor(api): serve espresso-node query API via axum
sveitser Jul 16, 2026
cd9abec
chore(node): drop unused ESPRESSO_NODE_*_AXUM_PORT env vars
sveitser Jul 17, 2026
e59c834
refactor(api): serve relay server, dev-node, prover, and node bins vi…
sveitser Jul 16, 2026
4a99eeb
refactor(api): serve orchestrator, node-metrics, lcqs, builder via axum
sveitser Jul 16, 2026
7b1791f
docs(api): route-level OpenAPI docs for the v1 API
sveitser Jul 17, 2026
4fa34d1
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
fdb0569
fix(api): mount the v1 docs routes in every serve mode
sveitser Jul 17, 2026
b8188bf
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
30700b4
fix(api): declare path parameters in the v1 OpenAPI spec
sveitser Jul 17, 2026
3451a16
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
fbc12dc
docs(api): type v1 path parameters from their handler extractors
sveitser Jul 17, 2026
ac111a4
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
4629ca0
chore(api): drop noise comment on the example port
sveitser Jul 17, 2026
c88a729
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
83bb983
feat(api): group v1 docs operations by module tag
sveitser Jul 17, 2026
07e42b8
style(api): espresso-brand the Swagger UI
sveitser Jul 17, 2026
fcc350e
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
78ccb44
refactor(node): hoist function-local imports in api/state.rs
sveitser Jul 17, 2026
14eb967
refactor(api): derive path_fn placeholders from parameter names
sveitser Jul 17, 2026
f73e05d
fix(api): count streaming sockets in max_connections, bind port first
sveitser Jul 17, 2026
3709f3f
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
01bc25d
fix(api): end ws stream tasks when the client disconnects
sveitser Jul 17, 2026
94025c3
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 17, 2026
2632cc6
fix(api): stop counting websocket lifetimes in max_connections
sveitser Jul 18, 2026
c4f24ff
Merge branch 'ma/axum-server-core' into ma/axum-services
sveitser Jul 18, 2026
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
5 changes: 0 additions & 5 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ ESPRESSO_NODE_1_API_PORT=24001
ESPRESSO_NODE_2_API_PORT=24002
ESPRESSO_NODE_3_API_PORT=24003
ESPRESSO_NODE_4_API_PORT=24004
ESPRESSO_NODE_0_AXUM_PORT=24100
ESPRESSO_NODE_1_AXUM_PORT=24101
ESPRESSO_NODE_2_AXUM_PORT=24102
ESPRESSO_NODE_3_AXUM_PORT=24103
ESPRESSO_NODE_4_AXUM_PORT=24104
ESPRESSO_NODE_0_TONIC_PORT=24200
ESPRESSO_NODE_1_TONIC_PORT=24201
ESPRESSO_NODE_2_TONIC_PORT=24202
Expand Down
23 changes: 18 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ edition = "2024"
aide = { version = "0.15.1", features = [
"axum",
"axum-json",
"axum-ws",
"scalar",
"swagger",
"redoc",
Expand Down Expand Up @@ -214,6 +215,7 @@ ed25519-compact = "2.2.0"
either = "1"
es-version = { git = "https://github.com/EspressoSystems/es-version.git", branch = "main" }
escargot = "0.5.10"
espresso-api = { path = "crates/espresso/api" }
espresso-contract-deployer = { path = "contracts/rust/deployer" }
espresso-keyset = { path = "crates/espresso/keyset" }
espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" }
Expand Down
4 changes: 4 additions & 0 deletions crates/builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ alloy = { workspace = true }
anyhow = { workspace = true }
async-broadcast = { workspace = true }
async-lock = { workspace = true }
axum = { workspace = true }
clap = { workspace = true }
committable = { workspace = true }
espresso-node = { workspace = true, default-features = false }
Expand All @@ -25,7 +26,10 @@ hotshot-example-types = { workspace = true }
hotshot-state-prover = { workspace = true }
hotshot-types = { workspace = true }
rand = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
surf-disco = { workspace = true }
tagged-base64 = { workspace = true }
test-utils = { workspace = true }
tide-disco = { workspace = true }
tokio = { workspace = true }
Expand Down
Loading
Loading