From f2cb22772a08623213a2cb4decddced58c063f9c Mon Sep 17 00:00:00 2001 From: gop Date: Tue, 26 Sep 2023 17:42:28 -0500 Subject: [PATCH] bugfix: Guard the FinalizeAssemble for slices that are not processing state --- core/worker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/worker.go b/core/worker.go index b5f18e0c2b..520c438355 100644 --- a/core/worker.go +++ b/core/worker.go @@ -506,6 +506,7 @@ func (w *worker) GeneratePendingHeader(block *types.Block, fill bool) (*types.He if err != nil { return nil, err } + work.header = block.Header() w.printPendingHeaderInfo(work, block, start) @@ -916,7 +917,7 @@ func (w *worker) FinalizeAssemble(chain consensus.ChainHeaderReader, header *typ manifestHash := w.ComputeManifestHash(parent.Header()) block.Header().SetManifestHash(manifestHash) - if nodeCtx == common.ZONE_CTX { + if nodeCtx == common.ZONE_CTX && w.hc.ProcessingState() { // Compute and set etx rollup hash etxRollup := types.Transactions{} if w.engine.IsDomCoincident(w.hc, parent.Header()) {