From c3924a529e80a9f048cfeb4851b56922e0ec12b5 Mon Sep 17 00:00:00 2001 From: philip-morlier Date: Thu, 6 Apr 2023 10:36:43 -0700 Subject: [PATCH] new consensus engine commit 4/6/23 --- plugins/wrappers/engine/enginewrapper.go | 1 - plugins/wrappers/wrappers.go | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/wrappers/engine/enginewrapper.go b/plugins/wrappers/engine/enginewrapper.go index 40bc297b4..f8aacc60d 100644 --- a/plugins/wrappers/engine/enginewrapper.go +++ b/plugins/wrappers/engine/enginewrapper.go @@ -432,7 +432,6 @@ func (ew *engineWrapper) Prepare(chain consensus.ChainHeaderReader, header *type } // header.Difficulty = uHeader.Difficulty *header = *utilsToGethHeader(uHeader) - log.Error("header logs", "header D", header.Difficulty, "U head D", uHeader.Difficulty) return nil } func (ew *engineWrapper) Finalize(chain consensus.ChainHeaderReader, header *types.Header, state *state.StateDB, txs []*types.Transaction, uncles []*types.Header, withdrawals []*types.Withdrawal) { diff --git a/plugins/wrappers/wrappers.go b/plugins/wrappers/wrappers.go index 5458cd4a5..33fe44d07 100644 --- a/plugins/wrappers/wrappers.go +++ b/plugins/wrappers/wrappers.go @@ -194,6 +194,11 @@ func (w *WrappedStateDB) SlotInAccessList(addr core.Address, slot core.Hash) (ad return w.s.SlotInAccessList(common.Address(addr), common.Hash(slot)) } +// IntermediateRoot(deleteEmptyObjects bool) common.Hash +func (w *WrappedStateDB) IntermediateRoot(deleteEmptyObjects bool) core.Hash { + return core.Hash(w.s.IntermediateRoot(deleteEmptyObjects)) +} + type Node struct { n *node.Node }