add command

main.go → cmd/main.go

 package main
 
 import (
-	"github.com/consensys/gnark-crypto/field/goff/cmd"
 	"runtime"
 )
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	cmd.Execute()
+	Execute()
 }

cmd/misccmd.go

@@ -3,27 +3,21 @@ package main
 import (
 	"example.com/m/conf"
 	"example.com/m/log"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/spf13/cobra"
 )
 
-var (
-	rewardAddr  string
-	isSetReward bool
-)
-
 func init() {
-	RootCmd.AddCommand(paramCmd)
-	rewardAddr = *paramCmd.Flags().StringP("reward", "r", "", "Print detail version info")
+	//RootCmd.AddCommand(paramCmd)
+	rewardAddr = *paramCmd.PersistentFlags().StringP("reward", "r", "", "Print detail version info")
 }
 
 // versionCmd represents the base command when called without any subcommands
 var paramCmd = &cobra.Command{
 	Use:   "param",
-	Short: "Print version number",
+	Short: "",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		if rewardAddr != "" && common.IsHexAddress(rewardAddr) {
+		if rewardAddr != "" {
 			isSetReward = conf.GetConfig().SetRewardAddress(rewardAddr)
 			if !isSetReward {
 				log.Error("Please set right reward address")

cmd/rootcmd.go

 package main
 
 import (
+	"encoding/json"
+	"example.com/m/conf"
 	"example.com/m/log"
 	"example.com/m/nm"
+	"example.com/m/utils"
+	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"io/ioutil"
 	"os"
 )
 
 var (
-	routineCount uint
+	rewardAddr  string
+	isSetReward bool = false
 )
 
+func init() {
+	RootCmd.PersistentFlags().StringVarP(&rewardAddr, "reward", "r", "", "please enter a reward address")
+	cobra.OnInitialize(initConfig)
+}
+
 // RootCmd represents the base command when called without any subcommands
 var RootCmd = &cobra.Command{
 	Use:   "miner",
 	Short: "The miner command-line interface",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
+		if rewardAddr != "" {
+			log.Info("Enter reward address:", rewardAddr)
+			isSetReward = conf.GetConfig().SetRewardAddress(rewardAddr)
+			if !isSetReward {
+				log.Error("Please set right reward address")
+			}
+		}
 		if isSetReward {
 			log.InitLog(log.LogConfig{Path: "logs", Level: "debug", Save: 3})
 			go nm.StartMonitor()
@@ -26,9 +47,55 @@ var RootCmd = &cobra.Command{
 	},
 }
 
-func init() {
-	//cobra.OnInitialize(initConfig)
-	RootCmd.PersistentFlags().UintVar(&routineCount, "routine", 2, "routine count for corrupt do task")
+func initConfig() {
+	// 设置配置文件的名称（不包含扩展名)
+	viper.SetConfigName("config")
+
+	// 设置配置文件的类型
+	viper.SetConfigType("json")
+
+	// 设置配置文件所在的目录
+	viper.AddConfigPath(".")
+
+	viper.AutomaticEnv()
+
+	// 读取配置文件
+	if err := viper.ReadInConfig(); err != nil {
+		fmt.Println("Error reading config file:", err)
+		return
+	}
+
+	configFilePath := viper.ConfigFileUsed()
+	if configFilePath == "" {
+		// handle error
+		log.Error("config file path is empty")
+		panic("config file path is empty")
+	}
+
+	data, err := ioutil.ReadFile(configFilePath)
+	if err != nil {
+		// handle error
+		log.Error("Read cfg file error:", err)
+		panic("Read cfg file error")
+	}
+	err = json.Unmarshal(data, conf.GetConfig())
+	if err != nil {
+		// handle error
+		log.Error("Json unmarshal cfg error:", err)
+		panic("Json unmarshal cfg error")
+	}
+	conf.GetConfig().HeartRespTimeMillis = conf.GetConfig().HeartRespTimeSecond * 60 * 60 * 1000
+	prvKey, err := utils.GetPrv()
+	if err != nil {
+		panic("get prv error or delete keystore after restart")
+	}
+	conf.GetConfig().SignPrivateKey = prvKey
+	ecdsaPub := prvKey.PublicKey
+	conf.GetConfig().SignPub = common.Bytes2Hex(crypto.FromECDSAPub(&ecdsaPub))
+	log.Info("PublicKey", conf.GetConfig().SignPub)
+	publicAddr := crypto.PubkeyToAddress(ecdsaPub)
+	log.Info("publicAddr:", publicAddr)
+	conf.GetConfig().SignPublicAddress = publicAddr
 }
 
 func Execute() {

conf/config.go

@@ -2,14 +2,7 @@ package conf
 
 import (
 	"crypto/ecdsa"
-	"encoding/json"
-	"example.com/m/log"
-	"example.com/m/utils"
-	"fmt"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/spf13/viper"
-	"io/ioutil"
 )
 
 type Config struct {
@@ -32,52 +25,7 @@ type Config struct {
 var _cfg *Config = nil
 
 func init() {
-	// 设置配置文件的名称（不包含扩展名)
-	viper.SetConfigName("config")
-
-	// 设置配置文件的类型
-	viper.SetConfigType("json")
-
-	// 设置配置文件所在的目录
-	viper.AddConfigPath("./")
-
-	// 读取配置文件
-	if err := viper.ReadInConfig(); err != nil {
-		fmt.Println("Error reading config file:", err)
-		return
-	}
-
-	configFilePath := viper.ConfigFileUsed()
-	if configFilePath == "" {
-		// handle error
-		log.Error("config file path is empty")
-		panic("config file path is empty")
-	}
-
-	data, err := ioutil.ReadFile(configFilePath)
-	if err != nil {
-		// handle error
-		log.Error("Read cfg file error:", err)
-		panic("Read cfg file error")
-	}
-	err = json.Unmarshal(data, &_cfg)
-	if err != nil {
-		// handle error
-		log.Error("Json unmarshal cfg error:", err)
-		panic("Json unmarshal cfg error")
-	}
-	_cfg.HeartRespTimeMillis = _cfg.HeartRespTimeSecond * 60 * 60 * 1000
-	prvKey, err := utils.GetPrv()
-	if err != nil {
-		panic("get prv error or delete keystore after restart")
-	}
-	_cfg.SignPrivateKey = prvKey
-	ecdsaPub := prvKey.PublicKey
-	_cfg.SignPub = common.Bytes2Hex(crypto.FromECDSAPub(&ecdsaPub))
-	log.Info("PublicKey", _cfg.SignPub)
-	publicAddr := crypto.PubkeyToAddress(ecdsaPub)
-	log.Info("publicAddr:", publicAddr)
-	_cfg.SignPublicAddress = publicAddr
+	_cfg = &Config{}
 }
 
 func GetConfig() *Config {

nm/model_handler.go

@@ -16,7 +16,7 @@ import (
 
 func monitorModelInfo(dockerOp *operate.DockerOp) {
 	client := &http.Client{}
-	ticker := time.NewTicker(time.Second * 20)
+	ticker := time.NewTicker(time.Second * 1)
 	for {
 		select {
 		case <-ticker.C:

nm/monitor_seed.go

@@ -11,7 +11,7 @@ import (
 )
 
 func monitorNodeManagerSeed() {
-	ticker := time.NewTicker(time.Second * 20)
+	ticker := time.NewTicker(time.Second * 1)
 	for {
 		select {
 		case <-ticker.C:

utils/util.go

@@ -28,7 +28,7 @@ func GenerateRandomNumber(privateKey *ecdsa.PrivateKey, length int64) *big.Int {
 
 func GetPrv() (*ecdsa.PrivateKey, error) {
 	if _, err := os.Stat(KEYPATH_PWD); os.IsNotExist(err) {
-		log.Info("Keystore not found. Generating a new one...")
+		//log.Info("Keystore not found. Generating a new one...")
 		// 生成私钥
 		privateKey, err := generatePrivateKey()
 		if err != nil {
@@ -41,17 +41,17 @@ func GetPrv() (*ecdsa.PrivateKey, error) {
 			log.Error("Error saving private key:", err)
 			return nil, err
 		}
-		log.Info("Keystore generated successfully.")
+		//log.Info("Keystore generated successfully.")
 		return privateKey, nil
 	} else {
-		log.Info("Keystore found. Reading private key...")
+		//log.Info("Keystore found. Reading private key...")
 		// 读取私钥
 		privateKey, err := readPrivateKey()
 		if err != nil || privateKey == nil {
 			log.Error("Error reading private key:", err)
 			return nil, err
 		}
-		log.Info("Private key read successfully:", privateKey)
+		//log.Info("Private key read successfully:", privateKey)
 		return privateKey, nil
 	}
 }