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

harden `exchangeTransitionConfiguration` retries (#4095) 

`p.dataProvider` may become `nil` between individual attempts to
exchange transition configuration with the EL. Harden by capturing
the data provider on function start.

Note that other functions are already hardened, or are unaffected.
Only `close` transitions `p.dataProvider` to `nil`, and `close` is
only called by the main deposits import sequence. During the deposits
import, `close` is not called, so extra checks are not needed.
This commit is contained in:
Etan Kissling 2022-09-08 09:36:53 +02:00 committed by GitHub
parent eb791cfac8
commit e6b8bc6527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/eth1/eth1_monitor.nim
View File

@ -554,8 +554,10 @@ proc exchangeTransitionConfiguration*(p: Eth1Monitor): Future[EtcStatus] {.async
# don't crash. # don't crash.
if p.isNil: if p.isNil:
debug "exchangeTransitionConfiguration: nil Eth1Monitor" debug "exchangeTransitionConfiguration: nil Eth1Monitor"
return EtcStatus.exchangeError
if p.isNil or p.dataProvider.isNil: let dataProvider = p.dataProvider
if dataProvider.isNil:
return EtcStatus.exchangeError return EtcStatus.exchangeError
let consensusCfg = TransitionConfigurationV1( let consensusCfg = TransitionConfigurationV1(
@ -573,7 +575,7 @@ proc exchangeTransitionConfiguration*(p: Eth1Monitor): Future[EtcStatus] {.async
let executionCfg = let executionCfg =
try: try:
awaitWithRetries( awaitWithRetries(
p.dataProvider.web3.provider.engine_exchangeTransitionConfigurationV1( dataProvider.web3.provider.engine_exchangeTransitionConfigurationV1(
consensusCfg), consensusCfg),
timeout = 1.seconds) timeout = 1.seconds)
except CatchableError as err: except CatchableError as err:
@ -1162,6 +1164,7 @@ func earliestBlockOfInterest(m: Eth1Monitor): Eth1BlockNumber =
proc syncBlockRange(m: Eth1Monitor, proc syncBlockRange(m: Eth1Monitor,
fromBlock, toBlock, fromBlock, toBlock,
fullSyncFromBlock: Eth1BlockNumber) {.gcsafe, async.} = fullSyncFromBlock: Eth1BlockNumber) {.gcsafe, async.} =
doAssert m.dataProvider != nil, "close not called concurrently"
doAssert m.depositsChain.blocks.len > 0 doAssert m.depositsChain.blocks.len > 0
var currentBlock = fromBlock var currentBlock = fromBlock
@ -1350,6 +1353,7 @@ proc startEth1Syncing(m: Eth1Monitor, delayBeforeStart: Duration) {.async.} =
await provider.close() await provider.close()
await m.ensureDataProvider() await m.ensureDataProvider()
doAssert m.dataProvider != nil, "close not called concurrently"
if m.currentEpoch >= m.cfg.BELLATRIX_FORK_EPOCH: if m.currentEpoch >= m.cfg.BELLATRIX_FORK_EPOCH:
let status = await m.exchangeTransitionConfiguration() let status = await m.exchangeTransitionConfiguration()
@ -1636,6 +1640,7 @@ when hasGenesisDetection:
proc findGenesisBlockInRange(m: Eth1Monitor, startBlock, endBlock: Eth1Block): proc findGenesisBlockInRange(m: Eth1Monitor, startBlock, endBlock: Eth1Block):
Future[Eth1Block] {.async.} = Future[Eth1Block] {.async.} =
doAssert m.dataProvider != nil, "close not called concurrently"
doAssert startBlock.timestamp != 0 and not m.isAfterMinGenesisTime(startBlock) doAssert startBlock.timestamp != 0 and not m.isAfterMinGenesisTime(startBlock)
doAssert endBlock.timestamp != 0 and m.isAfterMinGenesisTime(endBlock) doAssert endBlock.timestamp != 0 and m.isAfterMinGenesisTime(endBlock)
doAssert m.hasEnoughValidators(startBlock) doAssert m.hasEnoughValidators(startBlock)