Move to a PostCopy hook 🎉

core/types/block.go

@@ -277,9 +277,8 @@ func NewBlockWithWithdrawals(header *Header, txs []*Transaction, uncles []*Heade
 	return b.WithWithdrawals(withdrawals)
 }
 
-// CopyEthHeader creates a deep copy of an Ethereum block header.
-// Use [CopyHeader] instead if your header has any registered extra.
-func CopyEthHeader(h *Header) *Header {
+// CopyHeader creates a deep copy of a block header.
+func CopyHeader(h *Header) *Header {
 	cpy := *h
 	if cpy.Difficulty = new(big.Int); h.Difficulty != nil {
 		cpy.Difficulty.Set(h.Difficulty)
@@ -310,6 +309,7 @@ func CopyEthHeader(h *Header) *Header {
 		cpy.ParentBeaconRoot = new(common.Hash)
 		*cpy.ParentBeaconRoot = *h.ParentBeaconRoot
 	}
+	h.hooks().PostCopy(&cpy, h)
 	return &cpy
 }
 

core/types/block.libevm.go

@@ -32,7 +32,7 @@ type HeaderHooks interface {
 	UnmarshalJSON(*Header, []byte) error //nolint:govet
 	EncodeRLP(*Header, io.Writer) error
 	DecodeRLP(*Header, *rlp.Stream) error
-	Copy(*Header) *Header
+	PostCopy(dst, src *Header)
 }
 
 // hooks returns the Header's registered HeaderHooks, if any, otherwise a
@@ -110,11 +110,4 @@ func (*NOOPHeaderHooks) DecodeRLP(h *Header, s *rlp.Stream) error {
 	return s.Decode((*withoutMethods)(h))
 }
 
-func (n *NOOPHeaderHooks) Copy(h *Header) *Header {
-	return CopyEthHeader(h)
-}
-
-// CopyHeader creates a deep copy of a block header.
-func CopyHeader(h *Header) *Header {
-	return h.hooks().Copy(h)
-}
+func (n *NOOPHeaderHooks) PostCopy(dst, src *Header) {}

core/types/block.libevm_test.go

@@ -75,9 +75,7 @@ func (hh *stubHeaderHooks) DecodeRLP(h *Header, s *rlp.Stream) error {
 	return hh.errDecode
 }
 
-func (hh *stubHeaderHooks) Copy(h *Header) *Header {
-	return h
-}
+func (hh *stubHeaderHooks) PostCopy(dst, src *Header) {}
 
 func TestHeaderHooks(t *testing.T) {
 	TestOnlyClearRegisteredExtras()