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

Merge branch 'dev/etan/vd-incprop' into feat/splitview

This commit is contained in:
Etan Kissling 2024-03-26 05:14:15 +01:00
parent bc58c3249f 2b169efa23
commit 1744d68af8
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_chain/consensus_object_pools/blockchain_dag.nim
View File

@ -2657,9 +2657,12 @@ proc getProposalState*(
# and thus has a hot hash tree cache # and thus has a hot hash tree cache
let state = let state =
if dag.incrementalState != nil: if dag.incrementalState != nil:
# The block's pre-state will be needed soon to validate our own block
dag.clearanceState.assign(dag.incrementalState[])
dag.incrementalState dag.incrementalState
else: else:
assignClone(dag.clearanceState) assignClone(dag.clearanceState)
dag.resetChainProgressWatchdog()
var var
info = ForkedEpochInfo() info = ForkedEpochInfo()
@ -2681,8 +2684,6 @@ proc getProposalState*(
dag.cfg, state[], slot, cache, info, dag.cfg, state[], slot, cache, info,
{skipLastStateRootCalculation}).expect("advancing 1 slot should not fail") {skipLastStateRootCalculation}).expect("advancing 1 slot should not fail")
# Ensure async operations don't interfere with `incrementalState`
dag.resetChainProgressWatchdog()
ok state ok state
func aggregateAll*( func aggregateAll*(