Skip to content

Commit f3113c5

Browse files
authored
Removed unneeded call timeout for driver RPC. (#894)
Driver RPC call retry timeout config parameter.
1 parent bbddec3 commit f3113c5

8 files changed

Lines changed: 28 additions & 16 deletions

File tree

Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resolver = "2"
1313
default-members = ["node"]
1414

1515
[workspace.package]
16-
version = "1.34.0"
16+
version = "1.34.1"
1717
edition = "2024"
1818
repository = "https://github.com/NethermindEth/Catalyst"
1919
license = "MIT"

common/src/config/mod.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub struct Config {
3434
pub rpc_l2_execution_layer_timeout: Duration,
3535
pub rpc_driver_preconf_timeout: Duration,
3636
pub rpc_driver_status_timeout: Duration,
37+
pub rpc_driver_retry_timeout: Duration,
3738
// Taiko contracts
3839
pub taiko_anchor_address: Address,
3940
pub taiko_bridge_address: Address,
@@ -218,6 +219,12 @@ impl Config {
218219
.map_err(|e| anyhow::anyhow!("RPC_DRIVER_STATUS_TIMEOUT_MS must be a number: {}", e))?;
219220
let rpc_driver_status_timeout = Duration::from_millis(rpc_driver_status_timeout);
220221

222+
let rpc_driver_retry_timeout = std::env::var("RPC_DRIVER_RETRY_TIMEOUT_MS")
223+
.unwrap_or("1000".to_string())
224+
.parse::<u64>()
225+
.map_err(|e| anyhow::anyhow!("RPC_DRIVER_RETRY_TIMEOUT_MS must be a number: {}", e))?;
226+
let rpc_driver_retry_timeout = Duration::from_millis(rpc_driver_retry_timeout);
227+
221228
let rpc_l2_execution_layer_timeout = std::env::var("RPC_L2_EXECUTION_LAYER_TIMEOUT_MS")
222229
.unwrap_or("1000".to_string())
223230
.parse::<u64>()
@@ -467,6 +474,7 @@ impl Config {
467474
rpc_l2_execution_layer_timeout,
468475
rpc_driver_preconf_timeout,
469476
rpc_driver_status_timeout,
477+
rpc_driver_retry_timeout,
470478
taiko_anchor_address,
471479
taiko_bridge_address,
472480
max_bytes_size_of_batch,
@@ -520,6 +528,7 @@ jwt secret file path: {}
520528
rpc L2 EL timeout: {}ms
521529
rpc driver preconf timeout: {}ms
522530
rpc driver status timeout: {}ms
531+
rpc driver retry timeout: {}ms
523532
taiko anchor address: {}
524533
taiko bridge address: {}
525534
max bytes per tx list from taiko driver: {}
@@ -580,6 +589,7 @@ watchdog max counter: {}
580589
config.rpc_l2_execution_layer_timeout.as_millis(),
581590
config.rpc_driver_preconf_timeout.as_millis(),
582591
config.rpc_driver_status_timeout.as_millis(),
592+
config.rpc_driver_retry_timeout.as_millis(),
583593
config.taiko_anchor_address,
584594
config.taiko_bridge_address,
585595
config.max_bytes_per_tx_list,

common/src/l2/taiko_driver/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ pub struct TaikoDriverConfig {
44
pub driver_url: String,
55
pub rpc_driver_preconf_timeout: Duration,
66
pub rpc_driver_status_timeout: Duration,
7+
pub rpc_driver_retry_timeout: Duration,
78
pub jwt_secret_bytes: [u8; 32],
8-
pub call_timeout: Duration,
99
}

common/src/l2/taiko_driver/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub struct TaikoDriver {
1717
preconf_rpc: HttpRPCClient,
1818
status_rpc: HttpRPCClient,
1919
metrics: Arc<Metrics>,
20-
call_timeout: Duration,
20+
retry_timeout: Duration,
2121
}
2222

2323
impl TaikoDriver {
@@ -40,7 +40,7 @@ impl TaikoDriver {
4040
anyhow::anyhow!("Failed to create HttpRPCClient for driver status: {}", e)
4141
})?,
4242
metrics,
43-
call_timeout: config.call_timeout,
43+
retry_timeout: config.rpc_driver_retry_timeout,
4444
})
4545
}
4646

@@ -89,7 +89,7 @@ impl TaikoDriver {
8989
let start_time = std::time::Instant::now();
9090

9191
match client
92-
.retry_request_with_timeout(method, endpoint, payload, self.call_timeout)
92+
.retry_request_with_timeout(method, endpoint, payload, self.retry_timeout)
9393
.await
9494
{
9595
Ok(response) => {

pacaya/src/l2/config.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub struct TaikoConfig {
1414
pub taiko_bridge_address: Address,
1515
pub rpc_driver_preconf_timeout: Duration,
1616
pub rpc_driver_status_timeout: Duration,
17+
pub rpc_driver_retry_timeout: Duration,
1718
pub preconf_heartbeat_ms: u64,
1819
pub signer: Arc<Signer>,
1920
}
@@ -38,6 +39,7 @@ impl TaikoConfig {
3839
taiko_bridge_address: config.taiko_bridge_address,
3940
rpc_driver_preconf_timeout: config.rpc_driver_preconf_timeout,
4041
rpc_driver_status_timeout: config.rpc_driver_status_timeout,
42+
rpc_driver_retry_timeout: config.rpc_driver_retry_timeout,
4143
preconf_heartbeat_ms: config.preconf_heartbeat_ms,
4244
signer,
4345
})

pacaya/src/l2/taiko.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use common::{
2525
l2_tx_lists::{self, PreBuiltTxList},
2626
},
2727
};
28-
use std::{sync::Arc, time::Duration};
28+
use std::sync::Arc;
2929
use tracing::{debug, trace};
3030

3131
pub struct Taiko {
@@ -49,8 +49,8 @@ impl Taiko {
4949
driver_url: taiko_config.driver_url.clone(),
5050
rpc_driver_preconf_timeout: taiko_config.rpc_driver_preconf_timeout,
5151
rpc_driver_status_timeout: taiko_config.rpc_driver_status_timeout,
52+
rpc_driver_retry_timeout: taiko_config.rpc_driver_retry_timeout,
5253
jwt_secret_bytes: taiko_config.jwt_secret_bytes,
53-
call_timeout: Duration::from_millis(taiko_config.preconf_heartbeat_ms / 2),
5454
};
5555
Ok(Self {
5656
protocol_config,

shasta/src/l2/taiko.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use common::{
1818
shared::{l2_slot_info_v2::L2SlotInfoV2, l2_tx_lists::PreBuiltTxList},
1919
};
2020
use pacaya::l2::config::TaikoConfig;
21-
use std::{sync::Arc, time::Duration};
21+
use std::sync::Arc;
2222
use taiko_alethia_reth::validation::ANCHOR_V3_V4_GAS_LIMIT;
2323
use taiko_bindings::anchor::Anchor;
2424
use taiko_bindings::inbox::IInbox::Config;
@@ -45,8 +45,8 @@ impl Taiko {
4545
driver_url: taiko_config.driver_url.clone(),
4646
rpc_driver_preconf_timeout: taiko_config.rpc_driver_preconf_timeout,
4747
rpc_driver_status_timeout: taiko_config.rpc_driver_status_timeout,
48+
rpc_driver_retry_timeout: taiko_config.rpc_driver_retry_timeout,
4849
jwt_secret_bytes: taiko_config.jwt_secret_bytes,
49-
call_timeout: Duration::from_millis(taiko_config.preconf_heartbeat_ms / 2),
5050
};
5151

5252
let l2_execution_layer = Arc::new(

0 commit comments

Comments
 (0)