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

make checking block data optional

Browse Source 
this is needed so that private/bundler rpcs can send requests
This commit is contained in:
Bryan Stitt 2023-11-01 22:55:28 -07:00
parent 971f690d4f
commit ff14045b64
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web3_proxy/src/rpcs/consensus.rs
View File

@ -73,7 +73,9 @@ pub enum ShouldWaitForBlock {
#[derive(Clone, Debug, Serialize)]
enum SortMethod {
/// shuffle the servers randomly instead of by latency
Shuffle,
/// sort the servers by latency (among other things)
Sort,
}
@ -87,6 +89,7 @@ pub struct RankedRpcs {
pub head_block: Web3ProxyBlock,
pub num_synced: usize,
pub backups_needed: bool,
pub check_block_data: bool,
pub(crate) inner: HashSet<Arc<Web3Rpc>>,
@ -102,7 +105,11 @@ pub struct RpcsForRequest {
}
impl RankedRpcs {
pub fn from_rpcs(rpcs: Vec<Arc<Web3Rpc>>, head_block: Option<Web3ProxyBlock>) -> Self {
pub fn from_rpcs(
rpcs: Vec<Arc<Web3Rpc>>,
head_block: Option<Web3ProxyBlock>,
check_block_data: bool,
) -> Self {
// we don't need to sort the rpcs now. we will sort them when a request neds them
// TODO: the shame about this is that we lose just being able to compare 2 random servers
@ -119,6 +126,7 @@ impl RankedRpcs {
Self {
backups_needed,
check_block_data,
head_block,
inner: rpcs,
num_synced,
@ -195,6 +203,7 @@ impl RankedRpcs {
let consensus = RankedRpcs {
backups_needed,
check_block_data: true,
head_block: best_block,
sort_mode,
inner: best_rpcs,
@ -233,16 +242,18 @@ impl RankedRpcs {
continue;
}
if let Some(block_needed) = min_block_needed {
if !rpc.has_block_data(block_needed) {
outer_for_request.push(rpc);
continue;
if self.check_block_data {
if let Some(block_needed) = min_block_needed {
if !rpc.has_block_data(block_needed) {
outer_for_request.push(rpc);
continue;
}
}
}
if let Some(block_needed) = max_block_needed {
if !rpc.has_block_data(block_needed) {
outer_for_request.push(rpc);
continue;
if let Some(block_needed) = max_block_needed {
if !rpc.has_block_data(block_needed) {
outer_for_request.push(rpc);
continue;
}
}
}

7
web3_proxy/src/rpcs/many.rs
View File

@ -45,6 +45,7 @@ pub struct Web3Rpcs {
/// Geth's subscriptions have the same potential for skipping blocks.
pub(crate) watch_ranked_rpcs: watch::Sender<Option<Arc<RankedRpcs>>>,
/// this head receiver makes it easy to wait until there is a new block
/// this is None if none of the child Rpcs are subscribed to newHeads
pub(super) watch_head_block: Option<watch::Sender<Option<Web3ProxyBlock>>>,
/// TODO: this map is going to grow forever unless we do some sort of pruning. maybe store pruned in redis?
/// all blocks, including uncles
@ -416,7 +417,11 @@ impl Web3Rpcs {
let rpcs = self.by_name.read().values().cloned().collect();
// TODO: does this need the head_block? i don't think so
let x = RankedRpcs::from_rpcs(rpcs, web3_request.head_block.clone());
let x = RankedRpcs::from_rpcs(
rpcs,
web3_request.head_block.clone(),
self.watch_head_block.is_some(),
);
Arc::new(x)
};