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

Fetch deposit root and deposit count from cache

Browse Source
This commit is contained in:
pawan
2019-12-10 23:23:35 +05:30
parent f82e2755d0
commit e3318168bb
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,6 +614,16 @@ fn download_eth1_block<'a>(
cache: Arc<Inner>, cache: Arc<Inner>,
block_number: u64, block_number: u64,
) -> impl Future<Item = Eth1Block, Error = Error> + 'a { ) -> impl Future<Item = Eth1Block, Error = Error> + 'a {
let deposit_root = cache
.deposit_cache
.read()
.cache
.get_deposit_root_from_cache(block_number);
let deposit_count = cache
.deposit_cache
.read()
.cache
.get_deposit_count_from_cache(block_number);
// Performs a `get_blockByNumber` call to an eth1 node. // Performs a `get_blockByNumber` call to an eth1 node.
get_block( get_block(
&cache.config.read().endpoint, &cache.config.read().endpoint,
@@ -621,24 +631,7 @@ fn download_eth1_block<'a>(
Duration::from_millis(GET_BLOCK_TIMEOUT_MILLIS), Duration::from_millis(GET_BLOCK_TIMEOUT_MILLIS),
) )
.map_err(Error::BlockDownloadFailed) .map_err(Error::BlockDownloadFailed)
.join3( .map(move |http_block| Eth1Block {
// 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, hash: http_block.hash,
number: http_block.number, number: http_block.number,
timestamp: http_block.timestamp, timestamp: http_block.timestamp,