payload attribute and withdrawal fixes

prysmaticlabs · Nov 7, 2024 · 8ac2e61 · 8ac2e61
1 parent ce0130a
commit 8ac2e61
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/beacon-chain/blockchain/execution_engine_epbs.go b/beacon-chain/blockchain/execution_engine_epbs.go
@@ -30,7 +30,7 @@ func (s *Service) notifyForkchoiceUpdateEPBS(ctx context.Context, blockhash [32]
 		FinalizedBlockHash: finalizedHash[:],
 	}
 	if attributes == nil {
-		attributes = payloadattribute.EmptyWithVersion(version.Electra)
+		attributes = payloadattribute.EmptyWithVersion(version.Deneb)
 	}
 	payloadID, lastValidHash, err := s.cfg.ExecutionEngineCaller.ForkchoiceUpdated(ctx, fcs, attributes)
 	if err != nil {

diff --git a/beacon-chain/blockchain/log.go b/beacon-chain/blockchain/log.go
@@ -54,10 +54,10 @@ func logStateTransitionData(b interfaces.ReadOnlyBeaconBlock) error {
 		if err != nil {
 			return err
 		}
-		log = log.WithFields(logrus.Fields{"payloadHash": header.BlockHash(),
+		log = log.WithFields(logrus.Fields{"payloadHash": fmt.Sprintf("%#x", header.BlockHash()),
 			"builderIndex":           header.BuilderIndex(),
 			"value":                  header.Value(),
-			"blobKzgCommitmentsRoot": header.BlobKzgCommitmentsRoot(),
+			"blobKzgCommitmentsRoot": fmt.Sprintf("%#x", header.BlobKzgCommitmentsRoot()),
 		})
 	} else {
 		if b.Version() >= version.Bellatrix {

diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go
@@ -102,6 +102,13 @@ func (s *Service) postBlockProcess(cfg *postBlockProcessConfig) error {
 		return nil
 	}
 	if cfg.roblock.Version() >= version.EPBS {
+		if err := s.saveHead(ctx, cfg.headRoot, cfg.roblock, cfg.postState); err != nil {
+			log.WithError(err).Error("could not save head")
+		}
+		if err := s.pruneAttsFromPool(cfg.roblock); err != nil {
+			log.WithError(err).Error("could not prune attestations from pool")
+		}
+
 		// update the NSC and handle epoch boundaries here since we do
 		// not send FCU at all
 		return s.updateCachesPostBlockProcessing(cfg)

diff --git a/beacon-chain/core/blocks/withdrawals.go b/beacon-chain/core/blocks/withdrawals.go
@@ -239,7 +239,7 @@ func ProcessWithdrawals(st state.BeaconState, executionData interfaces.Execution
 		}
 
 		if !IsParentBlockFull {
-			return nil, nil
+			return st, nil
 		}
 	}
 

diff --git a/beacon-chain/core/epbs/execution_payload_header.go b/beacon-chain/core/epbs/execution_payload_header.go
@@ -16,7 +16,6 @@ func ValidatePayloadHeaderSignature(st state.ReadOnlyBeaconState, sh interfaces.
 	if err != nil {
 		return err
 	}
-
 	pubkey := st.PubkeyAtIndex(h.BuilderIndex())
 	pub, err := bls.PublicKeyFromBytes(pubkey[:])
 	if err != nil {

diff --git a/consensus-types/payload-attribute/types.go b/consensus-types/payload-attribute/types.go
@@ -45,7 +45,7 @@ func New(i interface{}) (Attributer, error) {
 func EmptyWithVersion(ver int) Attributer {
 	if ver == version.EPBS {
 		return &data{
-			version: version.Electra,
+			version: version.Deneb,
 		}
 	}
 	return &data{
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		if !IsParentBlockFull {
-    			return nil, nil
+    			return st, nil
     		}
     	}
@@ Expand Down @@