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

Jump to bottom

feat: use TransportError on Anvil #6344

Merged
merged 1 commit into from
Nov 17, 2023
Merged

feat: use TransportError on Anvil #6344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 7 additions & 18 deletions crates/anvil/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use crate::{
use alloy_primitives::U64;
use alloy_providers::provider::TempProvider;
use alloy_rpc_types::BlockNumberOrTag;
use alloy_transport::TransportError;
use anvil_server::ServerConfig;
use ethers::{
core::k256::ecdsa::SigningKey,
Expand Down Expand Up @@ -929,7 +930,6 @@ impl NodeConfig {
provider
.get_chain_id()
.await
.success()
.expect("Failed to fetch network chain id")
.to::<u64>(),
);
Expand All @@ -955,13 +955,12 @@ impl NodeConfig {
let block = provider
.get_block(BlockNumberOrTag::Number(U64::from(fork_block_number)).into(), false)
.await
.success()
.expect("Failed to get fork block");

let block = if let Some(block) = block {
block
} else {
if let Some(latest_block) = provider.get_block_number().await.success() {
if let Ok(latest_block) = provider.get_block_number().await {
let mut message = format!(
"Failed to get block for block number: {fork_block_number}\n\
latest block number: {latest_block}"
Expand Down Expand Up @@ -1021,7 +1020,7 @@ latest block number: {latest_block}"

// use remote gas price
if self.gas_price.is_none() {
if let Some(gas_price) = provider.get_gas_price().await.success() {
if let Ok(gas_price) = provider.get_gas_price().await {
self.gas_price = Some(gas_price.to_ethers());
fees.set_gas_price(gas_price.to_ethers());
}
Expand All @@ -1035,7 +1034,7 @@ latest block number: {latest_block}"
let chain_id = if let Some(fork_chain_id) = fork_chain_id {
fork_chain_id.as_u64()
} else {
provider.get_chain_id().await.success().unwrap().to::<u64>()
provider.get_chain_id().await.unwrap().to::<u64>()
};

// need to update the dev signers and env with the chain id
Expand Down Expand Up @@ -1188,23 +1187,13 @@ pub fn anvil_tmp_dir() -> Option<PathBuf> {
///
/// This fetches the "latest" block and checks whether the `Block` is fully populated (`hash` field
/// is present). This prevents edge cases where anvil forks the "latest" block but `eth_getBlockByNumber` still returns a pending block, <https://github.com/foundry-rs/foundry/issues/2036>
async fn find_latest_fork_block<P: TempProvider>(provider: P) -> Result<u64, eyre::Report> {
let mut num = provider
.get_block_number()
.await
.success()
.ok_or_else(|| eyre::eyre!("Could not get block number"))?
.to::<u64>();
async fn find_latest_fork_block<P: TempProvider>(provider: P) -> Result<u64, TransportError> {
let mut num = provider.get_block_number().await?.to::<u64>();

// walk back from the head of the chain, but at most 2 blocks, which should be more than enough
// leeway
for _ in 0..2 {
if let Some(block) = provider
.get_block(num.into(), false)
.await
.success()
.ok_or_else(|| eyre::eyre!("Could not get block number"))?
{
if let Some(block) = provider.get_block(num.into(), false).await? {
if block.header.hash.is_some() {
break
}
Expand Down
25 changes: 13 additions & 12 deletions crates/anvil/src/eth/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,18 +1916,19 @@ impl EthApi {
if let Some(receipt) = self.backend.mined_transaction_receipt(tx.hash) {
if let Some(output) = receipt.out {
// insert revert reason if failure
if receipt.inner.status_code.unwrap_or_default().to::<u64>() == 0 {
if let Some(reason) = decode_revert_reason(&output) {
tx.other.insert(
"revertReason".to_string(),
serde_json::to_value(reason).expect("Infallible"),
);
}
}
tx.other.insert(
"output".to_string(),
serde_json::to_value(output).expect("Infallible"),
);
// TODO: Support for additional fields
// if receipt.inner.status_code.unwrap_or_default().to::<u64>() == 0 {
// if let Some(reason) = decode_revert_reason(&output) {
// tx.other.insert(
// "revertReason".to_string(),
// serde_json::to_value(reason).expect("Infallible"),
// );
// }
// }
// tx.other.insert(
// "output".to_string(),
// serde_json::to_value(output).expect("Infallible"),
// );
}
}
}
Expand Down
Loading
Loading