allow providing votes to generate Cluster Root QCs

Author: tim-barry

cmd/bootstrap/run/cluster_qc.go

@@ -29,6 +29,15 @@ func GenerateClusterRootQC(signers []bootstrap.NodeInfo, allCommitteeMembers flo
 	if err != nil {
 		return nil, err
 	}
+	return GenerateClusterRootQCFromVotes(signers, allCommitteeMembers, clusterBlock, votes)
+}
+
+// GenerateClusterRootQCFromVotes generates a QC from the provided votes based on participant data
+func GenerateClusterRootQCFromVotes(signers []bootstrap.NodeInfo, allCommitteeMembers flow.IdentitySkeletonList, clusterBlock *cluster.Block, votes []*model.Vote) (*flow.QuorumCertificate, error) {
+	if !allCommitteeMembers.Sorted(flow.Canonical[flow.IdentitySkeleton]) {
+		return nil, fmt.Errorf("can't create root cluster QC: committee members are not sorted in canonical order")
+	}
+	clusterRootBlock := model.GenesisBlockFromFlow(clusterBlock.ToHeader())
 
 	// STEP 1.5: patch committee to include dynamic identities. This is a temporary measure until bootstrapping is refactored.
 	// We need a Committee for creating the cluster's root QC and the Committee requires dynamic identities to be instantiated.

cmd/bootstrap/run/epochs.go

@@ -9,16 +9,16 @@ import (
 	"github.com/rs/zerolog"
 	"golang.org/x/exp/slices"
 
-	"github.com/onflow/flow-go/state/protocol/prg"
-
 	"github.com/onflow/flow-go/cmd/util/cmd/common"
+	hotstuff "github.com/onflow/flow-go/consensus/hotstuff/model"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/model/bootstrap"
 	model "github.com/onflow/flow-go/model/bootstrap"
 	"github.com/onflow/flow-go/model/cluster"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/filter"
 	"github.com/onflow/flow-go/state/protocol/inmem"
+	"github.com/onflow/flow-go/state/protocol/prg"
 )
 
 // GenerateRecoverEpochTxArgs generates the required transaction arguments for the `recoverEpoch` transaction.
@@ -303,8 +303,7 @@ func GenerateRecoverTxArgsWithDKG(
 // - nodeInfos: list of NodeInfos (must contain all internal nodes)
 // - clusterBlocks: list of root blocks (one for each cluster)
 // Returns:
-// - flow.AssignmentList: the generated assignment list.
-// - flow.ClusterList: the generate collection cluster list.
+// - The list of quorum certificates for all clusters.
 func ConstructRootQCsForClusters(log zerolog.Logger, clusterList flow.ClusterList, nodeInfos []bootstrap.NodeInfo, clusterBlocks []*cluster.Block) []*flow.QuorumCertificate {
 	if len(clusterBlocks) != len(clusterList) {
 		log.Fatal().Int("len(clusterBlocks)", len(clusterBlocks)).Int("len(clusterList)", len(clusterList)).
@@ -326,6 +325,42 @@ func ConstructRootQCsForClusters(log zerolog.Logger, clusterList flow.ClusterLis
 	return qcs
 }
 
+// ConstructClusterRootQCsFromVotes constructs a root QC for each cluster in the list, based on the provided votes.
+// Args:
+// - log: the logger instance.
+// - clusterList: list of clusters
+// - nodeInfos: list of NodeInfos (must contain all internal nodes)
+// - clusterBlocks: list of root blocks (one for each cluster)
+// - votes: lists of votes for each cluster (one list for each cluster)
+// Returns:
+// - the list of quorum certificates for all clusters
+func ConstructClusterRootQCsFromVotes(log zerolog.Logger, clusterList flow.ClusterList, nodeInfos []bootstrap.NodeInfo, clusterBlocks []*cluster.Block, votes [][]*hotstuff.Vote) []*flow.QuorumCertificate {
+	if len(clusterBlocks) != len(clusterList) {
+		log.Fatal().Int("len(clusterBlocks)", len(clusterBlocks)).Int("len(clusterList)", len(clusterList)).
+			Msg("number of clusters needs to equal number of cluster blocks")
+	}
+	if len(votes) != len(clusterList) {
+		log.Fatal().Int("len(votes)", len(votes)).Int("len(clusterList)", len(clusterList)).
+			Msg("number of groups of votes needs to equal number of clusters")
+	}
+
+	qcs := make([]*flow.QuorumCertificate, len(clusterBlocks))
+	for i, clusterMembers := range clusterList {
+		clusterBlock := clusterBlocks[i]
+		clusterVotes := votes[i]
+		signers := filterClusterSigners(clusterMembers, nodeInfos)
+		log.Info().Msgf("producing QC for cluster (index: %d, size: %d) from %d votes", i, len(clusterMembers), len(votes))
+
+		qc, err := GenerateClusterRootQCFromVotes(signers, clusterMembers, clusterBlock, clusterVotes)
+		if err != nil {
+			log.Fatal().Err(err).Int("cluster index", i).Msg("generating collector cluster root QC failed")
+		}
+		qcs[i] = qc
+	}
+
+	return qcs
+}
+
 // Filters a list of nodes to include only nodes that will sign the QC for the
 // given cluster. The resulting list of nodes is only nodes that are in the
 // given cluster AND are not partner nodes (ie. we have the private keys).