From 0e3fdfa0eacf46d115b1c304e05a1b42edc63afe Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Wed, 5 Jul 2023 23:13:32 -0700 Subject: [PATCH] cache eth_getLogs fromBlock properly --- web3_proxy/src/block_number.rs | 3 +-- web3_proxy/src/rpcs/many.rs | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web3_proxy/src/block_number.rs b/web3_proxy/src/block_number.rs index 20cb7d6d..16fa2f6e 100644 --- a/web3_proxy/src/block_number.rs +++ b/web3_proxy/src/block_number.rs @@ -271,8 +271,7 @@ impl CacheMode { BlockNumAndHash(block_num, block_hash) } else { - warn!("if no from, what should we default? 0 or head?"); - head_block.into() + BlockNumAndHash(U64::zero(), H256::zero()) }; let to_block = if let Some(x) = obj.get_mut("toBlock") { diff --git a/web3_proxy/src/rpcs/many.rs b/web3_proxy/src/rpcs/many.rs index 7f683611..14e17ed4 100644 --- a/web3_proxy/src/rpcs/many.rs +++ b/web3_proxy/src/rpcs/many.rs @@ -1075,6 +1075,7 @@ impl Web3Rpcs { ); } else if head_block_num.as_ref() > needed { // we have synced past the needed block + // TODO: log ranked rpcs // TODO: only log params in development error!( min=?min_block_needed, @@ -1087,6 +1088,7 @@ impl Web3Rpcs { ); } else { // TODO: only log params in development + // TODO: log ranked rpcs error!( min=?min_block_needed, max=?max_block_needed, @@ -1097,8 +1099,6 @@ impl Web3Rpcs { ?params, "Requested data is not available", ); - // TODO: remove this, or move to trace level - // debug!("{}", serde_json::to_string(&request).unwrap()); } // TODO: what error code?