From 357701bccc4246b37b09f3529c9f0c037ea83437 Mon Sep 17 00:00:00 2001
From: Bryan Stitt <bryan@llamanodes.com>
Date: Thu, 29 Jun 2023 00:06:58 -0700
Subject: [PATCH] no need to check the caches, we have latest block

---
 web3_proxy/src/app/mod.rs      |  2 --
 web3_proxy/src/block_number.rs | 24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/web3_proxy/src/app/mod.rs b/web3_proxy/src/app/mod.rs
index e7cfbec5..46dc2b9b 100644
--- a/web3_proxy/src/app/mod.rs
+++ b/web3_proxy/src/app/mod.rs
@@ -1332,8 +1332,6 @@ impl Web3ProxyApp {
                 match head_block.cloned().or(self.balanced_rpcs.head_block()) {
                     Some(head_block) => JsonRpcResponseEnum::from(json!(head_block.number())),
                     None => {
-                        // TODO: what does geth do if this happens?
-                        // TODO: standard not synced error
                         return Err(Web3ProxyError::NoServersSynced);
                     }
                 }
diff --git a/web3_proxy/src/block_number.rs b/web3_proxy/src/block_number.rs
index bebedc36..20cb7d6d 100644
--- a/web3_proxy/src/block_number.rs
+++ b/web3_proxy/src/block_number.rs
@@ -11,7 +11,7 @@ use ethers::{
 };
 use serde_json::json;
 use std::sync::Arc;
-use tracing::{trace, warn, error};
+use tracing::{error, trace, warn};
 
 use crate::{frontend::authorization::Authorization, rpcs::many::Web3Rpcs};
 
@@ -116,17 +116,21 @@ pub async fn clean_block_number(
                         let (block_num, change) =
                             BlockNumber_to_U64(block_number, latest_block.number());
 
-                        let (block_hash, _) = rpcs
-                            .block_hash(authorization, &block_num)
-                            .await
-                            .context("fetching block hash from number")?;
+                        if block_num == *latest_block.number() {
+                            (latest_block.into(), change)
+                        } else {
+                            let (block_hash, _) = rpcs
+                                .block_hash(authorization, &block_num)
+                                .await
+                                .context("fetching block hash from number")?;
 
-                        let block = rpcs
-                            .block(authorization, &block_hash, None, Some(3), None)
-                            .await
-                            .context("fetching block from hash")?;
+                            let block = rpcs
+                                .block(authorization, &block_hash, None, Some(3), None)
+                                .await
+                                .context("fetching block from hash")?;
 
-                        (BlockNumAndHash::from(&block), change)
+                            (BlockNumAndHash::from(&block), change)
+                        }
                     } else if let Ok(block_hash) = serde_json::from_value::<H256>(x.clone()) {
                         let block = rpcs
                             .block(authorization, &block_hash, None, Some(3), None)