diff --git a/cmd/bootstrap/cmd/keygen.go b/cmd/bootstrap/cmd/keygen.go old mode 100755 new mode 100644 index 420ff03515c..df6d4b8ca2c --- a/cmd/bootstrap/cmd/keygen.go +++ b/cmd/bootstrap/cmd/keygen.go @@ -39,7 +39,7 @@ var keygenCmd = &cobra.Command{ // create keys log.Info().Msg("generating internal private networking and staking keys") - nodes := genNetworkAndStakingKeys([]model.NodeInfo{}) + nodes := genNetworkAndStakingKeys() log.Info().Msg("") // count roles @@ -47,6 +47,9 @@ var keygenCmd = &cobra.Command{ for role, count := range roleCounts { log.Info().Msg(fmt.Sprintf("created keys for %d %s nodes", count, role.String())) } + + log.Info().Msg("generating node public information") + genNodePubInfo(nodes) }, } @@ -74,3 +77,11 @@ func isEmptyDir(path string) (bool, error) { } return false, err // Either not empty or error, suits both cases } + +func genNodePubInfo(nodes []model.NodeInfo) { + pubNodes := make([]model.NodeInfoPub, 0, len(nodes)) + for _, node := range nodes { + pubNodes = append(pubNodes, node.Public()) + } + writeJSON(model.PathInternalNodeInfosPub, pubNodes) +} diff --git a/cmd/bootstrap/cmd/keys.go b/cmd/bootstrap/cmd/keys.go index 31207c6083f..21fbc180362 100644 --- a/cmd/bootstrap/cmd/keys.go +++ b/cmd/bootstrap/cmd/keys.go @@ -9,7 +9,7 @@ import ( "github.com/onflow/flow-go/model/flow" ) -func genNetworkAndStakingKeys(partnerNodes []model.NodeInfo) []model.NodeInfo { +func genNetworkAndStakingKeys() []model.NodeInfo { var nodeConfigs []model.NodeConfig readJSON(flagConfig, &nodeConfigs) diff --git a/model/bootstrap/filenames.go b/model/bootstrap/filenames.go index 69db11b20a8..61a89f65701 100644 --- a/model/bootstrap/filenames.go +++ b/model/bootstrap/filenames.go @@ -17,6 +17,7 @@ var ( // public genesis information DirnamePublicBootstrap = "public-root-information" + PathInternalNodeInfosPub = filepath.Join(DirnamePublicBootstrap, "node-internal-infos.pub.json") PathNodeInfosPub = filepath.Join(DirnamePublicBootstrap, "node-infos.pub.json") PathPartnerNodeInfoPrefix = filepath.Join(DirnamePublicBootstrap, "node-info.pub.") PathNodeInfoPub = filepath.Join(DirnamePublicBootstrap, "node-info.pub.%v.json") // %v will be replaced by NodeID