remove need for pubkey and add some tests

Author: tac0turtle

block/internal/syncing/assert.go

@@ -4,12 +4,14 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/libp2p/go-libp2p/core/crypto"
+
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/types"
 )
 
-func assertExpectedProposer(genesis genesis.Genesis, height uint64, proposerAddr []byte, signer types.Signer) error {
-	if err := genesis.ValidateProposer(height, proposerAddr, signer.PubKey); err != nil {
+func assertExpectedProposer(genesis genesis.Genesis, height uint64, proposerAddr []byte, pubKey crypto.PubKey) error {
+	if err := genesis.ValidateProposer(height, proposerAddr, pubKey); err != nil {
 		return fmt.Errorf("unexpected proposer at height %d: %w", height, err)
 	}
 
@@ -21,7 +23,7 @@ func assertValidSignedData(signedData *types.SignedData, genesis genesis.Genesis
 		return errors.New("empty signed data")
 	}
 
-	if err := assertExpectedProposer(genesis, signedData.Height(), signedData.Signer.Address, signedData.Signer); err != nil {
+	if err := assertExpectedProposer(genesis, signedData.Height(), signedData.Signer.Address, signedData.Signer.PubKey); err != nil {
 		return err
 	}
 

block/internal/syncing/da_retriever.go

@@ -357,7 +357,7 @@ func (r *daRetriever) tryDecodeData(bz []byte, daHeight uint64) *types.Data {
 
 // assertExpectedProposer validates the proposer schedule entry for the header height.
 func (r *daRetriever) assertExpectedProposer(header *types.SignedHeader) error {
-	return assertExpectedProposer(r.genesis, header.Height(), header.ProposerAddress, header.Signer)
+	return assertExpectedProposer(r.genesis, header.Height(), header.ProposerAddress, header.Signer.PubKey)
 }
 
 // assertValidSignedData validates signed data using the configured signature provider

block/internal/syncing/p2p_handler.go

@@ -127,9 +127,5 @@ func (h *P2PHandler) ProcessHeight(ctx context.Context, height uint64, heightInC
 
 // assertExpectedProposer validates the proposer schedule entry for the header height.
 func (h *P2PHandler) assertExpectedProposer(header *types.SignedHeader) error {
-	if err := assertExpectedProposer(h.genesis, header.Height(), header.ProposerAddress, header.Signer); err != nil {
-		return err
-	}
-
-	return nil
+	return assertExpectedProposer(h.genesis, header.Height(), header.ProposerAddress, header.Signer.PubKey)
 }

block/internal/syncing/raft_retriever.go

@@ -125,7 +125,7 @@ func (r *raftRetriever) consumeRaftBlock(ctx context.Context, state *raft.RaftBl
 		r.logger.Debug().Err(err).Msg("invalid header structure")
 		return nil
 	}
-	if err := assertExpectedProposer(r.genesis, header.Height(), header.ProposerAddress, header.Signer); err != nil {
+	if err := assertExpectedProposer(r.genesis, header.Height(), header.ProposerAddress, header.Signer.PubKey); err != nil {
 		r.logger.Debug().Err(err).Msg("unexpected proposer")
 		return nil
 	}

docs/guides/operations/proposer-key-rotation.md

@@ -11,7 +11,7 @@ Use this guide to rotate a sequencer proposer key without restarting the chain.
 
 ## How proposer rotation is stored in genesis
 
-`proposer_address`, `proposer_schedule[].address`, and `proposer_schedule[].pub_key` are base64-encoded strings in JSON.
+`proposer_address` and `proposer_schedule[].address` are base64-encoded strings in JSON.
 
 ```json
 {
@@ -20,13 +20,11 @@ Use this guide to rotate a sequencer proposer key without restarting the chain.
   "proposer_schedule": [
     {
       "start_height": 1,
-      "address": "0FQmA4Hn9dn8m4ZpM4+fV4e8KhkWjI4V2Vt1j9Qm5pA=",
-      "pub_key": "5l6vM0b0GqQYQw4x0cI6q7N2vD1cE+oV6rN5eQ7v6dM="
+      "address": "0FQmA4Hn9dn8m4ZpM4+fV4e8KhkWjI4V2Vt1j9Qm5pA="
     },
     {
       "start_height": 125000,
-      "address": "Y7z5v9mQm4Nw6mD0a2yR9kD2B0qv5iJj1Q1R7gD4B7Q=",
-      "pub_key": "9r5mM4XjKx6h6sJv2Jf6dB5nQ0eU9l8cM1qT2wV3yZQ="
+      "address": "Y7z5v9mQm4Nw6mD0a2yR9kD2B0qv5iJj1Q1R7gD4B7Q="
     }
   ]
 }
@@ -36,7 +34,6 @@ Rules enforced by `ev-node`:
 
 - `proposer_schedule[0].start_height` must equal `initial_height`
 - schedule entries must be strictly increasing by `start_height`
-- every `address` must match its `pub_key`
 - if `proposer_address` is set, it must match the first schedule entry
 
 Keep all earlier schedule entries. Fresh full nodes need them to validate historical blocks.
@@ -53,7 +50,7 @@ INITIAL_HEIGHT="$(jq -r '.initial_height' "$GENESIS")"
 
 ## 2. Get the current and replacement proposer public keys
 
-For a file-based signer, the signer public key is stored in `signer.json` as base64:
+For a file-based signer, the signer public key is stored in `signer.json` as base64. You only put the derived address into genesis, but you still need the public key once to compute that address.
 
 ```bash
 OLD_SIGNER_DIR="$HOME/.evnode/config"
@@ -95,23 +92,19 @@ Create an explicit schedule with the current proposer at `initial_height` and th
 ```bash
 jq \
   --arg old_addr "$OLD_PROPOSER_ADDRESS" \
-  --arg old_pub "$OLD_PROPOSER_PUBKEY" \
   --arg new_addr "$NEW_PROPOSER_ADDRESS" \
-  --arg new_pub "$NEW_PROPOSER_PUBKEY" \
   --argjson initial_height "$INITIAL_HEIGHT" \
   --argjson activation_height "$ACTIVATION_HEIGHT" \
   '
   .proposer_address = $old_addr
   | .proposer_schedule = [
       {
         start_height: $initial_height,
-        address: $old_addr,
-        pub_key: $old_pub
+        address: $old_addr
       },
       {
         start_height: $activation_height,
-        address: $new_addr,
-        pub_key: $new_pub
+        address: $new_addr
       }
     ]
   ' "$GENESIS" > "$GENESIS.tmp" && mv "$GENESIS.tmp" "$GENESIS"
@@ -124,14 +117,12 @@ Append the new entry. Do not replace older entries, and make sure `ACTIVATION_HE
 ```bash
 jq \
   --arg new_addr "$NEW_PROPOSER_ADDRESS" \
-  --arg new_pub "$NEW_PROPOSER_PUBKEY" \
   --argjson activation_height "$ACTIVATION_HEIGHT" \
   '
   .proposer_schedule += [
     {
       start_height: $activation_height,
-      address: $new_addr,
-      pub_key: $new_pub
+      address: $new_addr
     }
   ]
   ' "$GENESIS" > "$GENESIS.tmp" && mv "$GENESIS.tmp" "$GENESIS"

pkg/genesis/genesis.go

@@ -63,14 +63,14 @@ func (g Genesis) Validate() error {
 			return fmt.Errorf("proposer_address cannot be empty when proposer_schedule is unset")
 		}
 	} else {
-		if err := g.ProposerSchedule[0].validate(g.InitialHeight, true); err != nil {
+		if err := g.ProposerSchedule[0].validate(g.InitialHeight); err != nil {
 			return fmt.Errorf("invalid proposer_schedule[0]: %w", err)
 		}
 		if g.ProposerSchedule[0].StartHeight != g.InitialHeight {
 			return fmt.Errorf("proposer_schedule[0].start_height must equal initial_height (%d), got %d", g.InitialHeight, g.ProposerSchedule[0].StartHeight)
 		}
 		for i := 1; i < len(g.ProposerSchedule); i++ {
-			if err := g.ProposerSchedule[i].validate(g.InitialHeight, true); err != nil {
+			if err := g.ProposerSchedule[i].validate(g.InitialHeight); err != nil {
 				return fmt.Errorf("invalid proposer_schedule[%d]: %w", i, err)
 			}
 			if g.ProposerSchedule[i].StartHeight <= g.ProposerSchedule[i-1].StartHeight {

pkg/genesis/proposer_schedule.go

@@ -8,7 +8,8 @@ import (
 	"github.com/libp2p/go-libp2p/core/crypto"
 )
 
-// ProposerScheduleEntry declares the proposer key that becomes active at start_height.
+// ProposerScheduleEntry declares the proposer address that becomes active at start_height.
+// PubKey is optional and can be used to pin the exact key material for a schedule entry.
 type ProposerScheduleEntry struct {
 	StartHeight uint64 `json:"start_height"`
 	Address     []byte `json:"address"`
@@ -33,8 +34,8 @@ func NewProposerScheduleEntry(startHeight uint64, pubKey crypto.PubKey) (Propose
 	}, nil
 }
 
-// PublicKey unmarshals the configured proposer public key. Legacy single-proposer
-// configs may omit the pubkey and will return nil, nil here.
+// PublicKey unmarshals the configured proposer public key. Address-only schedule
+// entries may omit the pubkey and will return nil, nil here.
 func (e ProposerScheduleEntry) PublicKey() (crypto.PubKey, error) {
 	if len(e.PubKey) == 0 {
 		return nil, nil
@@ -48,7 +49,7 @@ func (e ProposerScheduleEntry) PublicKey() (crypto.PubKey, error) {
 	return pubKey, nil
 }
 
-func (e ProposerScheduleEntry) validate(initialHeight uint64, requirePubKey bool) error {
+func (e ProposerScheduleEntry) validate(initialHeight uint64) error {
 	if e.StartHeight < initialHeight {
 		return fmt.Errorf("proposer schedule start_height must be >= initial_height (%d), got %d", initialHeight, e.StartHeight)
 	}
@@ -58,9 +59,6 @@ func (e ProposerScheduleEntry) validate(initialHeight uint64, requirePubKey bool
 	}
 
 	if len(e.PubKey) == 0 {
-		if requirePubKey {
-			return fmt.Errorf("proposer schedule pub_key cannot be empty")
-		}
 		return nil
 	}
 
@@ -92,7 +90,7 @@ func (g Genesis) EffectiveProposerSchedule() []ProposerScheduleEntry {
 
 	return []ProposerScheduleEntry{{
 		StartHeight: g.InitialHeight,
-		Address:     cloneBytes(g.ProposerAddress),
+		Address:     bytes.Clone(g.ProposerAddress),
 	}}
 }
 
@@ -104,7 +102,7 @@ func (g Genesis) InitialProposerAddress() []byte {
 		return nil
 	}
 
-	return cloneBytes(entry.Address)
+	return bytes.Clone(entry.Address)
 }
 
 func (g Genesis) normalized() Genesis {
@@ -146,8 +144,8 @@ func (g Genesis) ProposerAtHeight(height uint64) (ProposerScheduleEntry, error)
 
 	return ProposerScheduleEntry{
 		StartHeight: entry.StartHeight,
-		Address:     cloneBytes(entry.Address),
-		PubKey:      cloneBytes(entry.PubKey),
+		Address:     bytes.Clone(entry.Address),
+		PubKey:      bytes.Clone(entry.PubKey),
 	}, nil
 }
 
@@ -183,16 +181,6 @@ func (g Genesis) ValidateProposer(height uint64, address []byte, pubKey crypto.P
 	return nil
 }
 
-func cloneBytes(src []byte) []byte {
-	if src == nil {
-		return nil
-	}
-
-	out := make([]byte, len(src))
-	copy(out, src)
-	return out
-}
-
 func proposerKeyAddress(pubKey crypto.PubKey) []byte {
 	if pubKey == nil {
 		return nil

pkg/genesis/proposer_schedule_test.go

@@ -51,7 +51,7 @@ func TestGenesisProposerAtHeight(t *testing.T) {
 	require.Equal(t, entry2.Address, proposer.Address)
 }
 
-func TestGenesisValidateProposerSchedule(t *testing.T) {
+func TestGenesisValidateProposerScheduleWithPinnedPubKey(t *testing.T) {
 	entry1, pubKey1 := makeProposerScheduleEntry(t, 1)
 	entry2, pubKey2 := makeProposerScheduleEntry(t, 20)
 
@@ -69,6 +69,25 @@ func TestGenesisValidateProposerSchedule(t *testing.T) {
 	require.Error(t, genesis.ValidateProposer(21, entry2.Address, pubKey1))
 }
 
+func TestGenesisValidateAddressOnlyProposerSchedule(t *testing.T) {
+	entry1, pubKey1 := makeProposerScheduleEntry(t, 1)
+	entry2, pubKey2 := makeProposerScheduleEntry(t, 20)
+	entry1.PubKey = nil
+	entry2.PubKey = nil
+
+	genesis := Genesis{
+		ChainID:                "test-chain",
+		StartTime:              time.Now().UTC(),
+		InitialHeight:          1,
+		ProposerSchedule:       []ProposerScheduleEntry{entry1, entry2},
+		DAEpochForcedInclusion: 1,
+	}
+
+	require.NoError(t, genesis.Validate())
+	require.NoError(t, genesis.ValidateProposer(1, entry1.Address, pubKey1))
+	require.NoError(t, genesis.ValidateProposer(21, entry2.Address, pubKey2))
+}
+
 func TestLoadGenesisNormalizesLegacyProposerAddressFromSchedule(t *testing.T) {
 	entry1, _ := makeProposerScheduleEntry(t, 1)
 	entry2, _ := makeProposerScheduleEntry(t, 50)