Skip to content
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

add dynamic timeout on rpc call #35

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

add dynamic timeout on rpc call #35

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
018e66e
add dynamic timeout on rpc call
tesol2y090 Feb 18, 2024
9931185
add ee timeout in config
tesol2y090 Feb 20, 2024
d483519
use ee timeout in ee request
tesol2y090 Feb 20, 2024
23f242a
update docs
tesol2y090 Feb 20, 2024
8a90e83
delete unused variable
tesol2y090 Feb 20, 2024
a238a8e
fix docs
tesol2y090 Feb 21, 2024
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
20 changes: 16 additions & 4 deletions src/meta.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ use crate::{
use eth2::types::EthSpec;
use std::time::Duration;

const STANDARD_TIMEOUT_MILLIS: u64 = 15_000;

/// Timeout when doing a eth_blockNumber call.
const BLOCK_NUMBER_TIMEOUT_MILLIS: u64 = STANDARD_TIMEOUT_MILLIS;
/// Timeout when doing an eth_getBlockByNumber call.
const GET_BLOCK_TIMEOUT_MILLIS: u64 = STANDARD_TIMEOUT_MILLIS;
/// Timeout when doing an eth_getLogs to read the deposit contract logs.
const GET_DEPOSIT_LOG_TIMEOUT_MILLIS: u64 = 60_000;

impl<E: EthSpec> Multiplexer<E> {
pub async fn handle_syncing(&self, request: Request) -> Result<Response, ErrorResponse> {
// TODO: actually check EL status, maybe with a cache
Expand All @@ -16,8 +25,7 @@ impl<E: EthSpec> Multiplexer<E> {
pub async fn handle_chain_id(&self, request: Request) -> Result<Response, ErrorResponse> {
let (id, _) = request.parse_as::<Vec<()>>()?;

// TODO: dynamic timeout
let timeout = Duration::from_secs(1);
let timeout = Duration::from_millis(STANDARD_TIMEOUT_MILLIS);
let chain_id = self
.engine
.api
Expand Down Expand Up @@ -48,8 +56,12 @@ impl<E: EthSpec> Multiplexer<E> {
pub async fn proxy_directly(&self, request: Request) -> Result<Response, ErrorResponse> {
let id = request.id;

// TODO: adjust timeout
let timeout = Duration::from_secs(12);
let timeout = match request.method.as_str() {
"eth_getBlockByNumber" => Duration::from_millis(GET_BLOCK_TIMEOUT_MILLIS),
"eth_blockNumber" => Duration::from_millis(BLOCK_NUMBER_TIMEOUT_MILLIS),
"eth_getLogs" => Duration::from_millis(GET_DEPOSIT_LOG_TIMEOUT_MILLIS),
_ => Duration::from_millis(STANDARD_TIMEOUT_MILLIS),
};

let result: JsonValue = self
.engine
Expand Down