status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compilation with `-d:has_deposit_root_checks` (#5855) 

Since #4465, compilation with `-d:has_deposit_root_checks` fails. #4707
further built on top of it but the additions also don't compile. Fix it.
This commit is contained in:
Etan Kissling 2024-02-06 23:03:52 +01:00 committed by GitHub
parent 41403022bb
commit f0f14f10d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
beacon_chain/el/el_manager.nim
View File

@ -1398,7 +1398,7 @@ when hasDepositRootChecks:
proc fetchDepositContractData(connection: ELConnection,
rpcClient: RpcClient,
depositContact: Sender[DepositContract],
depositContract: Sender[DepositContract],
blk: Eth1Block): Future[DepositContractDataStatus] {.async.} =
let
startTime = Moment.now
@ -1416,8 +1416,10 @@ when hasDepositRootChecks:
failureAllowed = true)
try:
let fetchedRoot = asEth2Digest(
awaitWithTimeout(depositRoot, deadline))
let fetchedRoot = asEth2Digest(block:
awaitWithTimeout(depositRoot, deadline):
raise newException(DataProviderTimeout,
"Request time out while obtaining deposits root"))
if blk.depositRoot.isZero:
blk.depositRoot = fetchedRoot
result = Fetched
@ -1432,8 +1434,10 @@ when hasDepositRootChecks:
result = DepositRootUnavailable
try:
let fetchedCount = bytes_to_uint64(
awaitWithTimeout(rawCount, deadline).toArray)
let fetchedCount = bytes_to_uint64((block:
awaitWithTimeout(rawCount, deadline):
raise newException(DataProviderTimeout,
"Request time out while obtaining deposits count")).toArray)
if blk.depositCount == 0:
blk.depositCount = fetchedCount
elif blk.depositCount != fetchedCount:
@ -1610,7 +1614,8 @@ proc syncBlockRange(m: ELManager,
template lastBlock: auto = blocksWithDeposits[lastIdx]
let status = when hasDepositRootChecks:
rpcClient.fetchDepositContractData(depositContract, lastBlock)
await fetchDepositContractData(
connection, rpcClient, depositContract, lastBlock)
else:
DepositRootUnavailable