tools: Allow specification of Reward Pool Account Balance in Genesis

cmd/goal/network.go

@@ -35,6 +35,7 @@ var startNode string
 var noImportKeys bool
 var noClean bool
 var devModeOverride bool
+var noRewardOverride bool
 
 func init() {
 	networkCmd.AddCommand(networkCreateCmd)
@@ -47,6 +48,7 @@ func init() {
 	networkCreateCmd.Flags().BoolVarP(&noImportKeys, "noimportkeys", "K", false, "Do not import root keys when creating the network (by default will import)")
 	networkCreateCmd.Flags().BoolVar(&noClean, "noclean", false, "Prevents auto-cleanup on error - for diagnosing problems")
 	networkCreateCmd.Flags().BoolVar(&devModeOverride, "devMode", false, "Forces the configuration to enable DevMode, returns an error if the template is not compatible with DevMode.")
+	networkCreateCmd.Flags().BoolVar(&noRewardOverride, "noReward", false, "Forces the configuration to disable Rewards")
 
 	networkStartCmd.Flags().StringVarP(&startNode, "node", "n", "", "Specify the name of a specific node to start")
 
@@ -101,7 +103,7 @@ var networkCreateCmd = &cobra.Command{
 			consensus, _ = config.PreloadConfigurableConsensusProtocols(dataDir)
 		}
 
-		network, err := netdeploy.CreateNetworkFromTemplate(networkName, networkRootDir, networkTemplateFile, binDir, !noImportKeys, nil, consensus, devModeOverride)
+		network, err := netdeploy.CreateNetworkFromTemplate(networkName, networkRootDir, networkTemplateFile, binDir, !noImportKeys, nil, consensus, devModeOverride, noRewardOverride)
 		if err != nil {
 			if noClean {
 				reportInfof(" ** failed ** - Preserving network rootdir '%s'", networkRootDir)

gen/generate.go

@@ -149,14 +149,28 @@ func GenerateGenesisFiles(genesisData GenesisData, consensus config.ConsensusPro
 		return fmt.Errorf("couldn't make output directory '%s': %v", outDir, err.Error())
 	}
 
-	return generateGenesisFiles(outDir, proto, consensusParams, genesisData.NetworkName, genesisData.VersionModifier, allocation, genesisData.FirstPartKeyRound, genesisData.LastPartKeyRound, genesisData.PartKeyDilution, genesisData.FeeSink, genesisData.RewardsPool, genesisData.Comment, genesisData.DevMode, verboseOut)
+	return generateGenesisFiles(
+		proto, consensusParams, allocation, genesisData, outDir, verboseOut,
+	)
 }
 
-func generateGenesisFiles(outDir string, protoVersion protocol.ConsensusVersion, protoParams config.ConsensusParams, netName string, schemaVersionModifier string,
-	allocation []genesisAllocation, firstWalletValid uint64, lastWalletValid uint64, partKeyDilution uint64, feeSink, rewardsPool basics.Address, comment string, devmode bool, verboseOut io.Writer) (err error) {
+func generateGenesisFiles(protoVersion protocol.ConsensusVersion, protoParams config.ConsensusParams, allocation []genesisAllocation, genData GenesisData, outDir string, verboseOut io.Writer) (err error) {
 
-	genesisAddrs := make(map[string]basics.Address)
-	records := make(map[string]basics.AccountData)
+	var (
+		netName               = genData.NetworkName
+		schemaVersionModifier = genData.VersionModifier
+		firstWalletValid      = genData.FirstPartKeyRound
+		lastWalletValid       = genData.LastPartKeyRound
+		partKeyDilution       = genData.PartKeyDilution
+		feeSink               = genData.FeeSink
+		rewardsPool           = genData.RewardsPool
+		devmode               = genData.DevMode
+		noRewards             = genData.NoRewards
+		comment               = genData.Comment
+
+		genesisAddrs = make(map[string]basics.Address)
+		records      = make(map[string]basics.AccountData)
+	)
 
 	if partKeyDilution == 0 {
 		partKeyDilution = protoParams.DefaultKeyDilution
@@ -326,13 +340,18 @@ func generateGenesisFiles(outDir string, protoVersion protocol.ConsensusVersion,
 		fmt.Fprintln(verboseOut, protoVersion, protoParams.MinBalance)
 	}
 
+	rewardBalance := defaultIncentivePoolBalanceAtInception
+	if noRewards {
+		rewardBalance = protoParams.MinBalance
+	}
+
 	records["FeeSink"] = basics.AccountData{
 		Status:     basics.NotParticipating,
 		MicroAlgos: basics.MicroAlgos{Raw: protoParams.MinBalance},
 	}
 	records["RewardsPool"] = basics.AccountData{
 		Status:     basics.NotParticipating,
-		MicroAlgos: basics.MicroAlgos{Raw: defaultIncentivePoolBalanceAtInception},
+		MicroAlgos: basics.MicroAlgos{Raw: rewardBalance},
 	}
 
 	sinkAcct := genesisAllocation{
@@ -342,7 +361,7 @@ func generateGenesisFiles(outDir string, protoVersion protocol.ConsensusVersion,
 	}
 	poolAcct := genesisAllocation{
 		Name:   "RewardsPool",
-		Stake:  defaultIncentivePoolBalanceAtInception,
+		Stake:  rewardBalance,
 		Online: basics.NotParticipating,
 	}
 

gen/walletData.go

@@ -49,6 +49,7 @@ type GenesisData struct {
 	Wallets           []WalletData
 	FeeSink           basics.Address
 	RewardsPool       basics.Address
+	NoRewards         bool
 	DevMode           bool
 	Comment           string
 }

netdeploy/network.go

@@ -58,7 +58,7 @@ type Network struct {
 
 // CreateNetworkFromTemplate uses the specified template to deploy a new private network
 // under the specified root directory.
-func CreateNetworkFromTemplate(name, rootDir, templateFile, binDir string, importKeys bool, nodeExitCallback nodecontrol.AlgodExitErrorCallback, consensus config.ConsensusProtocols, overrideDevMode bool) (Network, error) {
+func CreateNetworkFromTemplate(name, rootDir, templateFile, binDir string, importKeys bool, nodeExitCallback nodecontrol.AlgodExitErrorCallback, consensus config.ConsensusProtocols, overrideDevMode, overrideNoRewards bool) (Network, error) {
 	n := Network{
 		rootDir:          rootDir,
 		nodeExitCallback: nodeExitCallback,
@@ -74,6 +74,10 @@ func CreateNetworkFromTemplate(name, rootDir, templateFile, binDir string, impor
 				template.Nodes[0].IsRelay = false
 			}
 		}
+		if overrideNoRewards {
+			template.Genesis.NoRewards = true
+		}
+
 		err = template.Validate()
 	}
 	if err != nil {

test/framework/fixtures/libgoalFixture.go

@@ -96,7 +96,7 @@ func (f *LibGoalFixture) setup(test TestingTB, testName string, templateFile str
 	os.RemoveAll(f.rootDir)
 	templateFile = filepath.Join(f.testDataDir, templateFile)
 	importKeys := false // Don't automatically import root keys when creating folders, we'll import on-demand
-	network, err := netdeploy.CreateNetworkFromTemplate("test", f.rootDir, templateFile, f.binDir, importKeys, f.nodeExitWithError, f.consensus, false)
+	network, err := netdeploy.CreateNetworkFromTemplate("test", f.rootDir, templateFile, f.binDir, importKeys, f.nodeExitWithError, f.consensus, false, false)
 	f.failOnError(err, "CreateNetworkFromTemplate failed: %v")
 	f.network = network