github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 15:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: use drop guard for transact task (#20134)

Browse Source
This commit is contained in:
Matthias Seitz
2025-12-05 19:18:55 +01:00
committed by GitHub
parent a80c290ca0
commit addb51f2e2
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/rpc/rpc-eth-api/src/helpers/call.rs
View File

@@ -25,7 +25,7 @@ use reth_evm::{
};
use reth_node_api::BlockBody;
use reth_primitives_traits::Recovered;
use reth_revm::{database::StateProviderDatabase, db::State};
use reth_revm::{cancelled::CancelOnDrop, database::StateProviderDatabase, db::State};
use reth_rpc_convert::{RpcConvert, RpcTxReq};
use reth_rpc_eth_types::{
cache::db::StateProviderTraitObjWrapper,
@@ -526,6 +526,11 @@ pub trait Call:
}
/// Executes the call request at the given [`BlockId`].
///
/// This spawns a new task that obtains the state for the given [`BlockId`] and then transacts
/// the call [`Self::transact`]. If the future is dropped before the (blocking) transact
/// call is invoked, then the task is cancelled early, (for example if the request is terminated
/// early client-side).
fn transact_call_at(
&self,
request: RpcTxReq<<Self::RpcConvert as RpcConvert>::Network>,
@@ -535,10 +540,23 @@ pub trait Call:
where
Self: LoadPendingBlock,
{
let this = self.clone();
self.spawn_with_call_at(request, at, overrides, move |db, evm_env, tx_env| {
this.transact(db, evm_env, tx_env)
})
async move {
let guard = CancelOnDrop::default();
let cancel = guard.clone();
let this = self.clone();
let res = self
.spawn_with_call_at(request, at, overrides, move |db, evm_env, tx_env| {
if cancel.is_cancelled() {
// callsite dropped the guard
return Err(EthApiError::InternalEthError.into())
}
this.transact(db, evm_env, tx_env)
})
.await;
drop(guard);
res
}
}
/// Executes the closure with the state that corresponds to the given [`BlockId`] on a new task