gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 17:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare deposit_count between the caching and http eth1 blocks

Browse Source
This commit is contained in:
pawan
2019-12-12 00:13:22 +05:30
parent 365d6a2ef0
commit e3d0325ae6
1 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
beacon_node/eth1/src/service.rs
View File

@@ -484,6 +484,7 @@ impl Service {
let cache_3 = self.inner.clone(); let cache_3 = self.inner.clone();
let cache_4 = self.inner.clone(); let cache_4 = self.inner.clone();
let cache_5 = self.inner.clone(); let cache_5 = self.inner.clone();
let log = self.log.clone();
let block_cache_truncation = self.config().block_cache_truncation; let block_cache_truncation = self.config().block_cache_truncation;
let max_blocks_per_update = self let max_blocks_per_update = self
@@ -545,18 +546,26 @@ impl Service {
stream::unfold( stream::unfold(
required_block_numbers, required_block_numbers,
move |mut block_numbers| match block_numbers.next() { move |mut block_numbers| match block_numbers.next() {
Some(block_number) => Some( Some(block_number) => {
download_eth1_block(cache_2.clone(), block_number) let cached = download_eth1_block(cache_2.clone(), block_number);
.map(|v| (v, block_numbers)), let http = download_eth1_block_http(cache_2.clone(), block_number);
), Some(cached.join(http).map(|v| (v, block_numbers)))
}
None => None, None => None,
}, },
) )
.fold(0, move |sum, eth1_block| { .fold(0, move |sum, (eth1_block_cached, eth1_block_http)| {
debug!(
log,
"Comparing eth1_block deposit count";
"equal" => eth1_block_cached.deposit_count == eth1_block_http.deposit_count,
"original" => format!("{:?}", eth1_block_http.deposit_count),
"cached" => format!("{:?}", eth1_block_cached.deposit_count),
);
cache_3 cache_3
.block_cache .block_cache
.write() .write()
.insert_root_or_child(eth1_block) .insert_root_or_child(eth1_block_http)
.map_err(Error::FailedToInsertEth1Block)?; .map_err(Error::FailedToInsertEth1Block)?;
Ok(sum + 1) Ok(sum + 1)
@@ -640,6 +649,43 @@ fn download_eth1_block<'a>(
}) })
} }
fn download_eth1_block_http<'a>(
cache: Arc<Inner>,
block_number: u64,
) -> impl Future<Item = Eth1Block, Error = Error> + 'a {
// Performs a `get_blockByNumber` call to an eth1 node.
get_block(
&cache.config.read().endpoint,
block_number,
Duration::from_millis(GET_BLOCK_TIMEOUT_MILLIS),
)
.map_err(Error::BlockDownloadFailed)
.join3(
// Perform 2x `eth_call` via an eth1 node to read the deposit contract root and count.
get_deposit_root(
&cache.config.read().endpoint,
&cache.config.read().deposit_contract_address,
block_number,
Duration::from_millis(GET_DEPOSIT_ROOT_TIMEOUT_MILLIS),
)
.map_err(Error::GetDepositRootFailed),
get_deposit_count(
&cache.config.read().endpoint,
&cache.config.read().deposit_contract_address,
block_number,
Duration::from_millis(GET_DEPOSIT_COUNT_TIMEOUT_MILLIS),
)
.map_err(Error::GetDepositCountFailed),
)
.map(|(http_block, deposit_root, deposit_count)| Eth1Block {
hash: http_block.hash,
number: http_block.number,
timestamp: http_block.timestamp,
deposit_root,
deposit_count,
})
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;