init

api/server/structs/block.go

@@ -540,12 +540,6 @@ type PayloadAttestation struct {
 	Signature       string                  `json:"signature"`
 }
 
-type PayloadAttestationMessage struct {
-	ValidatorIndex string                  `json:"validator_index"`
-	Data           *PayloadAttestationData `json:"data"`
-	Signature      string                  `json:"signature"`
-}
-
 type BeaconBlockBodyGloas struct {
 	RandaoReveal              string                        `json:"randao_reveal"`
 	Eth1Data                  *Eth1Data                     `json:"eth1_data"`

api/server/structs/conversions_block.go

@@ -2971,14 +2971,6 @@ func PayloadAttestationDataFromConsensus(d *eth.PayloadAttestationData) *Payload
 	}
 }
 
-func PayloadAttestationMessageFromConsensus(m *eth.PayloadAttestationMessage) *PayloadAttestationMessage {
-	return &PayloadAttestationMessage{
-		ValidatorIndex: fmt.Sprintf("%d", m.ValidatorIndex),
-		Data:           PayloadAttestationDataFromConsensus(m.Data),
-		Signature:      hexutil.Encode(m.Signature),
-	}
-}
-
 func (b *SignedBeaconBlockGloas) ToConsensus() (*eth.SignedBeaconBlockGloas, error) {
 	if b == nil {
 		return nil, errNilValue

api/server/structs/endpoints_events.go

@@ -112,8 +112,3 @@ type LightClientOptimisticUpdateEvent struct {
 	Version string                       `json:"version"`
 	Data    *LightClientOptimisticUpdate `json:"data"`
 }
-
-type ExecutionPayloadAvailableEvent struct {
-	Slot      string `json:"slot"`
-	BlockRoot string `json:"block_root"`
-}

beacon-chain/core/feed/operation/events.go

@@ -46,14 +46,6 @@ const (
 
 	// DataColumnReceived is sent after a data column has been seen after gossip validation rules.
 	DataColumnReceived = 12
-
-	// ExecutionPayloadBidReceived is sent after a signed execution payload bid is received from gossip or API
-	// that passes gossip validation on the execution_payload_bid topic.
-	ExecutionPayloadBidReceived = 13
-
-	// PayloadAttestationMessageReceived is sent after a payload attestation message is received
-	// that passes validation rules of the payload_attestation_message topic.
-	PayloadAttestationMessageReceived = 14
 )
 
 // UnAggregatedAttReceivedData is the data sent with UnaggregatedAttReceived events.
@@ -122,13 +114,3 @@ type DataColumnReceivedData struct {
 	BlockRoot      [32]byte
 	KzgCommitments [][]byte
 }
-
-// ExecutionPayloadBidReceivedData is the data sent with ExecutionPayloadBidReceived events.
-type ExecutionPayloadBidReceivedData struct {
-	SignedBid *ethpb.SignedExecutionPayloadBid
-}
-
-// PayloadAttestationMessageReceivedData is the data sent with PayloadAttestationMessageReceived events.
-type PayloadAttestationMessageReceivedData struct {
-	PayloadAttestationMessage *ethpb.PayloadAttestationMessage
-}

beacon-chain/core/feed/state/events.go

@@ -33,9 +33,6 @@ const (
 	LightClientOptimisticUpdate
 	// PayloadAttributes events are fired upon a missed slot or new head.
 	PayloadAttributes
-	// ExecutionPayloadAvailable is sent when the node has verified that the execution payload
-	// and blobs for a block are available and ready for payload attestation.
-	ExecutionPayloadAvailable
 )
 
 // BlockProcessedData is the data sent with BlockProcessed events.
@@ -75,11 +72,3 @@ type InitializedData struct {
 	// GenesisValidatorsRoot represents state.validators.HashTreeRoot().
 	GenesisValidatorsRoot []byte
 }
-
-// ExecutionPayloadAvailableData is the data sent with ExecutionPayloadAvailable events.
-type ExecutionPayloadAvailableData struct {
-	// Slot is the slot of the block whose execution payload became available.
-	Slot primitives.Slot
-	// BlockRoot is the root of the block whose execution payload became available.
-	BlockRoot [32]byte
-}

beacon-chain/forkchoice/doubly-linked-tree/store.go

@@ -66,16 +66,30 @@ func (s *Store) head(ctx context.Context) ([32]byte, error) {
 // It then updates the new node's parent with the best child and descendant node.
 func (s *Store) insert(ctx context.Context,
 	roblock consensus_blocks.ROBlock,
-	justifiedEpoch, finalizedEpoch primitives.Epoch) (*Node, error) {
+	justifiedEpoch, finalizedEpoch primitives.Epoch,
+) (*PayloadNode, error) {
 	ctx, span := trace.StartSpan(ctx, "doublyLinkedForkchoice.insert")
 	defer span.End()
 
 	root := roblock.Root()
+	// Return if the block has been inserted into Store before.
+	if n, ok := s.nodeByRoot[root]; ok {
+		return n, nil
+	}
+
 	block := roblock.Block()
 	slot := block.Slot()
 	parentRoot := block.ParentRoot()
-	var payloadHash [32]byte
-	if block.Version() >= version.Bellatrix {
+	parent := s.nodeByRoot[parentRoot]
+	var (
+		payloadHash *[32]byte
+		ok          bool
+	)
+	if block.Version() >= version.Gloas {
+		if err := s.getNodeInformation(block, parent, payloadHash); err != nil {
+			return nil, err
+		}
+	} else if block.Version() >= version.Bellatrix {
 		execution, err := block.Body().Execution()
 		if err != nil {
 			return nil, err
@@ -83,12 +97,6 @@ func (s *Store) insert(ctx context.Context,
 		copy(payloadHash[:], execution.BlockHash())
 	}
 
-	// Return if the block has been inserted into Store before.
-	if n, ok := s.nodeByRoot[root]; ok {
-		return n, nil
-	}
-
-	parent := s.nodeByRoot[parentRoot]
 	n := &Node{
 		slot:                     slot,
 		root:                     root,
@@ -97,24 +105,39 @@ func (s *Store) insert(ctx context.Context,
 		unrealizedJustifiedEpoch: justifiedEpoch,
 		finalizedEpoch:           finalizedEpoch,
 		unrealizedFinalizedEpoch: finalizedEpoch,
-		optimistic:               true,
-		payloadHash:              payloadHash,
-		timestamp:                time.Now(),
+		payloadHash:              *payloadHash,
 	}
-
 	// Set the node's target checkpoint
 	if slot%params.BeaconConfig().SlotsPerEpoch == 0 {
 		n.target = n
 	} else if parent != nil {
-		if slots.ToEpoch(slot) == slots.ToEpoch(parent.slot) {
-			n.target = parent.target
+		if slots.ToEpoch(slot) == slots.ToEpoch(parent.node.slot) {
+			n.target = parent.node.target
 		} else {
-			n.target = parent
+			n.target = parent.node
 		}
 	}
+	var ret *PayloadNode
+	// Make the empty node.
+	pn := &PayloadNode{
+		node:       n,
+		optimistic: true,
+		timestamp:  time.Now(),
+	}
+	s.nodeByRoot[root] = pn
+	ret = pn
+	if block.Version() < version.Gloas {
+		// Make also the full node
+		fn := &PayloadNode{
+			node:       n,
+			optimistic: true,
+			timestamp:  time.Now(),
+			full:       true,
+		}
+		ret = fn
+		s.nodeByPayload[*payloadHash] = fn
+	}
 
-	s.nodeByPayload[payloadHash] = n
-	s.nodeByRoot[root] = n
 	if parent == nil {
 		if s.treeRootNode == nil {
 			s.treeRootNode = n
@@ -122,7 +145,7 @@ func (s *Store) insert(ctx context.Context,
 			s.highestReceivedNode = n
 		} else {
 			delete(s.nodeByRoot, root)
-			delete(s.nodeByPayload, payloadHash)
+			delete(s.nodeByPayload, *payloadHash)
 			return nil, errInvalidParentRoot
 		}
 	} else {
@@ -130,7 +153,7 @@ func (s *Store) insert(ctx context.Context,
 		// Apply proposer boost
 		now := time.Now()
 		if now.Before(s.genesisTime) {
-			return n, nil
+			return ret, nil
 		}
 		currentSlot := slots.CurrentSlot(s.genesisTime)
 		sss, err := slots.SinceSlotStart(currentSlot, s.genesisTime, now)
@@ -167,7 +190,7 @@ func (s *Store) insert(ctx context.Context,
 		s.highestReceivedNode = n
 	}
 
-	return n, nil
+	return ret, nil
 }
 
 // pruneFinalizedNodeByRootMap prunes the `nodeByRoot` map

beacon-chain/forkchoice/doubly-linked-tree/types.go

@@ -23,22 +23,22 @@ type ForkChoice struct {
 
 // Store defines the fork choice store which includes block nodes and the last view of checkpoint information.
 type Store struct {
-	justifiedCheckpoint           *forkchoicetypes.Checkpoint            // latest justified epoch in store.
-	unrealizedJustifiedCheckpoint *forkchoicetypes.Checkpoint            // best unrealized justified checkpoint in store.
-	unrealizedFinalizedCheckpoint *forkchoicetypes.Checkpoint            // best unrealized finalized checkpoint in store.
-	prevJustifiedCheckpoint       *forkchoicetypes.Checkpoint            // previous justified checkpoint in store.
-	finalizedCheckpoint           *forkchoicetypes.Checkpoint            // latest finalized epoch in store.
-	proposerBoostRoot             [fieldparams.RootLength]byte           // latest block root that was boosted after being received in a timely manner.
-	previousProposerBoostRoot     [fieldparams.RootLength]byte           // previous block root that was boosted after being received in a timely manner.
-	previousProposerBoostScore    uint64                                 // previous proposer boosted root score.
-	finalizedDependentRoot        [fieldparams.RootLength]byte           // dependent root at finalized checkpoint.
-	committeeWeight               uint64                                 // tracks the total active validator balance divided by the number of slots per Epoch.
-	treeRootNode                  *Node                                  // the root node of the store tree.
-	headNode                      *Node                                  // last head Node
-	nodeByRoot                    map[[fieldparams.RootLength]byte]*Node // nodes indexed by roots.
-	nodeByPayload                 map[[fieldparams.RootLength]byte]*Node // nodes indexed by payload Hash
-	slashedIndices                map[primitives.ValidatorIndex]bool     // the list of equivocating validator indices
-	originRoot                    [fieldparams.RootLength]byte           // The genesis block root
+	justifiedCheckpoint           *forkchoicetypes.Checkpoint                   // latest justified epoch in store.
+	unrealizedJustifiedCheckpoint *forkchoicetypes.Checkpoint                   // best unrealized justified checkpoint in store.
+	unrealizedFinalizedCheckpoint *forkchoicetypes.Checkpoint                   // best unrealized finalized checkpoint in store.
+	prevJustifiedCheckpoint       *forkchoicetypes.Checkpoint                   // previous justified checkpoint in store.
+	finalizedCheckpoint           *forkchoicetypes.Checkpoint                   // latest finalized epoch in store.
+	proposerBoostRoot             [fieldparams.RootLength]byte                  // latest block root that was boosted after being received in a timely manner.
+	previousProposerBoostRoot     [fieldparams.RootLength]byte                  // previous block root that was boosted after being received in a timely manner.
+	previousProposerBoostScore    uint64                                        // previous proposer boosted root score.
+	finalizedDependentRoot        [fieldparams.RootLength]byte                  // dependent root at finalized checkpoint.
+	committeeWeight               uint64                                        // tracks the total active validator balance divided by the number of slots per Epoch.
+	treeRootNode                  *Node                                         // the root node of the store tree.
+	headNode                      *Node                                         // last head Node
+	nodeByRoot                    map[[fieldparams.RootLength]byte]*PayloadNode // nodes indexed by roots.
+	nodeByPayload                 map[[fieldparams.RootLength]byte]*PayloadNode // nodes indexed by payload Hash
+	slashedIndices                map[primitives.ValidatorIndex]bool            // the list of equivocating validator indices
+	originRoot                    [fieldparams.RootLength]byte                  // The genesis block root
 	genesisTime                   time.Time
 	highestReceivedNode           *Node                                      // The highest slot node.
 	receivedBlocksLastEpoch       [fieldparams.SlotsPerEpoch]primitives.Slot // Using `highestReceivedSlot`. The slot of blocks received in the last epoch.
@@ -51,18 +51,26 @@ type Node struct {
 	slot                     primitives.Slot              // slot of the block converted to the node.
 	root                     [fieldparams.RootLength]byte // root of the block converted to the node.
 	payloadHash              [fieldparams.RootLength]byte // payloadHash of the block converted to the node.
-	parent                   *Node                        // parent index of this node.
+	parent                   *PayloadNode                 // parent index of this node.
 	target                   *Node                        // target checkpoint for
-	children                 []*Node                      // the list of direct children of this Node
 	justifiedEpoch           primitives.Epoch             // justifiedEpoch of this node.
 	unrealizedJustifiedEpoch primitives.Epoch             // the epoch that would be justified if the block would be advanced to the next epoch.
 	finalizedEpoch           primitives.Epoch             // finalizedEpoch of this node.
 	unrealizedFinalizedEpoch primitives.Epoch             // the epoch that would be finalized if the block would be advanced to the next epoch.
 	balance                  uint64                       // the balance that voted for this node directly
 	weight                   uint64                       // weight of this node: the total balance including children
-	bestDescendant           *Node                        // bestDescendant node of this node.
-	optimistic               bool                         // whether the block has been fully validated or not
-	timestamp                time.Time                    // The timestamp when the node was inserted.
+}
+
+// PayloadNode defines a full Forkchoice node after the Gloas fork, with the payload status either empty of full
+type PayloadNode struct {
+	node           *Node     // the consensus part of this full forkchoice node
+	children       []*Node   // the list of direct children of this Node
+	bestDescendant *Node     // bestDescendant node of this node.
+	full           bool      // whether this node represents a payload present or not
+	balance        uint64    // the balance that voted for this node directly
+	weight         uint64    // weight of this node: the total balance including children
+	optimistic     bool      // whether the block has been fully validated or not
+	timestamp      time.Time // The timestamp when the node was inserted.
 }
 
 // Vote defines an individual validator's vote.

beacon-chain/rpc/eth/events/events.go

@@ -74,12 +74,6 @@ const (
 	LightClientOptimisticUpdateTopic = "light_client_optimistic_update"
 	// DataColumnTopic represents a data column sidecar event topic
 	DataColumnTopic = "data_column_sidecar"
-	// ExecutionPayloadAvailableTopic represents an event indicating execution payload and blobs are available.
-	ExecutionPayloadAvailableTopic = "execution_payload_available"
-	// ExecutionPayloadBidTopic represents an event for a signed execution payload bid passing gossip validation.
-	ExecutionPayloadBidTopic = "execution_payload_bid"
-	// PayloadAttestationMessageTopic represents an event for a payload attestation message passing validation.
-	PayloadAttestationMessageTopic = "payload_attestation_message"
 )
 
 var (
@@ -114,8 +108,6 @@ var opsFeedEventTopics = map[feed.EventType]string{
 	operation.ProposerSlashingReceived:          ProposerSlashingTopic,
 	operation.BlockGossipReceived:               BlockGossipTopic,
 	operation.DataColumnReceived:                DataColumnTopic,
-	operation.ExecutionPayloadBidReceived:       ExecutionPayloadBidTopic,
-	operation.PayloadAttestationMessageReceived: PayloadAttestationMessageTopic,
 }
 
 var stateFeedEventTopics = map[feed.EventType]string{
@@ -126,7 +118,6 @@ var stateFeedEventTopics = map[feed.EventType]string{
 	statefeed.Reorg:                       ChainReorgTopic,
 	statefeed.BlockProcessed:              BlockTopic,
 	statefeed.PayloadAttributes:           PayloadAttributesTopic,
-	statefeed.ExecutionPayloadAvailable:   ExecutionPayloadAvailableTopic,
 }
 
 var topicsForStateFeed = topicsForFeed(stateFeedEventTopics)
@@ -475,12 +466,6 @@ func topicForEvent(event *feed.Event) string {
 		return PayloadAttributesTopic
 	case *operation.DataColumnReceivedData:
 		return DataColumnTopic
-	case *operation.ExecutionPayloadBidReceivedData:
-		return ExecutionPayloadBidTopic
-	case *operation.PayloadAttestationMessageReceivedData:
-		return PayloadAttestationMessageTopic
-	case *statefeed.ExecutionPayloadAvailableData:
-		return ExecutionPayloadAvailableTopic
 	default:
 		return InvalidTopic
 	}
@@ -653,21 +638,6 @@ func (s *Server) lazyReaderForEvent(ctx context.Context, event *feed.Event, topi
 			}
 			return jsonMarshalReader(eventName, blk)
 		}, nil
-	case *statefeed.ExecutionPayloadAvailableData:
-		return func() io.Reader {
-			return jsonMarshalReader(eventName, &structs.ExecutionPayloadAvailableEvent{
-				Slot:      fmt.Sprintf("%d", v.Slot),
-				BlockRoot: hexutil.Encode(v.BlockRoot[:]),
-			})
-		}, nil
-	case *operation.ExecutionPayloadBidReceivedData:
-		return func() io.Reader {
-			return jsonMarshalReader(eventName, structs.SignedExecutionPayloadBidFromConsensus(v.SignedBid))
-		}, nil
-	case *operation.PayloadAttestationMessageReceivedData:
-		return func() io.Reader {
-			return jsonMarshalReader(eventName, structs.PayloadAttestationMessageFromConsensus(v.PayloadAttestationMessage))
-		}, nil
 	default:
 		return nil, errors.Wrapf(errUnhandledEventData, "event data type %T unsupported", v)
 	}

beacon-chain/rpc/eth/events/events_test.go

@@ -123,8 +123,6 @@ func operationEventsFixtures(t *testing.T) (*topicRequest, []*feed.Event) {
 		ProposerSlashingTopic,
 		BlockGossipTopic,
 		DataColumnTopic,
-		ExecutionPayloadBidTopic,
-		PayloadAttestationMessageTopic,
 	})
 	require.NoError(t, err)
 	ro, err := blocks.NewROBlob(util.HydrateBlobSidecar(&eth.BlobSidecar{}))
@@ -314,42 +312,6 @@ func operationEventsFixtures(t *testing.T) (*topicRequest, []*feed.Event) {
 				KzgCommitments: [][]byte{{'a'}, {'b'}, {'c'}},
 			},
 		},
-		{
-			Type: operation.ExecutionPayloadBidReceived,
-			Data: &operation.ExecutionPayloadBidReceivedData{
-				SignedBid: &eth.SignedExecutionPayloadBid{
-					Message: &eth.ExecutionPayloadBid{
-						ParentBlockHash:        make([]byte, 32),
-						ParentBlockRoot:        make([]byte, 32),
-						BlockHash:              make([]byte, 32),
-						PrevRandao:             make([]byte, 32),
-						FeeRecipient:           make([]byte, 20),
-						GasLimit:               30000000,
-						BuilderIndex:           42,
-						Slot:                   10,
-						Value:                  1000000000,
-						ExecutionPayment:       0,
-						BlobKzgCommitmentsRoot: make([]byte, 32),
-					},
-					Signature: make([]byte, 96),
-				},
-			},
-		},
-		{
-			Type: operation.PayloadAttestationMessageReceived,
-			Data: &operation.PayloadAttestationMessageReceivedData{
-				PayloadAttestationMessage: &eth.PayloadAttestationMessage{
-					ValidatorIndex: 123,
-					Data: &eth.PayloadAttestationData{
-						BeaconBlockRoot:   make([]byte, 32),
-						Slot:              10,
-						PayloadPresent:    true,
-						BlobDataAvailable: true,
-					},
-					Signature: make([]byte, 96),
-				},
-			},
-		},
 	}
 }
 
@@ -431,7 +393,6 @@ func TestStreamEvents_OperationsEvents(t *testing.T) {
 			FinalizedCheckpointTopic,
 			ChainReorgTopic,
 			BlockTopic,
-			ExecutionPayloadAvailableTopic,
 		})
 		require.NoError(t, err)
 		request := topics.testHttpRequest(testSync.ctx, t)
@@ -484,13 +445,6 @@ func TestStreamEvents_OperationsEvents(t *testing.T) {
 					ExecutionOptimistic: false,
 				},
 			},
-			{
-				Type: statefeed.ExecutionPayloadAvailable,
-				Data: &statefeed.ExecutionPayloadAvailableData{
-					Slot:      10,
-					BlockRoot: [32]byte{0x9a},
-				},
-			},
 		}
 
 		go func() {
@@ -767,7 +721,7 @@ func TestStuckReaderScenarios(t *testing.T) {
 
 func wedgedWriterTestCase(t *testing.T, queueDepth func([]*feed.Event) int) {
 	topics, events := operationEventsFixtures(t)
-	require.Equal(t, 14, len(events))
+	require.Equal(t, 12, len(events))
 
 	// set eventFeedDepth to a number lower than the events we intend to send to force the server to drop the reader.
 	stn := mockChain.NewEventFeedWrapper()

changelog/james-prysm_gloas-events.md

@@ -1,3 +0,0 @@
-### Added
-
-- the following events available at gloas `execution_payload_available`, `execution_payload_bid`,and `payload_attestation_message`