mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-31 13:17:09 +00:00
resolve merge conflicts between untstable and release-v7.0.0
This commit is contained in:
@@ -282,8 +282,13 @@ where
|
||||
.get_blinded_block(&chain.genesis_block_root)
|
||||
.map_err(|e| descriptive_db_error("genesis block", &e))?
|
||||
.ok_or("Genesis block not found in store")?;
|
||||
// We're resuming from some state in the db so it makes sense to cache it.
|
||||
let genesis_state = store
|
||||
.get_state(&genesis_block.state_root(), Some(genesis_block.slot()))
|
||||
.get_state(
|
||||
&genesis_block.state_root(),
|
||||
Some(genesis_block.slot()),
|
||||
true,
|
||||
)
|
||||
.map_err(|e| descriptive_db_error("genesis state", &e))?
|
||||
.ok_or("Genesis state not found in store")?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user