From 29e798662ca9f35800fd34f5c1067bb4dccad9ff Mon Sep 17 00:00:00 2001 From: Dan Cline <6798349+Rjected@users.noreply.github.com> Date: Wed, 22 Mar 2023 06:35:54 -0400 Subject: [PATCH] fix: use Latest instead of Pending for rpc BlockId (#1903) Co-authored-by: Matthias Seitz --- crates/rpc/rpc/src/eth/api/server.rs | 6 +++--- crates/rpc/rpc/src/trace.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/rpc/rpc/src/eth/api/server.rs b/crates/rpc/rpc/src/eth/api/server.rs index 05f3c46155..b4451eb357 100644 --- a/crates/rpc/rpc/src/eth/api/server.rs +++ b/crates/rpc/rpc/src/eth/api/server.rs @@ -208,7 +208,7 @@ where let (res, _env) = self .execute_call_at( request, - block_number.unwrap_or(BlockId::Number(BlockNumberOrTag::Pending)), + block_number.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest)), state_overrides, ) .await?; @@ -223,7 +223,7 @@ where block_number: Option, ) -> Result { trace!(target: "rpc::eth", ?request, ?block_number, "Serving eth_createAccessList"); - let block_id = block_number.unwrap_or(BlockId::Number(BlockNumberOrTag::Pending)); + let block_id = block_number.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest)); let access_list = self.create_access_list_at(request.clone(), block_number).await?; request.access_list = Some(access_list.clone()); let gas_used = self.estimate_gas_at(request, block_id).await?; @@ -240,7 +240,7 @@ where Ok(EthApi::estimate_gas_at( self, request, - block_number.unwrap_or(BlockId::Number(BlockNumberOrTag::Pending)), + block_number.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest)), ) .await?) } diff --git a/crates/rpc/rpc/src/trace.rs b/crates/rpc/rpc/src/trace.rs index 802aeba27e..3b38c2dd71 100644 --- a/crates/rpc/rpc/src/trace.rs +++ b/crates/rpc/rpc/src/trace.rs @@ -94,7 +94,7 @@ where let (cfg, block, at) = self .eth_api - .evm_env_at(block_id.unwrap_or(BlockId::Number(BlockNumberOrTag::Pending))) + .evm_env_at(block_id.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest))) .await?; let tx = tx_env_with_recovered(&tx); let env = Env { cfg, block, tx };