Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
41a85ff
draft implementation
Feb 6, 2026
a1e405c
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
Feb 6, 2026
cc740d5
fix changes | final design
Feb 8, 2026
d4dd026
fix network tests
Feb 8, 2026
b7fab2d
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
Feb 9, 2026
9d788d3
fix format
Feb 9, 2026
a844855
redisign CompactSignedPromise
Feb 11, 2026
d8b64b8
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
Feb 11, 2026
ac2519e
remove Eip191Hash struct
Feb 11, 2026
dfaa7d1
fix unused deps | small refactoring in consensus
Feb 11, 2026
8c7829c
self review fixes
Feb 11, 2026
3afe82b
update submodules
Feb 12, 2026
e5c49ed
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Feb 12, 2026
9ace2a6
initial pull request | main functionality
Feb 23, 2026
5a974ec
complete functionality in processor
Feb 24, 2026
26a48e9
fix small compile error
Feb 24, 2026
94b27ea
all tests run correctly
Feb 25, 2026
52447b2
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
Feb 25, 2026
b182951
compute service produce event with promise
Feb 25, 2026
9a27c72
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
ecol-master Feb 25, 2026
3b9affb
only producer provides promises from compute service
Feb 25, 2026
bd3f009
small refactoring
Feb 26, 2026
e4f07c0
implement the builder for compute service
Feb 26, 2026
8414659
make compute service builder implementation much prettier
Feb 26, 2026
5829c5e
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
Feb 26, 2026
a97cf4c
transfer promise for signing to consensus service
Feb 26, 2026
51ede2a
return tests in compute service
Feb 26, 2026
4d62e9a
redesign to PromisePolicy enum
Feb 26, 2026
08c8bae
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
Feb 27, 2026
6b11846
refactoring inside ethexe/runtime | remove unresolved TODOs
Feb 27, 2026
7f9f46c
AnnouncePromisesStream inside compute service
Feb 27, 2026
9c01711
stabilize the AnnouncePromisesStream implementation
Mar 2, 2026
db7b81b
implement test with early break
Mar 2, 2026
b500072
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
Mar 2, 2026
f19f762
fix clippy
Mar 2, 2026
c0d12ae
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
ecol-master Mar 2, 2026
ba0df70
up limits for test
Mar 2, 2026
4095212
add guard for promise channel drop
Mar 3, 2026
f0cd844
self review small fixes
Mar 4, 2026
e2897ea
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
ecol-master Mar 4, 2026
d1586f8
Merge branch 'master' into kuzmindev/feat/return-promise-as-they-proc…
ecol-master Mar 5, 2026
91e7802
fix for limited vec in injected transaction
Mar 5, 2026
0d19463
Merge branch 'kuzmindev/feat/return-promise-as-they-processed' into k…
Mar 6, 2026
e9d71b3
small redesign for CompactSignedPromise
Mar 6, 2026
78fa1bd
RPC redesign | PromiseEmissionMode
Mar 9, 2026
c79e07b
remove store promise in db from service to rpc
Mar 9, 2026
5d884e4
feat(ethexe/rpc): add method to get injected transaction (#5233)
osipov-mit Mar 19, 2026
448492c
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
Apr 9, 2026
af5babc
small log fixes
Apr 9, 2026
c0ac4e5
feat: implement PromiseEmissionMode
Apr 10, 2026
fa63a2a
Merge branch 'kuzmindev/feat/producer-send-promises-hashes' of https:…
Apr 10, 2026
40678d2
fix: all tests works correctly
Apr 10, 2026
9bc28c1
feat: add docs | make implementation clear
Apr 10, 2026
f479b76
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 10, 2026
e5b8497
fix: claude review
Apr 10, 2026
ebc38a8
feat: fix bug with compact promise store in db
Apr 10, 2026
d320375
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 13, 2026
46ad9a9
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 15, 2026
4b47308
Merge branch 'kuzmindev/feat/producer-send-promises-hashes' of https:…
ecol-master Apr 15, 2026
0976d04
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 16, 2026
d811e45
fix: claude small review comments
ecol-master Apr 16, 2026
5a185c9
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 16, 2026
77e05e9
fix: CompactSignedPromise -> SignedCompactPromise | fix tests | updat…
ecol-master Apr 17, 2026
fdd4bc5
Merge branch 'kuzmindev/feat/producer-send-promises-hashes' of https:…
ecol-master Apr 17, 2026
5fd60d9
chore: fix doc in rpc/src/apis/injected/mod.rs
ecol-master Apr 17, 2026
0962a7c
fix promise emission for not computed chain
ecol-master Apr 17, 2026
93b7658
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 20, 2026
4d33197
feat: add metrics to new server
ecol-master Apr 20, 2026
30d4f3a
chore: add TODO comments for future refactoring
ecol-master Apr 20, 2026
2324d56
Merge branch 'master' into kuzmindev/feat/producer-send-promises-hashes
ecol-master Apr 21, 2026
5bd3edf
ai: generate first prototype for metrics layer
ecol-master Apr 21, 2026
80863eb
feat: complete metrics middleware
ecol-master Apr 21, 2026
6c22281
chore: remove layer's method
ecol-master Apr 21, 2026
c183758
Reopen pull request #5132
ecol-master Apr 23, 2026
540c499
chore: small refactoring | self-review
ecol-master Apr 23, 2026
85cfa8a
fix: Promise emission for case when node is validator + RPC
ecol-master Apr 24, 2026
c1c4f03
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master Apr 26, 2026
8d909bb
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master Apr 27, 2026
bf4013c
Merge branch 'kd/reopen/producer-distribute-promise-hashes' of https:…
ecol-master Apr 27, 2026
1ba94de
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master Apr 28, 2026
d9ee035
chore: remove useless TODO | add issues to track
ecol-master Apr 28, 2026
2617f6b
Merge branch 'kd/reopen/producer-distribute-promise-hashes' of https:…
ecol-master Apr 28, 2026
5c602ff
chore: small refactoring for TRACKED_METHODS
ecol-master Apr 29, 2026
640f097
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master Apr 29, 2026
61aeac8
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master Apr 29, 2026
c2936b5
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master May 4, 2026
e4bf652
fix: part of gsobol review
ecol-master May 4, 2026
7656b9b
Merge branch 'master' into kd/reopen/producer-distribute-promise-hashes
ecol-master May 4, 2026
285b729
chore: add todos for issues
ecol-master May 4, 2026
f4802d1
Merge branch 'kd/reopen/producer-distribute-promise-hashes' into feat…
ecol-master May 4, 2026
cb03241
chore: move registry to lazy lock static
ecol-master May 4, 2026
bd8fbd1
Merge branch 'master' into feat/rpc-metrics-middleware
ecol-master May 4, 2026
acc7d48
fix: claude review
ecol-master May 4, 2026
72d776a
chore: fix cargo shear
ecol-master May 4, 2026
983a0fd
chore: fix ar0f review
ecol-master May 5, 2026
4754e99
Merge branch 'master' into feat/rpc-metrics-middleware
ecol-master May 5, 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
4 changes: 2 additions & 2 deletions ethexe/rpc/src/apis/injected/relay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ mod utils {
tx: &mut AddressedInjectedTransaction,
) -> RpcResult<()> {
let now = now_since_unix_epoch().map_err(|err| {
tracing::error!("system clock error: {err}");
error!("system clock error: {err}");
Comment thread
ecol-master marked this conversation as resolved.
crate::errors::internal()
})?;

let next_producer = calculate_next_producer(db, now).map_err(|err| {
tracing::error!("calculate next producer error: {err}");
error!("calculate next producer error: {err}");
crate::errors::internal()
})?;
tx.recipient = next_producer;
Expand Down
8 changes: 3 additions & 5 deletions ethexe/rpc/src/apis/injected/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ impl InjectedApi {
&self,
transaction: AddressedInjectedTransaction,
) -> RpcResult<InjectedTransactionAcceptance> {
self.metrics.send_injected_tx_calls.increment(1);

self.relayer.relay(transaction).await
}

Expand All @@ -118,8 +116,6 @@ impl InjectedApi {
pending: PendingSubscriptionSink,
transaction: AddressedInjectedTransaction,
) -> SubscriptionResult {
self.metrics.send_and_watch_injected_tx_calls.increment(1);

let tx_hash = transaction.tx.data().to_hash();

let pending_subscriber = match self.manager.try_register_subscriber(tx_hash) {
Expand All @@ -144,9 +140,11 @@ impl InjectedApi {
}
};

let manager = self.manager.clone();
self.metrics.injected_tx_active_subscriptions.increment(1);
let (manager, metrics) = (self.manager.clone(), self.metrics.clone());
spawner::spawn_pending_subscriber(sink, pending_subscriber, move |tx_hash| {
manager.cancel_registration(tx_hash);
metrics.injected_tx_active_subscriptions.decrement(1);
});
Ok(())
}
Expand Down
27 changes: 15 additions & 12 deletions ethexe/rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ use futures::{Stream, stream::FusedStream};
use hyper::header::HeaderValue;
use jsonrpsee::{
RpcModule as JsonrpcModule,
server::{PingConfig, Server, ServerHandle},
server::{PingConfig, RpcServiceBuilder, Server, ServerHandle},
};
use metrics::RpcMetricsLayer;
use std::{
net::SocketAddr,
pin::Pin,
Expand Down Expand Up @@ -129,14 +130,8 @@ impl RpcServer {

let cors_layer = self.cors_layer()?;
let http_middleware = tower::ServiceBuilder::new().layer(cors_layer);

let server = Server::builder()
.set_http_middleware(http_middleware)
// Setup WebSocket pings to detect dead connections.
// Now it is set to default: ping_interval = 30s, inactive_limit = 40s
.enable_ws_ping(PingConfig::default())
.build(self.config.listen_addr)
.await?;
// Setup the default RPC metrics layer.
let rpc_middleware = RpcServiceBuilder::new().layer(RpcMetricsLayer);

let processor = Processor::with_config(
ProcessorConfig {
Expand All @@ -158,9 +153,17 @@ impl RpcServer {
};
let injected_api = server_apis.injected.clone();

let handle = server.start(server_apis.into_methods());
let server_handle = Server::builder()
.set_http_middleware(http_middleware)
.set_rpc_middleware(rpc_middleware)
// Setup WebSocket pings to detect dead connections.
// Now it is set to default: ping_interval = 30s, inactive_limit = 40s
.enable_ws_ping(PingConfig::default())
.build(self.config.listen_addr)
.await?
.start(server_apis.into_module());

Ok((handle, RpcService::new(rpc_receiver, injected_api)))
Ok((server_handle, RpcService::new(rpc_receiver, injected_api)))
}

fn cors_layer(&self) -> Result<CorsLayer> {
Expand Down Expand Up @@ -224,7 +227,7 @@ struct RpcServerApis {
}

impl RpcServerApis {
pub fn into_methods(self) -> jsonrpsee::server::RpcModule<()> {
pub fn into_module(self) -> jsonrpsee::server::RpcModule<()> {
let mut module = JsonrpcModule::new(());

module
Expand Down
135 changes: 124 additions & 11 deletions ethexe/rpc/src/metrics.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is part of Gear.
//
// Copyright (C) 2025 Gear Technologies Inc.
// Copyright (C) 2025-2026 Gear Technologies Inc.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
//
// This program is free software: you can redistribute it and/or modify
Expand All @@ -18,20 +18,133 @@

//! Metrics for the RPC server.

use metrics::{Counter, Gauge};
use futures::future::BoxFuture;
use jsonrpsee::{
server::{MethodResponse, middleware::rpc::RpcServiceT},
types::Request,
};
use metrics::{Counter, Gauge, Histogram};
use std::{collections::HashMap, sync::LazyLock, time::Instant};
use tower::Layer;

// TODO kuzmindev: add metrics for all RPC apis, e.g number of calls, latency, errors, etc.
/// Default methods names tracked by [super::RpcMetricsLayer].
pub const TRACKED_METHODS: &[&str] = &[
"injected_sendTransaction",
"injected_sendTransactionAndWatch",
"program_calculateReplyForHandle",
];

/// Metrics for the Injected RPC API.
static METHODS_MAP: LazyLock<HashMap<&'static str, MethodMetrics>> = LazyLock::new(|| {
TRACKED_METHODS
.iter()
.copied()
.map(|method_name| {
(
method_name,
MethodMetrics::new_with_labels(&[("method", method_name)]),
)
})
.collect()
});

/// Unified bundle of metrics for RPC method.
/// [metrics_derive::Metrics] macro will register all metrics under the `ethexe_rpc_*` scope.
///
/// ## Must use
/// This object must be created using [MethodMetrics::new_with_labels] method.
/// This method will construct all metrics with provided unique label.
#[derive(Clone, metrics_derive::Metrics)]
#[metrics(scope = "ethexe_rpc")]
pub struct MethodMetrics {
#[metric(
rename = "calls_started_total",
describe = "Number of started RPC calls for the method"
)]
pub calls_started: Counter,
#[metric(
rename = "calls_finished_total",
labels = [("status", "ok")],
describe = "Number of successfully finished RPC calls for the method"
)]
pub calls_finished_ok: Counter,
#[metric(
rename = "calls_finished_total",
labels = [("status", "error")],
describe = "Number of failed RPC calls for the method"
)]
pub calls_finished_err: Counter,
#[metric(
rename = "call_duration_seconds",
describe = "Latency of RPC calls for the method in seconds"
)]
pub calls_latency_seconds: Histogram,
#[metric(
rename = "calls_in_flight",
describe = "Number of in-flight RPC calls for the method"
)]
pub calls_in_flight: Gauge,
}

/// The metrics for internal state of [crate::apis::InjectedApi].
#[derive(Clone, metrics_derive::Metrics)]
#[metrics(scope = "ethexe_rpc_injected_api")]
pub struct InjectedApiMetrics {
/// The number of calls to `injected_sendTransaction`.
pub send_injected_tx_calls: Counter,
/// The number of calls to `injected_subscribeTransactionPromise`.
pub send_and_watch_injected_tx_calls: Counter,
/// The number of active injected transaction promises subscriptions.
#[metric(
rename = "active_promise_subscriptions",
describe = "Number of active subscriptions for injected transaction's promise"
)]
pub injected_tx_active_subscriptions: Gauge,
/// The total number of injected transaction promises given to subscribers.
pub injected_tx_promises_given: Counter,
}

/// Metrics layer for [jsonrpsee::server::RpcServiceBuilder].
/// Uses [RpcMetricsService] to wrap each request to metrics collection logic.
#[derive(Clone, Default)]
pub struct RpcMetricsLayer;

impl<S> Layer<S> for RpcMetricsLayer {
type Service = RpcMetricsService<S>;

fn layer(&self, service: S) -> Self::Service {
RpcMetricsService { service }
}
}

#[derive(Clone)]
pub struct RpcMetricsService<S> {
service: S,
}

impl<'a, S> RpcServiceT<'a> for RpcMetricsService<S>
where
S: RpcServiceT<'a> + Send + Sync,
S::Future: Send + 'a,
{
type Future = BoxFuture<'a, MethodResponse>;

fn call(&self, request: Request<'a>) -> Self::Future {
let Some(metrics) = METHODS_MAP.get(request.method_name()) else {
return Box::pin(self.service.call(request));
};

let future = self.service.call(request);
Box::pin(async move {
metrics.calls_started.increment(1);
metrics.calls_in_flight.increment(1);
let _metrics_guard = scopeguard::guard((), |_| metrics.calls_in_flight.decrement(1));

let started_at = Instant::now();

let response = future.await;

metrics
.calls_latency_seconds
.record(started_at.elapsed().as_secs_f64());
match response.is_success() {
true => metrics.calls_finished_ok.increment(1),
false => metrics.calls_finished_err.increment(1),
}

response
})
}
}
Loading