[Malleability] Header: move ProposerSigData to new Proposal type

Author: tim-barry

cmd/consensus/main.go

@@ -793,10 +793,15 @@ func main() {
 			if !startupTime.IsZero() {
 				opts = append(opts, consensus.WithStartupTime(startupTime))
 			}
-			finalizedBlock, pending, err := recovery.FindLatest(node.State, node.Storage.Headers)
+			finalizedBlock, pendingOrig, err := recovery.FindLatest(node.State, node.Storage.Headers)
 			if err != nil {
 				return nil, err
 			}
+			// TODO(tim) proposer signature storage
+			pending := make([]*flow.Proposal, 0, len(pendingOrig))
+			for _, p := range pendingOrig {
+				pending = append(pending, &flow.Proposal{Header: p, ProposerSigData: nil})
+			}
 
 			// initialize hotstuff consensus algorithm
 			hot, err = consensus.NewParticipant(

consensus/follower.go

@@ -37,8 +37,15 @@ func NewFollower(log zerolog.Logger,
 		return nil, fmt.Errorf("could not initialize forks: %w", err)
 	}
 
+	// TODO(tim) - proposerSigData storage
+	// Followers don't need proposer signature (and all headers in storage must have been already verified)
+	pendingProposals := make([]*flow.Proposal, 0, len(pending))
+	for _, p := range pending {
+		pendingProposals = append(pendingProposals, &flow.Proposal{Header: p, ProposerSigData: nil})
+	}
+
 	// recover forks internal state (inserts all pending blocks)
-	err = recovery.Recover(log, pending, recovery.ForksState(forks))
+	err = recovery.Recover(log, pendingProposals, recovery.ForksState(forks))
 	if err != nil {
 		return nil, fmt.Errorf("could not recover hotstuff follower state: %w", err)
 	}