Support miner config generation

Qi Xiao · Qi Xiao · commit 865f7ce928ae · 2019-05-06T15:53:46.000+08:00
diff --git a/cmd/cql/internal/generate.go b/cmd/cql/internal/generate.go
@@ -39,7 +39,7 @@ import (
 
 // CmdGenerate is cql generate command entity.
 var CmdGenerate = &Command{
-	UsageLine: "cql generate [common params] [-source template_file] [-private existing_private_key] [dest_path]",
+	UsageLine: "cql generate [common params] [-source template_file] [-miner] [-private existing_private_key] [dest_path]",
 	Short:     "generate a folder contains config file and private key",
 	Long: `
 Generate generates private.key and config.yaml for CovenantSQL.
@@ -56,12 +56,14 @@ or input a passphrase by
 var (
 	privateKeyParam string
 	source          string
+	minerListenAddr string
 )
 
 func init() {
 	CmdGenerate.Run = runGenerate
 	CmdGenerate.Flag.StringVar(&privateKeyParam, "private", "", "custom private for config generation")
 	CmdGenerate.Flag.StringVar(&source, "source", "", "source config file template for config generation")
+	CmdGenerate.Flag.StringVar(&minerListenAddr, "miner", "", "generate miner config with specified listen address")
 
 	addCommonFlags(CmdGenerate)
 }
@@ -218,6 +220,9 @@ func runGenerate(cmd *Command, args []string) {
 	if source == "" {
 		// Load testnet config
 		rawConfig = testnet.GetTestNetConfig()
+		if minerListenAddr != "" {
+			testnet.SetMinerConfig(rawConfig)
+		}
 	} else {
 		// Load from template file
 		sourceConfig, err := ioutil.ReadFile(source)
@@ -241,13 +246,18 @@ func runGenerate(cmd *Command, args []string) {
 	if rawConfig.KnownNodes == nil {
 		rawConfig.KnownNodes = make([]proto.Node, 0, 1)
 	}
-	rawConfig.KnownNodes = append(rawConfig.KnownNodes, proto.Node{
+	node := proto.Node{
 		ID:        cliNodeID,
 		Role:      proto.Client,
 		Addr:      "0.0.0.0:15151",
 		PublicKey: publicKey,
 		Nonce:     nonce.Nonce,
-	})
+	}
+	if minerListenAddr != "" {
+		node.Role = proto.Miner
+		node.Addr = minerListenAddr
+	}
+	rawConfig.KnownNodes = append(rawConfig.KnownNodes, node)
 
 	// Write config
 	out, err := yaml.Marshal(rawConfig)
diff --git a/conf/testnet/parameters.go b/conf/testnet/parameters.go
@@ -30,6 +30,21 @@ const (
 DNSSeed:
   Domain: "testnet.gridb.io"
   BPCount: 6
+`
+	// CQLMinerYAML is the config string in YAML format of the CovenantSQL TestNet for miner.
+	CQLMinerYAML = `
+BillingBlockCount: 60
+BPPeriod: 10s
+BPTick: 3s
+SQLChainPeriod: 60s
+SQLChainTick: 10s
+SQLChainTTL: 10
+ChainBusPeriod: 10s
+MinProviderDeposit: 1000000
+Miner:
+  RootDir: './data'
+  MaxReqTimeGap: '5m'
+  ProvideServiceInterval: '10s'
 `
 )
 
@@ -42,3 +57,15 @@ func GetTestNetConfig() (config *conf.Config) {
 	}
 	return
 }
+
+// SetMinerConfig set testnet common config for miner.
+func SetMinerConfig(config *conf.Config) {
+	if config == nil {
+		return
+	}
+	var err error
+	if err = yaml.Unmarshal([]byte(CQLMinerYAML), config); err != nil {
+		log.WithError(err).Fatal("failed to unmarshal testnet miner config")
+	}
+	return
+}
