From 1024766514eea7bb628ec6e5ed974e997b8faefc Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 12:20:59 +0100 Subject: refactor cli and gui wrapper code. Details: - all cli functions shared between ethereum and ethereal abstracted to utils/ cmd.go (should be ethcommon or shared or sth) - simplify main() now readable stepwise - rename main wrapper files to main.go - rename commmand line args definition file from config.go to flags.go - rename Do -> Start to parallel option names - register interrupt for rpc server stop - fix interrupt stopping js repl and ethereum - register interrupt for mining stop - custom config file option from command line - debug option from command line - loglevel option from command line - changed ethutil.Config API - default datadir and default config file set together with other flag defaults in wrappers - default assetpath set together with other command line flags defaults in gui wrapper (not in ethutil.Config or ui/ui_lib) - options precedence: default < config file < environment variables < command line --- utils/cmd.go | 250 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 200 insertions(+), 50 deletions(-) (limited to 'utils/cmd.go') diff --git a/utils/cmd.go b/utils/cmd.go index e1fc0fc00..39233d586 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -1,74 +1,224 @@ package utils import ( - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethminer" - "github.com/ethereum/eth-go/ethpub" - "github.com/ethereum/eth-go/ethrpc" - "github.com/ethereum/eth-go/ethutil" - "time" + "github.com/ethereum/eth-go" + "github.com/ethereum/eth-go/ethminer" + "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethrpc" + "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ethlog" + "log" + "io" + "path" + "os" + "os/signal" + "fmt" + "time" + "strings" ) -func DoRpc(ethereum *eth.Ethereum, RpcPort int) { - var err error - ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) - if err != nil { - ethutil.Config.Log.Infoln("Could not start RPC interface:", err) - } else { - go ethereum.RpcServer.Start() - } +var logger = ethlog.NewLogger("CLI") + +// Register interrupt handlers +func RegisterInterrupt(cb func(os.Signal)) { + go func() { + // Buffered chan of one is enough + c := make(chan os.Signal, 1) + // Notify about interrupts for now + signal.Notify(c, os.Interrupt) + for sig := range c { + cb(sig) + } + }() } -var miner ethminer.Miner - -func DoMining(ethereum *eth.Ethereum) { - // Set Mining status - ethereum.Mining = true +func AbsolutePath(Datadir string, filename string) string { + if path.IsAbs(filename) { + return filename + } + return path.Join(Datadir, filename) +} - if ethutil.GetKeyRing().Len() == 0 { - ethutil.Config.Log.Infoln("No address found, can't start mining") - return - } - keyPair := ethutil.GetKeyRing().Get(0) - addr := keyPair.Address() +func openLogFile (Datadir string, filename string) *os.File { + path := AbsolutePath(Datadir, filename) + file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) + if err != nil { + panic(fmt.Sprintf("error opening log file '%s': %v", filename, err)) + } + return file +} - go func() { - miner = ethminer.NewDefaultMiner(addr, ethereum) +func confirm (message string) bool { + fmt.Println(message, "Are you sure? (y/n)") + var r string + fmt.Scanln(&r) + for ; ; fmt.Scanln(&r) { + if r == "n" || r == "y" { + break + } else { + fmt.Printf("Yes or no?", r) + } + } + return r == "y" +} - // Give it some time to connect with peers - time.Sleep(3 * time.Second) +func InitDataDir(Datadir string) { + _, err := os.Stat(Datadir) + if err != nil { + if os.IsNotExist(err) { + fmt.Printf("Debug logging directory '%s' doesn't exist, creating it\n", Datadir) + os.Mkdir(Datadir, 0777) + } + } +} - for ethereum.IsUpToDate() == false { - time.Sleep(5 * time.Second) - } +func InitLogging (Datadir string, LogFile string, LogLevel int, DebugFile string) { + var writer io.Writer + if LogFile == "" { + writer = os.Stdout + } else { + writer = openLogFile(Datadir, LogFile) + } + ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.LogLevel(LogLevel))) + if DebugFile != "" { + writer = openLogFile(Datadir, DebugFile) + ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.DebugLevel)) + } +} - ethutil.Config.Log.Infoln("Miner started") +func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix string) { + ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix) + ethutil.Config.Set("rpcport", "700") +} - miner := ethminer.NewDefaultMiner(addr, ethereum) - miner.Start() - }() +func exit(status int) { + ethlog.Flush() + os.Exit(status) } -func StopMining(ethereum *eth.Ethereum) bool { - if ethereum.Mining { - miner.Stop() +func NewEthereum(UseUPnP bool, OutboundPort string, MaxPeer int) *eth.Ethereum { + ethereum, err := eth.New(eth.CapDefault, UseUPnP) + if err != nil { + logger.Fatalln("eth start err:", err) + } + ethereum.Port = OutboundPort + ethereum.MaxPeers = MaxPeer + return ethereum +} - ethutil.Config.Log.Infoln("Miner stopped") +func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) { + logger.Infof("Starting Ethereum v%s", ethutil.Config.Ver) + ethereum.Start(UseSeed) + // Wait for shutdown + ethereum.WaitForShutdown() + RegisterInterrupt(func(sig os.Signal) { + logger.Errorf("Shutting down (%v) ... \n", sig) + ethereum.Stop() + ethlog.Flush() + }) +} - ethereum.Mining = false +func ShowGenesis(ethereum *eth.Ethereum) { + logger.Infoln(ethereum.BlockChain().Genesis()) + exit(0) +} - return true - } +func KeyTasks(GenAddr bool, ImportKey string, ExportKey bool, NonInteractive bool) { + switch { + case GenAddr: + if NonInteractive || confirm("This action overwrites your old private key.") { + CreateKeyPair(true) + } + exit(0) + case len(ImportKey) > 0: + if NonInteractive || confirm("This action overwrites your old private key.") { + // import should be from file + mnemonic := strings.Split(ImportKey, " ") + if len(mnemonic) == 24 { + logger.Infoln("Got mnemonic key, importing.") + key := ethutil.MnemonicDecode(mnemonic) + ImportPrivateKey(key) + } else if len(mnemonic) == 1 { + logger.Infoln("Got hex key, importing.") + ImportPrivateKey(ImportKey) + } else { + logger.Errorln("Did not recognise format, exiting.") + } + } + exit(0) + case ExportKey: // this should be exporting to a filename + keyPair := ethutil.GetKeyRing().Get(0) + fmt.Printf(` +Generating new address and keypair. +Please keep your keys somewhere save. + +++++++++++++++++ KeyRing +++++++++++++++++++ +addr: %x +prvk: %x +pubk: %x +++++++++++++++++++++++++++++++++++++++++++++ +save these words so you can restore your account later: %s +`, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey) + + exit(0) + default: + // Creates a keypair if none exists + CreateKeyPair(false) + } +} - return false +func StartRpc(ethereum *eth.Ethereum, RpcPort int) { + var err error + ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) + if err != nil { + logger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err) + } else { + go ethereum.RpcServer.Start() + RegisterInterrupt(func(os.Signal) { + ethereum.RpcServer.Stop() + }) + } } -func StartMining(ethereum *eth.Ethereum) bool { - if !ethereum.Mining { - DoMining(ethereum) +var miner ethminer.Miner - return true - } +func StartMining(ethereum *eth.Ethereum) bool { + if !ethereum.Mining { + ethereum.Mining = true + + if ethutil.GetKeyRing().Len() == 0 { + logger.Errorln("No address found, can't start mining") + ethereum.Mining = false + return true //???? + } + keyPair := ethutil.GetKeyRing().Get(0) + addr := keyPair.Address() + + go func() { + miner = ethminer.NewDefaultMiner(addr, ethereum) + // Give it some time to connect with peers + time.Sleep(3 * time.Second) + for ethereum.IsUpToDate() == false { + time.Sleep(5 * time.Second) + } + logger.Infoln("Miner started") + miner := ethminer.NewDefaultMiner(addr, ethereum) + miner.Start() + }() + RegisterInterrupt(func(os.Signal) { + StopMining(ethereum) + }) + return true + } + return false +} - return false +func StopMining(ethereum *eth.Ethereum) bool { + if ethereum.Mining { + miner.Stop() + logger.Infoln("Miner stopped") + ethereum.Mining = false + return true + } + return false } -- cgit v1.2.3 From 2f96652bb408e65c205317403d749ba9a395c6bb Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 10:47:45 +0100 Subject: interrupt handlers now ordered --- utils/cmd.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'utils/cmd.go') diff --git a/utils/cmd.go b/utils/cmd.go index 34716b94a..da05c6d83 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -18,16 +18,23 @@ import ( ) var logger = ethlog.NewLogger("CLI") +var interruptCallbacks = []func(os.Signal){} -// Register interrupt handlers +// Register interrupt handlers callbacks func RegisterInterrupt(cb func(os.Signal)) { + interruptCallbacks = append(interruptCallbacks, cb) +} + +// go routine that call interrupt handlers in order of registering +func HandleInterrupt() { + c := make(chan os.Signal, 1) go func() { - // Buffered chan of one is enough - c := make(chan os.Signal, 1) - // Notify about interrupts for now signal.Notify(c, os.Interrupt) for sig := range c { - cb(sig) + logger.Errorf("Shutting down (%v) ... \n", sig) + for _, cb := range interruptCallbacks { + cb(sig) + } } }() } @@ -109,13 +116,12 @@ func NewEthereum(UseUPnP bool, OutboundPort string, MaxPeer int) *eth.Ethereum { func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) { logger.Infof("Starting Ethereum v%s", ethutil.Config.Ver) ethereum.Start(UseSeed) - // Wait for shutdown - ethereum.WaitForShutdown() RegisterInterrupt(func(sig os.Signal) { - logger.Errorf("Shutting down (%v) ... \n", sig) ethereum.Stop() ethlog.Flush() }) + // this blocks the thread + ethereum.WaitForShutdown() } func ShowGenesis(ethereum *eth.Ethereum) { @@ -174,9 +180,6 @@ func StartRpc(ethereum *eth.Ethereum, RpcPort int) { logger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err) } else { go ethereum.RpcServer.Start() - RegisterInterrupt(func(os.Signal) { - ethereum.RpcServer.Stop() - }) } } -- cgit v1.2.3 From 21d86ca486a88c936a1fe71f78d76c78df36a7eb Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 16:26:14 +0100 Subject: gui stop - introduce gui.Stop() - remember state with open - stopping ethereum stack is not gui concern, moved to main - stopping mining, gui and ethereum handled via interrupt callbacks - ^C triggers exactly the same behaviour as quit via menu --- utils/cmd.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'utils/cmd.go') diff --git a/utils/cmd.go b/utils/cmd.go index da05c6d83..db5ec5b48 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -32,13 +32,17 @@ func HandleInterrupt() { signal.Notify(c, os.Interrupt) for sig := range c { logger.Errorf("Shutting down (%v) ... \n", sig) - for _, cb := range interruptCallbacks { - cb(sig) - } + RunInterruptCallbacks(sig) } }() } +func RunInterruptCallbacks(sig os.Signal) { + for _, cb := range interruptCallbacks { + cb(sig) + } +} + func AbsolutePath(Datadir string, filename string) string { if path.IsAbs(filename) { return filename @@ -94,6 +98,7 @@ func InitLogging (Datadir string, LogFile string, LogLevel int, DebugFile string } func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix string) { + InitDataDir(Datadir) ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix) ethutil.Config.Set("rpcport", "700") } @@ -120,8 +125,6 @@ func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) { ethereum.Stop() ethlog.Flush() }) - // this blocks the thread - ethereum.WaitForShutdown() } func ShowGenesis(ethereum *eth.Ethereum) { -- cgit v1.2.3 From ae5ace16190d48bfe7a0364fdb0b51644518ec42 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 18:41:36 +0100 Subject: go fmt --- utils/cmd.go | 326 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 163 insertions(+), 163 deletions(-) (limited to 'utils/cmd.go') diff --git a/utils/cmd.go b/utils/cmd.go index db5ec5b48..c084542b4 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -1,20 +1,20 @@ package utils import ( - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethminer" - "github.com/ethereum/eth-go/ethpub" - "github.com/ethereum/eth-go/ethrpc" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/ethlog" - "log" - "io" - "path" - "os" - "os/signal" - "fmt" - "time" - "strings" + "fmt" + "github.com/ethereum/eth-go" + "github.com/ethereum/eth-go/ethlog" + "github.com/ethereum/eth-go/ethminer" + "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethrpc" + "github.com/ethereum/eth-go/ethutil" + "io" + "log" + "os" + "os/signal" + "path" + "strings" + "time" ) var logger = ethlog.NewLogger("CLI") @@ -22,142 +22,142 @@ var interruptCallbacks = []func(os.Signal){} // Register interrupt handlers callbacks func RegisterInterrupt(cb func(os.Signal)) { - interruptCallbacks = append(interruptCallbacks, cb) + interruptCallbacks = append(interruptCallbacks, cb) } // go routine that call interrupt handlers in order of registering func HandleInterrupt() { - c := make(chan os.Signal, 1) - go func() { - signal.Notify(c, os.Interrupt) - for sig := range c { - logger.Errorf("Shutting down (%v) ... \n", sig) - RunInterruptCallbacks(sig) - } - }() + c := make(chan os.Signal, 1) + go func() { + signal.Notify(c, os.Interrupt) + for sig := range c { + logger.Errorf("Shutting down (%v) ... \n", sig) + RunInterruptCallbacks(sig) + } + }() } func RunInterruptCallbacks(sig os.Signal) { - for _, cb := range interruptCallbacks { - cb(sig) - } + for _, cb := range interruptCallbacks { + cb(sig) + } } func AbsolutePath(Datadir string, filename string) string { - if path.IsAbs(filename) { - return filename - } - return path.Join(Datadir, filename) -} - -func openLogFile (Datadir string, filename string) *os.File { - path := AbsolutePath(Datadir, filename) - file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) - if err != nil { - panic(fmt.Sprintf("error opening log file '%s': %v", filename, err)) - } - return file -} - -func confirm (message string) bool { - fmt.Println(message, "Are you sure? (y/n)") - var r string - fmt.Scanln(&r) - for ; ; fmt.Scanln(&r) { - if r == "n" || r == "y" { - break - } else { - fmt.Printf("Yes or no?", r) - } - } - return r == "y" + if path.IsAbs(filename) { + return filename + } + return path.Join(Datadir, filename) +} + +func openLogFile(Datadir string, filename string) *os.File { + path := AbsolutePath(Datadir, filename) + file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) + if err != nil { + panic(fmt.Sprintf("error opening log file '%s': %v", filename, err)) + } + return file +} + +func confirm(message string) bool { + fmt.Println(message, "Are you sure? (y/n)") + var r string + fmt.Scanln(&r) + for ; ; fmt.Scanln(&r) { + if r == "n" || r == "y" { + break + } else { + fmt.Printf("Yes or no?", r) + } + } + return r == "y" } func InitDataDir(Datadir string) { - _, err := os.Stat(Datadir) - if err != nil { - if os.IsNotExist(err) { - fmt.Printf("Debug logging directory '%s' doesn't exist, creating it\n", Datadir) - os.Mkdir(Datadir, 0777) - } - } -} - -func InitLogging (Datadir string, LogFile string, LogLevel int, DebugFile string) { - var writer io.Writer - if LogFile == "" { - writer = os.Stdout - } else { - writer = openLogFile(Datadir, LogFile) - } - ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.LogLevel(LogLevel))) - if DebugFile != "" { - writer = openLogFile(Datadir, DebugFile) - ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.DebugLevel)) - } + _, err := os.Stat(Datadir) + if err != nil { + if os.IsNotExist(err) { + fmt.Printf("Debug logging directory '%s' doesn't exist, creating it\n", Datadir) + os.Mkdir(Datadir, 0777) + } + } +} + +func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string) { + var writer io.Writer + if LogFile == "" { + writer = os.Stdout + } else { + writer = openLogFile(Datadir, LogFile) + } + ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.LogLevel(LogLevel))) + if DebugFile != "" { + writer = openLogFile(Datadir, DebugFile) + ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.DebugLevel)) + } } func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix string) { - InitDataDir(Datadir) - ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix) - ethutil.Config.Set("rpcport", "700") + InitDataDir(Datadir) + ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix) + ethutil.Config.Set("rpcport", "700") } func exit(status int) { - ethlog.Flush() - os.Exit(status) + ethlog.Flush() + os.Exit(status) } func NewEthereum(UseUPnP bool, OutboundPort string, MaxPeer int) *eth.Ethereum { - ethereum, err := eth.New(eth.CapDefault, UseUPnP) - if err != nil { - logger.Fatalln("eth start err:", err) - } - ethereum.Port = OutboundPort - ethereum.MaxPeers = MaxPeer - return ethereum + ethereum, err := eth.New(eth.CapDefault, UseUPnP) + if err != nil { + logger.Fatalln("eth start err:", err) + } + ethereum.Port = OutboundPort + ethereum.MaxPeers = MaxPeer + return ethereum } func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) { - logger.Infof("Starting Ethereum v%s", ethutil.Config.Ver) - ethereum.Start(UseSeed) - RegisterInterrupt(func(sig os.Signal) { - ethereum.Stop() - ethlog.Flush() - }) + logger.Infof("Starting Ethereum v%s", ethutil.Config.Ver) + ethereum.Start(UseSeed) + RegisterInterrupt(func(sig os.Signal) { + ethereum.Stop() + ethlog.Flush() + }) } func ShowGenesis(ethereum *eth.Ethereum) { - logger.Infoln(ethereum.BlockChain().Genesis()) - exit(0) + logger.Infoln(ethereum.BlockChain().Genesis()) + exit(0) } func KeyTasks(GenAddr bool, ImportKey string, ExportKey bool, NonInteractive bool) { - switch { - case GenAddr: - if NonInteractive || confirm("This action overwrites your old private key.") { - CreateKeyPair(true) - } - exit(0) - case len(ImportKey) > 0: - if NonInteractive || confirm("This action overwrites your old private key.") { - // import should be from file - mnemonic := strings.Split(ImportKey, " ") - if len(mnemonic) == 24 { - logger.Infoln("Got mnemonic key, importing.") - key := ethutil.MnemonicDecode(mnemonic) - ImportPrivateKey(key) - } else if len(mnemonic) == 1 { - logger.Infoln("Got hex key, importing.") - ImportPrivateKey(ImportKey) - } else { - logger.Errorln("Did not recognise format, exiting.") - } - } - exit(0) - case ExportKey: // this should be exporting to a filename - keyPair := ethutil.GetKeyRing().Get(0) - fmt.Printf(` + switch { + case GenAddr: + if NonInteractive || confirm("This action overwrites your old private key.") { + CreateKeyPair(true) + } + exit(0) + case len(ImportKey) > 0: + if NonInteractive || confirm("This action overwrites your old private key.") { + // import should be from file + mnemonic := strings.Split(ImportKey, " ") + if len(mnemonic) == 24 { + logger.Infoln("Got mnemonic key, importing.") + key := ethutil.MnemonicDecode(mnemonic) + ImportPrivateKey(key) + } else if len(mnemonic) == 1 { + logger.Infoln("Got hex key, importing.") + ImportPrivateKey(ImportKey) + } else { + logger.Errorln("Did not recognise format, exiting.") + } + } + exit(0) + case ExportKey: // this should be exporting to a filename + keyPair := ethutil.GetKeyRing().Get(0) + fmt.Printf(` Generating new address and keypair. Please keep your keys somewhere save. @@ -169,61 +169,61 @@ pubk: %x save these words so you can restore your account later: %s `, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey) - exit(0) - default: - // Creates a keypair if none exists - CreateKeyPair(false) - } + exit(0) + default: + // Creates a keypair if none exists + CreateKeyPair(false) + } } func StartRpc(ethereum *eth.Ethereum, RpcPort int) { - var err error - ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) - if err != nil { - logger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err) - } else { - go ethereum.RpcServer.Start() - } + var err error + ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) + if err != nil { + logger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err) + } else { + go ethereum.RpcServer.Start() + } } var miner ethminer.Miner func StartMining(ethereum *eth.Ethereum) bool { - if !ethereum.Mining { - ethereum.Mining = true - - if ethutil.GetKeyRing().Len() == 0 { - logger.Errorln("No address found, can't start mining") - ethereum.Mining = false - return true //???? - } - keyPair := ethutil.GetKeyRing().Get(0) - addr := keyPair.Address() - - go func() { - miner = ethminer.NewDefaultMiner(addr, ethereum) - // Give it some time to connect with peers - time.Sleep(3 * time.Second) - logger.Infoln("Miner started") - miner := ethminer.NewDefaultMiner(addr, ethereum) - miner.Start() - }() - RegisterInterrupt(func(os.Signal) { - StopMining(ethereum) - }) - return true - } - return false + if !ethereum.Mining { + ethereum.Mining = true + + if ethutil.GetKeyRing().Len() == 0 { + logger.Errorln("No address found, can't start mining") + ethereum.Mining = false + return true //???? + } + keyPair := ethutil.GetKeyRing().Get(0) + addr := keyPair.Address() + + go func() { + miner = ethminer.NewDefaultMiner(addr, ethereum) + // Give it some time to connect with peers + time.Sleep(3 * time.Second) + logger.Infoln("Miner started") + miner := ethminer.NewDefaultMiner(addr, ethereum) + miner.Start() + }() + RegisterInterrupt(func(os.Signal) { + StopMining(ethereum) + }) + return true + } + return false } func StopMining(ethereum *eth.Ethereum) bool { - if ethereum.Mining { - miner.Stop() - logger.Infoln("Miner stopped") - ethereum.Mining = false - return true - } - return false + if ethereum.Mining { + miner.Stop() + logger.Infoln("Miner stopped") + ethereum.Mining = false + return true + } + return false } // Replay block -- cgit v1.2.3