From 3a1e29af77d4f967c7b8d37ecb26eec49648d5fe Mon Sep 17 00:00:00 2001 From: Blaise Krzakala Date: Wed, 20 Oct 2021 16:08:55 +0200 Subject: [PATCH] Revert "Fix header decoding issue after integrating london hard fork" --- consensus/pandora/consensus.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/consensus/pandora/consensus.go b/consensus/pandora/consensus.go index 236580229fb6..65ffbf1fe14d 100644 --- a/consensus/pandora/consensus.go +++ b/consensus/pandora/consensus.go @@ -40,7 +40,7 @@ func (p *Pandora) SealHash(header *types.Header) (hash common.Hash) { headerExtra.Slot = pandoraExtraData.Slot extraData, _ = rlp.EncodeToBytes(headerExtra) } - enc := []interface{}{ + rlp.Encode(hasher, []interface{}{ header.ParentHash, header.UncleHash, header.Coinbase, @@ -54,11 +54,7 @@ func (p *Pandora) SealHash(header *types.Header) (hash common.Hash) { header.GasUsed, header.Time, extraData, - } - if header.BaseFee != nil { - enc = append(enc, header.BaseFee) - } - rlp.Encode(hasher, enc) + }) hasher.Sum(hash[:0]) return hash }