Merge branch 'develop' into duties-cleanup

beacon-chain/rpc/eth/validator/handlers_test.go

@@ -1198,14 +1198,14 @@ func TestGetAttestationData(t *testing.T) {
 func TestProduceSyncCommitteeContribution(t *testing.T) {
 	root := bytesutil.PadTo([]byte("0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"), 32)
 	sig := bls.NewAggregateSignature().Marshal()
-	messsage := &ethpbalpha.SyncCommitteeMessage{
+	message := &ethpbalpha.SyncCommitteeMessage{
 		Slot:           1,
 		BlockRoot:      root,
 		ValidatorIndex: 0,
 		Signature:      sig,
 	}
 	syncCommitteePool := synccommittee.NewStore()
-	require.NoError(t, syncCommitteePool.SaveSyncCommitteeMessage(messsage))
+	require.NoError(t, syncCommitteePool.SaveSyncCommitteeMessage(message))
 	server := Server{
 		CoreService: &core.Service{
 			HeadFetcher: &mockChain.ChainService{

beacon-chain/verification/blob.go

@@ -247,7 +247,7 @@ func (bv *ROBlobVerifier) SidecarParentSlotLower() (err error) {
 // -- i.e. get_checkpoint_block(store, block_header.parent_root, store.finalized_checkpoint.epoch) == store.finalized_checkpoint.root.
 func (bv *ROBlobVerifier) SidecarDescendsFromFinalized() (err error) {
 	defer bv.recordResult(RequireSidecarDescendsFromFinalized, &err)
-	if !bv.fc.IsCanonical(bv.blob.ParentRoot()) {
+	if !bv.fc.HasNode(bv.blob.ParentRoot()) {
 		return ErrSidecarNotFinalizedDescendent
 	}
 	return nil

beacon-chain/verification/blob_test.go

@@ -358,7 +358,7 @@ func TestSidecarDescendsFromFinalized(t *testing.T) {
 	_, blobs := util.GenerateTestDenebBlockWithSidecar(t, [32]byte{}, 1, 1)
 	b := blobs[0]
 	t.Run("not canonical", func(t *testing.T) {
-		ini := Initializer{shared: &sharedResources{fc: &mockForkchoicer{IsCanonicalCB: func(r [32]byte) bool {
+		ini := Initializer{shared: &sharedResources{fc: &mockForkchoicer{HasNodeCB: func(r [32]byte) bool {
 			if b.ParentRoot() != r {
 				t.Error("forkchoice.Slot called with unexpected parent root")
 			}
@@ -369,8 +369,8 @@ func TestSidecarDescendsFromFinalized(t *testing.T) {
 		require.Equal(t, true, v.results.executed(RequireSidecarDescendsFromFinalized))
 		require.NotNil(t, v.results.result(RequireSidecarDescendsFromFinalized))
 	})
-	t.Run("not canonical", func(t *testing.T) {
-		ini := Initializer{shared: &sharedResources{fc: &mockForkchoicer{IsCanonicalCB: func(r [32]byte) bool {
+	t.Run("canonical", func(t *testing.T) {
+		ini := Initializer{shared: &sharedResources{fc: &mockForkchoicer{HasNodeCB: func(r [32]byte) bool {
 			if b.ParentRoot() != r {
 				t.Error("forkchoice.Slot called with unexpected parent root")
 			}

config/params/testnet_sepolia_config.go

@@ -1,8 +1,6 @@
 package params
 
 import (
-	"math"
-
 	eth1Params "github.com/ethereum/go-ethereum/params"
 )
 
@@ -37,7 +35,7 @@ func SepoliaConfig() *BeaconChainConfig {
 	cfg.BellatrixForkVersion = []byte{0x90, 0x00, 0x00, 0x71}
 	cfg.CapellaForkEpoch = 56832
 	cfg.CapellaForkVersion = []byte{0x90, 0x00, 0x00, 0x72}
-	cfg.DenebForkEpoch = math.MaxUint64
+	cfg.DenebForkEpoch = 132608
 	cfg.DenebForkVersion = []byte{0x90, 0x00, 0x00, 0x73}
 	cfg.TerminalTotalDifficulty = "17000000000000000"
 	cfg.DepositContractAddress = "0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D"

consensus-types/blocks/roblob.go

@@ -68,7 +68,7 @@ func (b *ROBlob) ProposerIndex() primitives.ValidatorIndex {
 	return b.SignedBlockHeader.Header.ProposerIndex
 }
 
-// BlockRootSlice returns the block root as a byte slice. This is often more conveninent/concise
+// BlockRootSlice returns the block root as a byte slice. This is often more convenient/concise
 // than setting a tmp var to BlockRoot(), just so that it can be sliced.
 func (b *ROBlob) BlockRootSlice() []byte {
 	return b.root[:]

testing/endtoend/components/lighthouse_beacon.go

@@ -183,7 +183,6 @@ func (node *LighthouseBeaconNode) Start(ctx context.Context) error {
 		fmt.Sprintf("--port=%d", e2e.TestParams.Ports.LighthouseBeaconNodeP2PPort+index*2),         // multiply by 2 because LH adds 1 for quic4 port
 		fmt.Sprintf("--http-port=%d", e2e.TestParams.Ports.LighthouseBeaconNodeHTTPPort+index),
 		fmt.Sprintf("--target-peers=%d", 10),
-		fmt.Sprintf("--eth1-endpoints=http://127.0.0.1:%d", e2e.TestParams.Ports.Eth1RPCPort+prysmNodeCount+index),
 		fmt.Sprintf("--execution-endpoint=http://127.0.0.1:%d", e2e.TestParams.Ports.Eth1ProxyPort+prysmNodeCount+index),
 		fmt.Sprintf("--jwt-secrets=%s", jwtPath),
 		fmt.Sprintf("--boot-nodes=%s", node.enr),
@@ -193,7 +192,6 @@ func (node *LighthouseBeaconNode) Start(ctx context.Context) error {
 		"--http-allow-sync-stalled",
 		"--enable-private-discovery",
 		"--debug-level=debug",
-		"--merge",
 		"--suggested-fee-recipient=0x878705ba3f8bc32fcf7f4caa1a35e72af65cf766",
 	}
 	if node.config.UseFixedPeerIDs {

testing/util/wait_timeout.go

@@ -36,7 +36,7 @@ func NewWaiter() *Waiter {
 }
 
 // Done is used with RequireDoneAfter and RequireDoneBefore to make assertions
-// that certain test code is reached before a timeout or context cancelation.
+// that certain test code is reached before a timeout or context cancellation.
 func (w *Waiter) Done() {
 	close(w.c)
 }

tools/pcli/main.go

@@ -242,7 +242,7 @@ func main() {
 					blkRoot,
 					preStateRoot,
 				)
-				postState, err := transition.ExecuteStateTransition(context.Background(), stateObj, block)
+				postState, err := debugStateTransition(context.Background(), stateObj, block)
 				if err != nil {
 					log.Fatal(err)
 				}
@@ -355,3 +355,32 @@ func benchmarkHash(sszPath string, sszType string) {
 		log.Fatal("Invalid type")
 	}
 }
+
+func debugStateTransition(
+	ctx context.Context,
+	st state.BeaconState,
+	signed interfaces.ReadOnlySignedBeaconBlock,
+) (state.BeaconState, error) {
+	var err error
+
+	parentRoot := signed.Block().ParentRoot()
+	st, err = transition.ProcessSlotsUsingNextSlotCache(ctx, st, parentRoot[:], signed.Block().Slot())
+	if err != nil {
+		return st, errors.Wrap(err, "could not process slots")
+	}
+
+	// Execute per block transition.
+	set, st, err := transition.ProcessBlockNoVerifyAnySig(ctx, st, signed)
+	if err != nil {
+		return st, errors.Wrap(err, "could not process block")
+	}
+	var valid bool
+	valid, err = set.VerifyVerbosely()
+	if err != nil {
+		return st, errors.Wrap(err, "could not batch verify signature")
+	}
+	if !valid {
+		return st, errors.New("signature in block failed to verify")
+	}
+	return st, nil
+}