update bootstrapping commandline flags

Author: tim-barry

cmd/bootstrap/cmd/clustering.go

@@ -51,6 +51,9 @@ func addClusterAssignmentCmdFlags() {
 	cmd.MarkFlagRequired(clusterAssignmentCmd, "partner-dir")
 	cmd.MarkFlagRequired(clusterAssignmentCmd, "partner-weights")
 
+	// optional parameters for cluster assignment
+	clusterAssignmentCmd.Flags().UintVar(&flagCollectionClusters, "collection-clusters", 2, "number of collection clusters")
+
 	// required parameters for generation of cluster root blocks
 	clusterAssignmentCmd.Flags().Uint64Var(&flagEpochCounter, "epoch-counter", 0, "epoch counter for the epoch beginning with the root block")
 	cmd.MarkFlagRequired(clusterAssignmentCmd, "epoch-counter")

cmd/bootstrap/cmd/rootblock.go

@@ -115,13 +115,15 @@ func addRootBlockCmdFlags() {
 		"protocol state KVStore version to initialize ('default' or an integer equal to a supported protocol version: '0', '1', '2', ...)")
 	rootBlockCmd.Flags().BytesHexVar(&flagEpochRandomSeed, "random-seed", nil, "random seed")
 	rootBlockCmd.Flags().StringVar(&flagIntermediaryClusteringDataPath, "intermediary-clustering-data", "", "path to a JSON file containing intermediary clustering data generated by the clustering command")
+	rootBlockCmd.Flags().StringVar(&flagRootClusterBlockVotesDir, "cluster-votes-dir", "", "directory containing votes for root cluster blocks")
 
 	cmd.MarkFlagRequired(rootBlockCmd, "root-chain")
 	cmd.MarkFlagRequired(rootBlockCmd, "root-parent")
 	cmd.MarkFlagRequired(rootBlockCmd, "root-height")
 	cmd.MarkFlagRequired(rootBlockCmd, "root-view")
 	cmd.MarkFlagRequired(rootBlockCmd, "random-seed")
 	cmd.MarkFlagRequired(rootBlockCmd, "intermediary-clustering-data")
+	cmd.MarkFlagRequired(rootBlockCmd, "cluster-votes-dir")
 
 	// Epoch timing config - these values must be set identically to `EpochTimingConfig` in the FlowEpoch smart contract.
 	// See https://github.com/onflow/flow-core-contracts/blob/240579784e9bb8d97d91d0e3213614e25562c078/contracts/epochs/FlowEpoch.cdc#L259-L266
@@ -454,7 +456,7 @@ func generateExecutionStateEpochConfig(
 		NumViewsInEpoch:              cadence.UInt64(flagNumViewsInEpoch),
 		NumViewsInStakingAuction:     cadence.UInt64(flagNumViewsInStakingAuction),
 		NumViewsInDKGPhase:           cadence.UInt64(flagNumViewsInDKGPhase),
-		NumCollectorClusters:         cadence.UInt16(flagCollectionClusters),
+		NumCollectorClusters:         cadence.UInt16(len(clusterQCs)),
 		RandomSource:                 cdcRandomSource,
 		CollectorClusters:            epochSetup.Assignments,
 		ClusterQCs:                   clusterQCs,