status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-27 14:58:46 +00:00
Code Issues Projects Releases Wiki Activity

fix regression when fetching genesis data in trustedNodeSync mode (#6047)

Browse Source 
Corrects a regression from #5998 that led to crashes in #6046.
In `trustedNodeSync` mode, the config does not contain genesis keys,
so attempting to load from them is a `Defect`.
This commit is contained in:
Etan Kissling 2024-03-08 14:52:54 +01:00 committed by GitHub
parent a0bc3fff86
commit 984d5e4631
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
beacon_chain/nimbus_beacon_node.nim
View File

@ -61,12 +61,13 @@ declareCounter db_checkpoint_seconds,
"Time spent checkpointing the database to clear the WAL file" "Time spent checkpointing the database to clear the WAL file"
proc fetchGenesisState( proc fetchGenesisState(
config: BeaconNodeConf, metadata: Eth2NetworkMetadata,
metadata: Eth2NetworkMetadata genesisState = none(InputFile),
genesisStateUrl = none(Uri)
): Future[ref ForkedHashedBeaconState] {.async: (raises: []).} = ): Future[ref ForkedHashedBeaconState] {.async: (raises: []).} =
let genesisBytes = let genesisBytes =
if metadata.genesis.kind != BakedIn and config.genesisState.isSome: if metadata.genesis.kind != BakedIn and genesisState.isSome:
let res = io2.readAllBytes(config.genesisState.get.string) let res = io2.readAllBytes(genesisState.get.string)
res.valueOr: res.valueOr:
error "Failed to read genesis state file", err = res.error.ioErrorMsg error "Failed to read genesis state file", err = res.error.ioErrorMsg
quit 1 quit 1
@ -74,9 +75,9 @@ proc fetchGenesisState(
try: try:
if metadata.genesis.kind == BakedInUrl: if metadata.genesis.kind == BakedInUrl:
info "Obtaining genesis state", info "Obtaining genesis state",
sourceUrl = $config.genesisStateUrl sourceUrl = $genesisStateUrl
.get(parseUri metadata.genesis.url) .get(parseUri metadata.genesis.url)
await metadata.fetchGenesisBytes(config.genesisStateUrl) await metadata.fetchGenesisBytes(genesisStateUrl)
except CatchableError as err: except CatchableError as err:
error "Failed to obtain genesis state", error "Failed to obtain genesis state",
source = metadata.genesis.sourceDesc, source = metadata.genesis.sourceDesc,
@ -582,7 +583,8 @@ proc init*(T: type BeaconNode,
config.trustedBlockRoot config.trustedBlockRoot
elif cfg.ALTAIR_FORK_EPOCH == GENESIS_EPOCH: elif cfg.ALTAIR_FORK_EPOCH == GENESIS_EPOCH:
# Sync can be bootstrapped from the genesis block root # Sync can be bootstrapped from the genesis block root
genesisState = await fetchGenesisState(config, metadata) genesisState = await fetchGenesisState(
metadata, config.genesisState, config.genesisStateUrl)
if genesisState != nil: if genesisState != nil:
let genesisBlockRoot = get_initial_beacon_block(genesisState[]).root let genesisBlockRoot = get_initial_beacon_block(genesisState[]).root
notice "Neither `--trusted-block-root` nor `--trusted-state-root` " & notice "Neither `--trusted-block-root` nor `--trusted-state-root` " &
@ -605,7 +607,8 @@ proc init*(T: type BeaconNode,
trustedStateRoot = config.trustedStateRoot trustedStateRoot = config.trustedStateRoot
else: else:
if genesisState == nil: if genesisState == nil:
genesisState = await fetchGenesisState(config, metadata) genesisState = await fetchGenesisState(
metadata, config.genesisState, config.genesisStateUrl)
await db.doRunTrustedNodeSync( await db.doRunTrustedNodeSync(
metadata, metadata,
config.databaseDir, config.databaseDir,
@ -674,7 +677,8 @@ proc init*(T: type BeaconNode,
getStateField(checkpointState[], slot) == 0: getStateField(checkpointState[], slot) == 0:
checkpointState checkpointState
else: else:
await fetchGenesisState(config, metadata) await fetchGenesisState(
metadata, config.genesisState, config.genesisStateUrl)
if genesisState == nil and checkpointState == nil: if genesisState == nil and checkpointState == nil:
fatal "No database and no genesis snapshot found. Please supply a genesis.ssz " & fatal "No database and no genesis snapshot found. Please supply a genesis.ssz " &
@ -2305,7 +2309,7 @@ proc handleStartUpCmd(config: var BeaconNodeConf) {.raises: [CatchableError].} =
let let
metadata = loadEth2Network(config) metadata = loadEth2Network(config)
db = BeaconChainDB.new(config.databaseDir, metadata.cfg, inMemory = false) db = BeaconChainDB.new(config.databaseDir, metadata.cfg, inMemory = false)
genesisState = waitFor fetchGenesisState(config, metadata) genesisState = waitFor fetchGenesisState(metadata)
waitFor db.doRunTrustedNodeSync( waitFor db.doRunTrustedNodeSync(
metadata, metadata,
config.databaseDir, config.databaseDir,