ammendments from commnets

tac0turtle · tac0turtle · commit 7b4011c32c36 · 2026-04-27T09:39:17.000+02:00
diff --git a/block/internal/common/replay.go b/block/internal/common/replay.go
@@ -150,14 +150,19 @@ func (s *Replayer) replayBlock(ctx context.Context, height uint64) error {
 	// Get the previous state
 	var prevState types.State
 	if height == s.genesis.InitialHeight {
-		// For the first block, use genesis state.
+		// For the first block, use genesis state. Mirror Syncer.initializeState():
+		// prefer the execution layer's view of the next proposer, fall back to genesis.
+		nextProposer := append([]byte(nil), s.genesis.ProposerAddress...)
+		if info, infoErr := s.exec.GetExecutionInfo(ctx); infoErr == nil && len(info.NextProposerAddress) > 0 {
+			nextProposer = append([]byte(nil), info.NextProposerAddress...)
+		}
 		prevState = types.State{
 			ChainID:             s.genesis.ChainID,
 			InitialHeight:       s.genesis.InitialHeight,
 			LastBlockHeight:     s.genesis.InitialHeight - 1,
 			LastBlockTime:       s.genesis.StartTime,
 			AppHash:             header.AppHash, // Genesis app hash (input to first block execution)
-			NextProposerAddress: append([]byte(nil), s.genesis.ProposerAddress...),
+			NextProposerAddress: nextProposer,
 		}
 	} else {
 		// GetStateAtHeight(height-1) returns the state AFTER block height-1 was executed,
diff --git a/block/internal/submitting/da_submitter.go b/block/internal/submitting/da_submitter.go
@@ -425,7 +425,7 @@ func (s *DASubmitter) setCachedEnvelope(height uint64, envelope []byte) {
 }
 
 // SubmitData submits pending data to DA layer
-func (s *DASubmitter) SubmitData(ctx context.Context, unsignedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {
+func (s *DASubmitter) SubmitData(ctx context.Context, unsignedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {
 	if len(unsignedDataList) == 0 {
 		return nil
 	}
@@ -435,7 +435,7 @@ func (s *DASubmitter) SubmitData(ctx context.Context, unsignedDataList []*types.
 	}
 
 	// Sign the data (cache returns unsigned SignedData structs)
-	signedDataList, signedDataListBz, err := s.signData(ctx, unsignedDataList, marshalledData, signer, genesis)
+	signedDataList, signedDataListBz, err := s.signData(ctx, unsignedDataList, marshalledData, signer)
 	if err != nil {
 		return fmt.Errorf("failed to sign data: %w", err)
 	}
@@ -469,7 +469,7 @@ func (s *DASubmitter) SubmitData(ctx context.Context, unsignedDataList []*types.
 }
 
 // signData signs unsigned SignedData structs returned from cache
-func (s *DASubmitter) signData(ctx context.Context, unsignedDataList []*types.SignedData, unsignedDataListBz [][]byte, signer signer.Signer, _ genesis.Genesis) ([]*types.SignedData, [][]byte, error) {
+func (s *DASubmitter) signData(ctx context.Context, unsignedDataList []*types.SignedData, unsignedDataListBz [][]byte, signer signer.Signer) ([]*types.SignedData, [][]byte, error) {
 	if signer == nil {
 		return nil, nil, fmt.Errorf("signer is nil")
 	}
diff --git a/block/internal/submitting/da_submitter_integration_test.go b/block/internal/submitting/da_submitter_integration_test.go
@@ -105,7 +105,7 @@ func TestDASubmitter_SubmitHeadersAndData_MarksInclusionAndUpdatesLastSubmitted(
 
 	dataList, marshalledData, err := cm.GetPendingData(context.Background())
 	require.NoError(t, err)
-	require.NoError(t, daSubmitter.SubmitData(context.Background(), dataList, marshalledData, cm, n, gen))
+	require.NoError(t, daSubmitter.SubmitData(context.Background(), dataList, marshalledData, cm, n))
 
 	// After submission, inclusion markers should be set
 	_, ok := cm.GetHeaderDAIncludedByHeight(1)
diff --git a/block/internal/submitting/da_submitter_test.go b/block/internal/submitting/da_submitter_test.go
@@ -333,7 +333,7 @@ func TestDASubmitter_SubmitData_Success(t *testing.T) {
 	// Get data from cache and submit
 	signedDataList, marshalledData, err := cm.GetPendingData(ctx)
 	require.NoError(t, err)
-	err = submitter.SubmitData(ctx, signedDataList, marshalledData, cm, signer, gen)
+	err = submitter.SubmitData(ctx, signedDataList, marshalledData, cm, signer)
 	require.NoError(t, err)
 
 	// Verify data is marked as DA included
@@ -387,7 +387,7 @@ func TestDASubmitter_SubmitData_SkipsEmptyData(t *testing.T) {
 	// Get data from cache and submit
 	signedDataList, marshalledData, err := cm.GetPendingData(ctx)
 	require.NoError(t, err)
-	err = submitter.SubmitData(ctx, signedDataList, marshalledData, cm, signer, gen)
+	err = submitter.SubmitData(ctx, signedDataList, marshalledData, cm, signer)
 	require.NoError(t, err)
 	mockDA.AssertNotCalled(t, "Submit", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything)
 
@@ -397,7 +397,7 @@ func TestDASubmitter_SubmitData_SkipsEmptyData(t *testing.T) {
 }
 
 func TestDASubmitter_SubmitData_NoPendingData(t *testing.T) {
-	submitter, _, cm, mockDA, gen := setupDASubmitterTest(t)
+	submitter, _, cm, mockDA, _ := setupDASubmitterTest(t)
 	ctx := context.Background()
 
 	// Create test signer
@@ -406,7 +406,7 @@ func TestDASubmitter_SubmitData_NoPendingData(t *testing.T) {
 	// Get data from cache (should be empty) and submit
 	dataList, marshalledData, err := cm.GetPendingData(ctx)
 	require.NoError(t, err)
-	err = submitter.SubmitData(ctx, dataList, marshalledData, cm, signer, gen)
+	err = submitter.SubmitData(ctx, dataList, marshalledData, cm, signer)
 	require.NoError(t, err) // Should succeed with no action
 	mockDA.AssertNotCalled(t, "Submit", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything)
 }
@@ -447,7 +447,7 @@ func TestDASubmitter_SubmitData_NilSigner(t *testing.T) {
 	// Get data from cache and submit with nil signer - should fail
 	signedDataList, marshalledData, err := cm.GetPendingData(ctx)
 	require.NoError(t, err)
-	err = submitter.SubmitData(ctx, signedDataList, marshalledData, cm, nil, gen)
+	err = submitter.SubmitData(ctx, signedDataList, marshalledData, cm, nil)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "signer is nil")
 	mockDA.AssertNotCalled(t, "Submit", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything)
@@ -503,7 +503,7 @@ func TestDASubmitter_SignData(t *testing.T) {
 	}
 
 	// Create signed data
-	resultData, resultDataBz, err := submitter.signData(t.Context(), dataList, dataListBz, signer, gen)
+	resultData, resultDataBz, err := submitter.signData(t.Context(), dataList, dataListBz, signer)
 	require.NoError(t, err)
 
 	// Should have 2 items (empty data skipped)
@@ -542,7 +542,7 @@ func TestDASubmitter_SignData_NilSigner(t *testing.T) {
 	}
 
 	// Create signed data with nil signer - should fail
-	_, _, err := submitter.signData(t.Context(), dataList, dataListBz, nil, gen)
+	_, _, err := submitter.signData(t.Context(), dataList, dataListBz, nil)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "signer is nil")
 }
diff --git a/block/internal/submitting/da_submitter_tracing.go b/block/internal/submitting/da_submitter_tracing.go
@@ -9,7 +9,6 @@ import (
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/evstack/ev-node/block/internal/cache"
-	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/signer"
 	"github.com/evstack/ev-node/types"
 )
@@ -63,7 +62,7 @@ func (t *tracedDASubmitter) SubmitHeaders(ctx context.Context, headers []*types.
 	return nil
 }
 
-func (t *tracedDASubmitter) SubmitData(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {
+func (t *tracedDASubmitter) SubmitData(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {
 	ctx, span := t.tracer.Start(ctx, "DASubmitter.SubmitData",
 		trace.WithAttributes(
 			attribute.Int("data.count", len(signedDataList)),
@@ -86,7 +85,7 @@ func (t *tracedDASubmitter) SubmitData(ctx context.Context, signedDataList []*ty
 		)
 	}
 
-	err := t.inner.SubmitData(ctx, signedDataList, marshalledData, cache, signer, genesis)
+	err := t.inner.SubmitData(ctx, signedDataList, marshalledData, cache, signer)
 	if err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())
diff --git a/block/internal/submitting/da_submitter_tracing_test.go b/block/internal/submitting/da_submitter_tracing_test.go
@@ -12,15 +12,14 @@ import (
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 
 	"github.com/evstack/ev-node/block/internal/cache"
-	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/signer"
 	"github.com/evstack/ev-node/pkg/telemetry/testutil"
 	"github.com/evstack/ev-node/types"
 )
 
 type mockDASubmitterAPI struct {
 	submitHeadersFn func(ctx context.Context, headers []*types.SignedHeader, marshalledHeaders [][]byte, cache cache.Manager, signer signer.Signer) error
-	submitDataFn    func(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error
+	submitDataFn    func(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error
 }
 
 func (m *mockDASubmitterAPI) SubmitHeaders(ctx context.Context, headers []*types.SignedHeader, marshalledHeaders [][]byte, cache cache.Manager, signer signer.Signer) error {
@@ -30,9 +29,9 @@ func (m *mockDASubmitterAPI) SubmitHeaders(ctx context.Context, headers []*types
 	return nil
 }
 
-func (m *mockDASubmitterAPI) SubmitData(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {
+func (m *mockDASubmitterAPI) SubmitData(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {
 	if m.submitDataFn != nil {
-		return m.submitDataFn(ctx, signedDataList, marshalledData, cache, signer, genesis)
+		return m.submitDataFn(ctx, signedDataList, marshalledData, cache, signer)
 	}
 	return nil
 }
@@ -131,7 +130,7 @@ func TestTracedDASubmitter_SubmitHeaders_Empty(t *testing.T) {
 
 func TestTracedDASubmitter_SubmitData_Success(t *testing.T) {
 	mock := &mockDASubmitterAPI{
-		submitDataFn: func(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {
+		submitDataFn: func(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {
 			return nil
 		},
 	}
@@ -147,7 +146,7 @@ func TestTracedDASubmitter_SubmitData_Success(t *testing.T) {
 		[]byte("data2data2"),
 	}
 
-	err := submitter.SubmitData(ctx, signedDataList, marshalledData, nil, nil, genesis.Genesis{})
+	err := submitter.SubmitData(ctx, signedDataList, marshalledData, nil, nil)
 	require.NoError(t, err)
 
 	spans := sr.Ended()
@@ -166,7 +165,7 @@ func TestTracedDASubmitter_SubmitData_Success(t *testing.T) {
 func TestTracedDASubmitter_SubmitData_Error(t *testing.T) {
 	expectedErr := errors.New("data submission failed")
 	mock := &mockDASubmitterAPI{
-		submitDataFn: func(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {
+		submitDataFn: func(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {
 			return expectedErr
 		},
 	}
@@ -178,7 +177,7 @@ func TestTracedDASubmitter_SubmitData_Error(t *testing.T) {
 	}
 	marshalledData := [][]byte{[]byte("data1")}
 
-	err := submitter.SubmitData(ctx, signedDataList, marshalledData, nil, nil, genesis.Genesis{})
+	err := submitter.SubmitData(ctx, signedDataList, marshalledData, nil, nil)
 	require.Error(t, err)
 	require.Equal(t, expectedErr, err)
 
diff --git a/block/internal/submitting/submitter.go b/block/internal/submitting/submitter.go
@@ -26,7 +26,7 @@ import (
 // DASubmitterAPI defines minimal methods needed by Submitter for DA submissions.
 type DASubmitterAPI interface {
 	SubmitHeaders(ctx context.Context, headers []*types.SignedHeader, marshalledHeaders [][]byte, cache cache.Manager, signer signer.Signer) error
-	SubmitData(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error
+	SubmitData(ctx context.Context, signedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error
 }
 
 // Submitter handles DA submission and inclusion processing for both sync and aggregator nodes
@@ -291,7 +291,7 @@ func (s *Submitter) daSubmissionLoop() {
 								Dur("time_since_last", timeSinceLastSubmit).
 								Msg("batching strategy triggered data submission")
 
-							if err := s.daSubmitter.SubmitData(s.ctx, signedDataList, marshalledData, s.cache, s.signer, s.genesis); err != nil {
+							if err := s.daSubmitter.SubmitData(s.ctx, signedDataList, marshalledData, s.cache, s.signer); err != nil {
 								// Check for unrecoverable errors that indicate a critical issue
 								if errors.Is(err, common.ErrOversizedItem) {
 									s.logger.Error().Err(err).
diff --git a/block/internal/submitting/submitter_test.go b/block/internal/submitting/submitter_test.go
@@ -429,7 +429,7 @@ func (f *fakeDASubmitter) SubmitHeaders(ctx context.Context, _ []*types.SignedHe
 	return nil
 }
 
-func (f *fakeDASubmitter) SubmitData(ctx context.Context, _ []*types.SignedData, _ [][]byte, _ cache.Manager, _ signer.Signer, _ genesis.Genesis) error {
+func (f *fakeDASubmitter) SubmitData(ctx context.Context, _ []*types.SignedData, _ [][]byte, _ cache.Manager, _ signer.Signer) error {
 	select {
 	case f.chData <- struct{}{}:
 	default:
diff --git a/block/internal/syncing/p2p_handler.go b/block/internal/syncing/p2p_handler.go
@@ -81,6 +81,11 @@ func (h *P2PHandler) ProcessHeight(ctx context.Context, height uint64, heightInC
 		}
 		return err
 	}
+	if got := p2pHeader.SignedHeader.Height(); got != height {
+		err := fmt.Errorf("header height mismatch: requested %d, got %d", height, got)
+		h.logger.Warn().Uint64("requested_height", height).Uint64("header_height", got).Err(err).Msg("discarding mismatched header from P2P")
+		return err
+	}
 
 	p2pData, err := h.dataStore.GetByHeight(ctx, height)
 	if err != nil {
@@ -89,6 +94,11 @@ func (h *P2PHandler) ProcessHeight(ctx context.Context, height uint64, heightInC
 		}
 		return err
 	}
+	if got := p2pData.Height(); got != height {
+		err := fmt.Errorf("data height mismatch: requested %d, got %d", height, got)
+		h.logger.Warn().Uint64("requested_height", height).Uint64("data_height", got).Err(err).Msg("discarding mismatched data from P2P")
+		return err
+	}
 	dataCommitment := p2pData.DACommitment()
 	if !bytes.Equal(p2pHeader.DataHash[:], dataCommitment[:]) {
 		err := fmt.Errorf("data hash mismatch: header %x, data %x", p2pHeader.DataHash, dataCommitment)
diff --git a/block/internal/syncing/syncer.go b/block/internal/syncing/syncer.go
@@ -331,6 +331,11 @@ func (s *Syncer) initializeState() error {
 	}
 	if len(state.NextProposerAddress) == 0 {
 		state.NextProposerAddress = s.initialProposerAddress(s.ctx)
+		if state.LastBlockHeight > s.genesis.InitialHeight-1 {
+			s.logger.Warn().
+				Uint64("height", state.LastBlockHeight).
+				Msg("loaded state without NextProposerAddress; repaired from execution/genesis. Verify chain has not rotated proposer before this upgrade")
+		}
 	}
 	if state.DAHeight != 0 && state.DAHeight < s.genesis.DAStartHeight {
 		return fmt.Errorf("DA height (%d) is lower than DA start height (%d)", state.DAHeight, s.genesis.DAStartHeight)
diff --git a/core/execution/execution.go b/core/execution/execution.go
@@ -133,9 +133,12 @@ type ExecutionInfo struct {
 	// For non-gas-based execution layers, this should be 0.
 	MaxGas uint64
 
-	// NextProposerAddress is the proposer address that should sign the next
-	// block from the execution layer's current view. Empty means unchanged or
-	// unavailable, and callers should fall back to their current proposer.
+	// NextProposerAddress is the execution layer's best-effort view of the
+	// proposer address for the next block. It is advisory and is consulted
+	// only at startup/replay seeding when no prior consensus state is
+	// available; the authoritative source for the next proposer is
+	// ExecuteResult.NextProposerAddress. Empty means unchanged/unavailable,
+	// and callers must fall back to the genesis proposer.
 	NextProposerAddress []byte
 }
 
@@ -144,8 +147,11 @@ type ExecuteResult struct {
 	// UpdatedStateRoot is the new state root after executing transactions.
 	UpdatedStateRoot []byte
 
-	// NextProposerAddress is the proposer address selected by execution for the
-	// next block. Empty means the current proposer remains active.
+	// NextProposerAddress is the authoritative proposer address selected by
+	// the execution layer to sign block blockHeight+1 (the block immediately
+	// after the one just executed). An empty value means the current proposer
+	// remains active; execution layers that do not support proposer rotation
+	// MUST leave this field empty.
 	NextProposerAddress []byte
 }
 

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ func (s *DASubmitter) setCachedEnvelope(height uint64, envelope []byte) {`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`// SubmitData submits pending data to DA layer`
`428`		`-func (s DASubmitter) SubmitData(ctx context.Context, unsignedDataList []types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {`
	`428`	`+func (s DASubmitter) SubmitData(ctx context.Context, unsignedDataList []types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {`
`429`	`429`	`if len(unsignedDataList) == 0 {`
`430`	`430`	`return nil`
`431`	`431`	`}`
`@@ -435,7 +435,7 @@ func (s DASubmitter) SubmitData(ctx context.Context, unsignedDataList []types.`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`// Sign the data (cache returns unsigned SignedData structs)`
`438`		`- signedDataList, signedDataListBz, err := s.signData(ctx, unsignedDataList, marshalledData, signer, genesis)`
	`438`	`+ signedDataList, signedDataListBz, err := s.signData(ctx, unsignedDataList, marshalledData, signer)`
`439`	`439`	`if err != nil {`
`440`	`440`	`return fmt.Errorf("failed to sign data: %w", err)`
`441`	`441`	`}`
`@@ -469,7 +469,7 @@ func (s DASubmitter) SubmitData(ctx context.Context, unsignedDataList []types.`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`// signData signs unsigned SignedData structs returned from cache`
`472`		`-func (s DASubmitter) signData(ctx context.Context, unsignedDataList []types.SignedData, unsignedDataListBz [][]byte, signer signer.Signer, _ genesis.Genesis) ([]*types.SignedData, [][]byte, error) {`
	`472`	`+func (s DASubmitter) signData(ctx context.Context, unsignedDataList []types.SignedData, unsignedDataListBz [][]byte, signer signer.Signer) ([]*types.SignedData, [][]byte, error) {`
`473`	`473`	`if signer == nil {`
`474`	`474`	`return nil, nil, fmt.Errorf("signer is nil")`
`475`	`475`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`	`"go.opentelemetry.io/otel/trace"`
`10`	`10`
`11`	`11`	`"github.com/evstack/ev-node/block/internal/cache"`
`12`		`- "github.com/evstack/ev-node/pkg/genesis"`
`13`	`12`	`"github.com/evstack/ev-node/pkg/signer"`
`14`	`13`	`"github.com/evstack/ev-node/types"`
`15`	`14`	`)`
`@@ -63,7 +62,7 @@ func (t tracedDASubmitter) SubmitHeaders(ctx context.Context, headers []types.`
`63`	`62`	`return nil`
`64`	`63`	`}`
`65`	`64`
`66`		`-func (t tracedDASubmitter) SubmitData(ctx context.Context, signedDataList []types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {`
	`65`	`+func (t tracedDASubmitter) SubmitData(ctx context.Context, signedDataList []types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer) error {`
`67`	`66`	`ctx, span := t.tracer.Start(ctx, "DASubmitter.SubmitData",`
`68`	`67`	`trace.WithAttributes(`
`69`	`68`	`attribute.Int("data.count", len(signedDataList)),`
`@@ -86,7 +85,7 @@ func (t tracedDASubmitter) SubmitData(ctx context.Context, signedDataList []ty`
`86`	`85`	`)`
`87`	`86`	`}`
`88`	`87`
`89`		`- err := t.inner.SubmitData(ctx, signedDataList, marshalledData, cache, signer, genesis)`
	`88`	`+ err := t.inner.SubmitData(ctx, signedDataList, marshalledData, cache, signer)`
`90`	`89`	`if err != nil {`
`91`	`90`	`span.RecordError(err)`
`92`	`91`	`span.SetStatus(codes.Error, err.Error())`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ func (f fakeDASubmitter) SubmitHeaders(ctx context.Context, _ []types.SignedHe`
`429`	`429`	`return nil`
`430`	`430`	`}`
`431`	`431`
`432`		`-func (f fakeDASubmitter) SubmitData(ctx context.Context, _ []types.SignedData, _ [][]byte, _ cache.Manager, _ signer.Signer, _ genesis.Genesis) error {`
	`432`	`+func (f fakeDASubmitter) SubmitData(ctx context.Context, _ []types.SignedData, _ [][]byte, _ cache.Manager, _ signer.Signer) error {`
`433`	`433`	`select {`
`434`	`434`	`case f.chData <- struct{}{}:`
`435`	`435`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,11 @@ func (h *P2PHandler) ProcessHeight(ctx context.Context, height uint64, heightInC`
`81`	`81`	`}`
`82`	`82`	`return err`
`83`	`83`	`}`
	`84`	`+ if got := p2pHeader.SignedHeader.Height(); got != height {`
	`85`	`+ err := fmt.Errorf("header height mismatch: requested %d, got %d", height, got)`
	`86`	`+ h.logger.Warn().Uint64("requested_height", height).Uint64("header_height", got).Err(err).Msg("discarding mismatched header from P2P")`
	`87`	`+ return err`
	`88`	`+ }`
`84`	`89`
`85`	`90`	`p2pData, err := h.dataStore.GetByHeight(ctx, height)`
`86`	`91`	`if err != nil {`
`@@ -89,6 +94,11 @@ func (h *P2PHandler) ProcessHeight(ctx context.Context, height uint64, heightInC`
`89`	`94`	`}`
`90`	`95`	`return err`
`91`	`96`	`}`
	`97`	`+ if got := p2pData.Height(); got != height {`
	`98`	`+ err := fmt.Errorf("data height mismatch: requested %d, got %d", height, got)`
	`99`	`+ h.logger.Warn().Uint64("requested_height", height).Uint64("data_height", got).Err(err).Msg("discarding mismatched data from P2P")`
	`100`	`+ return err`
	`101`	`+ }`
`92`	`102`	`dataCommitment := p2pData.DACommitment()`
`93`	`103`	`if !bytes.Equal(p2pHeader.DataHash[:], dataCommitment[:]) {`
`94`	`104`	`err := fmt.Errorf("data hash mismatch: header %x, data %x", p2pHeader.DataHash, dataCommitment)`
Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,11 @@ func (s *Syncer) initializeState() error {`
`331`	`331`	`}`
`332`	`332`	`if len(state.NextProposerAddress) == 0 {`
`333`	`333`	`state.NextProposerAddress = s.initialProposerAddress(s.ctx)`
	`334`	`+ if state.LastBlockHeight > s.genesis.InitialHeight-1 {`
	`335`	`+ s.logger.Warn().`
	`336`	`+ Uint64("height", state.LastBlockHeight).`
	`337`	`+ Msg("loaded state without NextProposerAddress; repaired from execution/genesis. Verify chain has not rotated proposer before this upgrade")`
	`338`	`+ }`
`334`	`339`	`}`
`335`	`340`	`if state.DAHeight != 0 && state.DAHeight < s.genesis.DAStartHeight {`
`336`	`341`	`return fmt.Errorf("DA height (%d) is lower than DA start height (%d)", state.DAHeight, s.genesis.DAStartHeight)`