Sync changes to process execution payload envelopes

beacon-chain/blockchain/BUILD.bazel

@@ -170,7 +170,6 @@ go_test(
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/blocks:go_default_library",
-        "//consensus-types/epbs:go_default_library",
         "//consensus-types/interfaces:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//container/trie:go_default_library",
@@ -183,6 +182,7 @@ go_test(
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",
+        "//testing/util/random:go_default_library",
         "//time:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_ethereum_go_ethereum//common:go_default_library",

beacon-chain/blockchain/chain_info.go

@@ -118,6 +118,12 @@ type OptimisticModeFetcher interface {
 	IsOptimisticForRoot(ctx context.Context, root [32]byte) (bool, error)
 }
 
+// ExecutionPayloadFetcher defines a common interface that returns forkchoice
+// information about payload block hashes
+type ExecutionPayloadFetcher interface {
+	HashInForkchoice([32]byte) bool
+}
+
 // FinalizedCheckpt returns the latest finalized checkpoint from chain store.
 func (s *Service) FinalizedCheckpt() *ethpb.Checkpoint {
 	s.cfg.ForkChoiceStore.RLock()
@@ -399,6 +405,14 @@ func (s *Service) InForkchoice(root [32]byte) bool {
 	return s.cfg.ForkChoiceStore.HasNode(root)
 }
 
+// HashInForkchoice returns true if the given payload block hash is found in
+// forkchoice
+func (s *Service) HashInForkchoice(hash [32]byte) bool {
+	s.cfg.ForkChoiceStore.RLock()
+	defer s.cfg.ForkChoiceStore.RUnlock()
+	return s.cfg.ForkChoiceStore.HasHash(hash)
+}
+
 // IsOptimisticForRoot takes the root as argument instead of the current head
 // and returns true if it is optimistic.
 func (s *Service) IsOptimisticForRoot(ctx context.Context, root [32]byte) (bool, error) {

beacon-chain/blockchain/options.go

@@ -1,6 +1,8 @@
 package blockchain
 
 import (
+	"sync"
+
 	"github.com/prysmaticlabs/prysm/v5/async/event"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/cache"
 	statefeed "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/state"
@@ -77,6 +79,14 @@ func WithPayloadAttestationCache(c *cache.PayloadAttestationCache) Option {
 	}
 }
 
+// WithPayloadEnvelopeCache for payload envelope cache.
+func WithPayloadEnvelopeCache(c *sync.Map) Option {
+	return func(s *Service) error {
+		s.cfg.PayloadEnvelopeCache = c
+		return nil
+	}
+}
+
 // WithPayloadIDCache for payload ID cache.
 func WithPayloadIDCache(c *cache.PayloadIDCache) Option {
 	return func(s *Service) error {

beacon-chain/blockchain/receive_block.go

@@ -39,6 +39,7 @@ var epochsSinceFinalityExpandCache = primitives.Epoch(4)
 // BlockReceiver interface defines the methods of chain service for receiving and processing new blocks.
 type BlockReceiver interface {
 	ReceiveBlock(ctx context.Context, block interfaces.ReadOnlySignedBeaconBlock, blockRoot [32]byte, avs das.AvailabilityStore) error
+	ReceiveExecutionPayloadEnvelope(ctx context.Context, env interfaces.ROExecutionPayloadEnvelope, avs das.AvailabilityStore) error
 	ReceiveBlockBatch(ctx context.Context, blocks []blocks.ROBlock, avs das.AvailabilityStore) error
 	HasBlock(ctx context.Context, root [32]byte) bool
 	RecentBlockSlot(root [32]byte) (primitives.Slot, error)

beacon-chain/blockchain/receive_execution_payload_envelope.go

@@ -25,10 +25,7 @@ import (
 //  3. Save latest head info
 func (s *Service) ReceiveExecutionPayloadEnvelope(ctx context.Context, envelope interfaces.ROExecutionPayloadEnvelope, _ das.AvailabilityStore) error {
 	receivedTime := time.Now()
-	root, err := envelope.BeaconBlockRoot()
-	if err != nil {
-		return errors.Wrap(err, "could not get beacon block root")
-	}
+	root := envelope.BeaconBlockRoot()
 	s.payloadBeingSynced.set(root)
 	defer s.payloadBeingSynced.unset(root)
 
@@ -81,22 +78,14 @@ func (s *Service) notifyNewEnvelope(ctx context.Context, envelope interfaces.ROE
 		return false, errors.Wrap(err, "could not get execution payload")
 	}
 
-	var lastValidHash []byte
-	var versionedHashes []common.Hash
-	versionedHashes, err = envelope.VersionedHashes()
-	if err != nil {
-		return false, errors.Wrap(err, "could not get versioned hashes to feed the engine")
-	}
-	root, err := envelope.BeaconBlockRoot()
-	if err != nil {
-		return false, errors.Wrap(err, "could not get beacon block root")
-	}
+	versionedHashes := envelope.VersionedHashes()
+	root := envelope.BeaconBlockRoot()
 	parentRoot, err := s.ParentRoot(root)
 	if err != nil {
 		return false, errors.Wrap(err, "could not get parent block root")
 	}
 	pr := common.Hash(parentRoot)
-	lastValidHash, err = s.cfg.ExecutionEngineCaller.NewPayload(ctx, payload, versionedHashes, &pr)
+	lastValidHash, err := s.cfg.ExecutionEngineCaller.NewPayload(ctx, payload, versionedHashes, &pr)
 	switch {
 	case err == nil:
 		newPayloadValidNodeCount.Inc()
@@ -124,10 +113,7 @@ func (s *Service) validateExecutionOnEnvelope(ctx context.Context, e interfaces.
 	if err == nil {
 		return isValidPayload, nil
 	}
-	blockRoot, rootErr := e.BeaconBlockRoot()
-	if rootErr != nil {
-		return false, errors.Wrap(rootErr, "could not get beacon block root")
-	}
+	blockRoot := e.BeaconBlockRoot()
 	parentRoot, rootErr := s.ParentRoot(blockRoot)
 	if rootErr != nil {
 		return false, errors.Wrap(rootErr, "could not get parent block root")
@@ -143,10 +129,7 @@ func (s *Service) getPayloadEnvelopePrestate(ctx context.Context, e interfaces.R
 	defer span.End()
 
 	// Verify incoming payload has a valid pre state.
-	root, err := e.BeaconBlockRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get beacon block root")
-	}
+	root := e.BeaconBlockRoot()
 	// Verify the referred block is known to forkchoice
 	if !s.InForkchoice(root) {
 		return nil, errors.New("Cannot import execution payload envelope for unknown block")

beacon-chain/blockchain/receive_execution_payload_envelope_test.go

@@ -7,10 +7,11 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/das"
 	mockExecution "github.com/prysmaticlabs/prysm/v5/beacon-chain/execution/testing"
 	forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/epbs"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
 	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	"github.com/prysmaticlabs/prysm/v5/testing/util"
+	"github.com/prysmaticlabs/prysm/v5/testing/util/random"
 )
 
 func Test_getPayloadEnvelopePrestate(t *testing.T) {
@@ -21,11 +22,9 @@ func Test_getPayloadEnvelopePrestate(t *testing.T) {
 	require.NoError(t, service.saveGenesisData(ctx, gs))
 	require.NoError(t, fcs.UpdateFinalizedCheckpoint(&forkchoicetypes.Checkpoint{Root: service.originBlockRoot}))
 
-	p := &enginev1.ExecutionPayloadEnvelope{
-		Payload:         &enginev1.ExecutionPayloadElectra{},
-		BeaconBlockRoot: service.originBlockRoot[:],
-	}
-	e, err := epbs.WrappedROExecutionPayloadEnvelope(p)
+	p := random.ExecutionPayloadEnvelope(t)
+	p.BeaconBlockRoot = service.originBlockRoot[:]
+	e, err := blocks.WrappedROExecutionPayloadEnvelope(p)
 	require.NoError(t, err)
 
 	_, err = service.getPayloadEnvelopePrestate(ctx, e)
@@ -38,11 +37,9 @@ func Test_notifyNewEnvelope(t *testing.T) {
 	gs, _ := util.DeterministicGenesisStateEpbs(t, 32)
 	require.NoError(t, service.saveGenesisData(ctx, gs))
 	require.NoError(t, fcs.UpdateFinalizedCheckpoint(&forkchoicetypes.Checkpoint{Root: service.originBlockRoot}))
-	p := &enginev1.ExecutionPayloadEnvelope{
-		Payload:         &enginev1.ExecutionPayloadElectra{},
-		BeaconBlockRoot: service.originBlockRoot[:],
-	}
-	e, err := epbs.WrappedROExecutionPayloadEnvelope(p)
+	p := random.ExecutionPayloadEnvelope(t)
+	p.BeaconBlockRoot = service.originBlockRoot[:]
+	e, err := blocks.WrappedROExecutionPayloadEnvelope(p)
 	require.NoError(t, err)
 	engine := &mockExecution.EngineClient{}
 	service.cfg.ExecutionEngineCaller = engine
@@ -57,11 +54,9 @@ func Test_validateExecutionOnEnvelope(t *testing.T) {
 	gs, _ := util.DeterministicGenesisStateEpbs(t, 32)
 	require.NoError(t, service.saveGenesisData(ctx, gs))
 	require.NoError(t, fcs.UpdateFinalizedCheckpoint(&forkchoicetypes.Checkpoint{Root: service.originBlockRoot}))
-	p := &enginev1.ExecutionPayloadEnvelope{
-		Payload:         &enginev1.ExecutionPayloadElectra{},
-		BeaconBlockRoot: service.originBlockRoot[:],
-	}
-	e, err := epbs.WrappedROExecutionPayloadEnvelope(p)
+	p := random.ExecutionPayloadEnvelope(t)
+	p.BeaconBlockRoot = service.originBlockRoot[:]
+	e, err := blocks.WrappedROExecutionPayloadEnvelope(p)
 	require.NoError(t, err)
 	engine := &mockExecution.EngineClient{}
 	service.cfg.ExecutionEngineCaller = engine
@@ -86,7 +81,7 @@ func Test_ReceiveExecutionPayloadEnvelope(t *testing.T) {
 		BlobKzgCommitments: make([][]byte, 0),
 		StateRoot:          make([]byte, 32),
 	}
-	e, err := epbs.WrappedROExecutionPayloadEnvelope(p)
+	e, err := blocks.WrappedROExecutionPayloadEnvelope(p)
 	require.NoError(t, err)
 	das := &das.MockAvailabilityStore{}
 

beacon-chain/blockchain/service.go

@@ -77,6 +77,7 @@ type config struct {
 	BeaconDB                db.HeadAccessDatabase
 	DepositCache            cache.DepositCache
 	PayloadAttestationCache *cache.PayloadAttestationCache
+	PayloadEnvelopeCache    *sync.Map
 	PayloadIDCache          *cache.PayloadIDCache
 	TrackedValidatorsCache  *cache.TrackedValidatorsCache
 	AttPool                 attestations.Pool

beacon-chain/blockchain/testing/BUILD.bazel

@@ -3,7 +3,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     testonly = True,
-    srcs = ["mock.go"],
+    srcs = [
+        "mock.go",
+        "mock_epbs.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/v5/beacon-chain/blockchain/testing",
     visibility = [
         "//beacon-chain:__subpackages__",

beacon-chain/blockchain/testing/mock.go

@@ -54,6 +54,7 @@ type ChainService struct {
 	DB                          db.Database
 	State                       state.BeaconState
 	Block                       interfaces.ReadOnlySignedBeaconBlock
+	ExecutionPayloadEnvelope    interfaces.ROExecutionPayloadEnvelope
 	VerifyBlkDescendantErr      error
 	stateNotifier               statefeed.Notifier
 	BlocksReceived              []interfaces.ReadOnlySignedBeaconBlock
@@ -68,6 +69,7 @@ type ChainService struct {
 	Genesis                     time.Time
 	ForkChoiceStore             forkchoice.ForkChoicer
 	ReceiveBlockMockErr         error
+	ReceiveEnvelopeMockErr      error
 	OptimisticCheckRootReceived [32]byte
 	FinalizedRoots              map[[32]byte]bool
 	OptimisticRoots             map[[32]byte]bool

beacon-chain/blockchain/testing/mock_epbs.go

@@ -0,0 +1,25 @@
+package testing
+
+import (
+	"context"
+
+	"github.com/prysmaticlabs/prysm/v5/beacon-chain/das"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
+)
+
+// ReceiveExecutionPayloadEnvelope mocks the  method in chain service.
+func (s *ChainService) ReceiveExecutionPayloadEnvelope(ctx context.Context, env interfaces.ROExecutionPayloadEnvelope, _ das.AvailabilityStore) error {
+	if s.ReceiveBlockMockErr != nil {
+		return s.ReceiveBlockMockErr
+	}
+	if s.State == nil {
+		return ErrNilState
+	}
+	if s.State.Slot() == env.Slot() {
+		if err := s.State.SetLatestFullSlot(s.State.Slot()); err != nil {
+			return err
+		}
+	}
+	s.ExecutionPayloadEnvelope = env
+	return nil
+}

beacon-chain/core/blocks/BUILD.bazel

@@ -90,7 +90,6 @@ go_test(
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/blocks:go_default_library",
-        "//consensus-types/epbs:go_default_library",
         "//consensus-types/interfaces:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//container/trie:go_default_library",
@@ -108,6 +107,7 @@ go_test(
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",
+        "//testing/util/random:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_google_gofuzz//:go_default_library",
         "@com_github_prysmaticlabs_go_bitfield//:go_default_library",

beacon-chain/core/blocks/payload.go

@@ -244,10 +244,11 @@ func GetBlockPayloadHash(blk interfaces.ReadOnlyBeaconBlock) ([32]byte, error) {
 		if err != nil {
 			return payloadHash, err
 		}
-		if header.Message == nil {
-			return payloadHash, errors.New("nil execution header")
+		payload, err := header.Header()
+		if err != nil {
+			return payloadHash, err
 		}
-		return [32]byte(header.Message.BlockHash), nil
+		return payload.BlockHash(), nil
 	}
 	if blk.Version() >= version.Bellatrix {
 		payload, err := blk.Body().Execution()
@@ -267,10 +268,11 @@ func GetBlockParentHash(blk interfaces.ReadOnlyBeaconBlock) ([32]byte, error) {
 		if err != nil {
 			return parentHash, err
 		}
-		if header.Message == nil {
-			return parentHash, errors.New("nil execution header")
+		payload, err := header.Header()
+		if err != nil {
+			return parentHash, err
 		}
-		return [32]byte(header.Message.ParentBlockHash), nil
+		return payload.ParentBlockHash(), nil
 	}
 	if blk.Version() >= version.Bellatrix {
 		payload, err := blk.Body().Execution()

beacon-chain/core/blocks/withdrawals_test.go

@@ -12,7 +12,6 @@ import (
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	consensusblocks "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/epbs"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/crypto/bls"
@@ -23,6 +22,7 @@ import (
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 	"github.com/prysmaticlabs/prysm/v5/testing/require"
+	"github.com/prysmaticlabs/prysm/v5/testing/util/random"
 	"github.com/prysmaticlabs/prysm/v5/time/slots"
 )
 
@@ -1513,7 +1513,9 @@ func TestProcessWithdrawalsEPBS(t *testing.T) {
 			}
 			st, err = state_native.InitializeFromProtoUnsafeEpbs(spb)
 			require.NoError(t, err)
-			wp, err := epbs.WrappedROExecutionPayloadEnvelope(&enginev1.ExecutionPayloadEnvelope{Payload: &enginev1.ExecutionPayloadElectra{Withdrawals: test.Args.Withdrawals}})
+			env := random.ExecutionPayloadEnvelope(t)
+			env.Payload.Withdrawals = test.Args.Withdrawals
+			wp, err := consensusblocks.WrappedROExecutionPayloadEnvelope(env)
 			require.NoError(t, err)
 			p, err = wp.Execution()
 			require.NoError(t, err)

beacon-chain/core/epbs/BUILD.bazel

@@ -28,10 +28,11 @@ go_test(
         "//beacon-chain/core/altair:go_default_library",
         "//beacon-chain/state/state-native:go_default_library",
         "//config/params:go_default_library",
-        "//consensus-types/epbs:go_default_library",
+        "//consensus-types/blocks:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",
+        "//testing/util/random:go_default_library",
     ],
 )