tornadocontrib/ web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BlockNumOrHash more places

This commit is contained in:
Bryan Stitt 2023-10-31 19:46:35 -07:00
parent 51594cb1c0
commit 013994994d
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
web3_proxy/src/block_number.rs
View File

@ -72,7 +72,7 @@ pub async fn clean_block_number<'a>(
block_param_id: usize, block_param_id: usize,
head_block: &'a Web3ProxyBlock, head_block: &'a Web3ProxyBlock,
app: Option<&'a App>, app: Option<&'a App>,
) -> Web3ProxyResult<BlockNumAndHash> { ) -> Web3ProxyResult<BlockNumOrHash> {
match params.as_array_mut() { match params.as_array_mut() {
None => { None => {
// TODO: this needs the correct error code in the response // TODO: this needs the correct error code in the response
@ -83,14 +83,14 @@ pub async fn clean_block_number<'a>(
if params.len() == block_param_id { if params.len() == block_param_id {
// add the latest block number to the end of the params // add the latest block number to the end of the params
params.push(json!(head_block.number())); params.push(json!(head_block.number()));
} else {
// don't modify the request. only cache with current block
// TODO: more useful log that include the
warn!("unexpected params length");
}
// don't modify params, just cache with the current block Ok(head_block.into())
Ok(head_block.into()) } else {
// don't modify the request
Err(Web3ProxyError::BadRequest(
"unexpected params length".into(),
))
}
} }
Some(x) => { Some(x) => {
// dig into the json value to find a BlockNumber or similar block identifier // dig into the json value to find a BlockNumber or similar block identifier
@ -113,7 +113,7 @@ pub async fn clean_block_number<'a>(
.await .await
.context("fetching block number from hash")?; .context("fetching block number from hash")?;
(BlockNumAndHash::from(&block), false) (BlockNumOrHash::from(&block), false)
} else { } else {
return Err(anyhow::anyhow!( return Err(anyhow::anyhow!(
"app missing. cannot find block number from hash" "app missing. cannot find block number from hash"
@ -175,28 +175,25 @@ pub async fn clean_block_number<'a>(
(head_block.into(), changed) (head_block.into(), changed)
} else if let Some(app) = app { } else if let Some(app) = app {
// TODO: make a jsonrpc query here? cache rates will be better but it adds a network request // TODO: make a jsonrpc query here? cache rates will be better but it adds a network request
let block_hash = app // todo!("don't require the hash. just try to get it. same for eth_getLogs");
.balanced_rpcs // let block_hash = app
.blocks_by_number // .balanced_rpcs
.get(&block_num) // .blocks_by_number
.await // .get(&block_num)
.context("fetching block hash from number")?; // .await
// .context("fetching block hash from number")?;
// TODO: make a jsonrpc query here? cache rates will be better but it adds a network request // // TODO: make a jsonrpc query here? cache rates will be better but it adds a network request
let block = app // let block = app
.balanced_rpcs // .balanced_rpcs
.blocks_by_hash // .blocks_by_hash
.get(&block_hash) // .get(&block_hash)
.await // .await
.context("fetching block from hash")?; // .context("fetching block from hash")?;
// TODO: do true here? will that work for **all** methods on **all** chains? if not we need something smarter (BlockNumOrHash::Num(block_num), changed)
(BlockNumAndHash::from(&block), changed)
} else { } else {
return Err(anyhow::anyhow!( (BlockNumOrHash::Num(block_num), changed)
"app missing. cannot find block number from hash"
)
.into());
} }
}; };
@ -240,7 +237,6 @@ impl From<&Web3ProxyBlock> for BlockNumOrHash {
pub enum CacheMode { pub enum CacheMode {
SuccessForever, SuccessForever,
Standard { Standard {
/// TODO: i don't think i'm using this correctly everywhere. i think we return an error if this can't be found when we should just allow the number
block_needed: BlockNumOrHash, block_needed: BlockNumOrHash,
cache_block: BlockNumAndHash, cache_block: BlockNumAndHash,
/// cache jsonrpc errors (server errors are never cached) /// cache jsonrpc errors (server errors are never cached)
@ -495,11 +491,17 @@ impl CacheMode {
"net_version" => Ok(Self::SuccessForever), "net_version" => Ok(Self::SuccessForever),
method => match get_block_param_id(method) { method => match get_block_param_id(method) {
Some(block_param_id) => { Some(block_param_id) => {
let block = clean_block_number(params, block_param_id, head_block, app).await?; let block_needed =
clean_block_number(params, block_param_id, head_block, app).await?;
let cache_block = match &block_needed {
BlockNumOrHash::And(block) => block.clone(),
BlockNumOrHash::Num(_) => head_block.into(),
};
Ok(Self::Standard { Ok(Self::Standard {
block_needed: BlockNumOrHash::And(block.clone()), block_needed,
cache_block: block, cache_block,
cache_errors: true, cache_errors: true,
}) })
} }