From 7f0c974008b62115c5c2685dee909b379ca1c6fc Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 16 Apr 2014 13:36:52 +0100 Subject: [PATCH 1/4] empty string -> empty byte array --- ethereum/dev_console.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/dev_console.go b/ethereum/dev_console.go index 421c3fa60f..577b039ad6 100644 --- a/ethereum/dev_console.go +++ b/ethereum/dev_console.go @@ -171,7 +171,7 @@ func (i *Console) ParseInput(input string) bool { if err != nil { fmt.Println("recipient err:", err) } else { - tx := ethchain.NewTransactionMessage(recipient, ethutil.Big(tokens[2]), ethutil.Big(tokens[3]), ethutil.Big(tokens[4]), []string{""}) + tx := ethchain.NewTransactionMessage(recipient, ethutil.Big(tokens[2]), ethutil.Big(tokens[3]), ethutil.Big(tokens[4]), []byte{}) key := ethutil.Config.Db.GetKeys()[0] tx.Sign(key.PrivateKey) From f4c13f865634bae6c9cc7cd0478b7765a24fa695 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 16 Apr 2014 13:37:04 +0100 Subject: [PATCH 2/4] logfile - add logfile option to ethereum client flags - fallback to StdOut - Logger appended to ethutil.Config.Log loggers - wrapper uses ethutil.Config.Log --- ethereum/config.go | 4 ++-- ethereum/ethereum.go | 26 +++++++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ethereum/config.go b/ethereum/config.go index e4935dfed6..899a17ca6c 100644 --- a/ethereum/config.go +++ b/ethereum/config.go @@ -15,8 +15,7 @@ var GenAddr bool var UseSeed bool var ImportKey string var ExportKey bool - -//var UseGui bool +var LogFile string var DataDir string func Init() { @@ -29,6 +28,7 @@ func Init() { flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.BoolVar(&ExportKey, "export", false, "export private key") flag.StringVar(&OutboundPort, "p", "30303", "listening port") + flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)") flag.StringVar(&DataDir, "dir", ".ethereum", "ethereum data directory") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") flag.IntVar(&MaxPeer, "x", 5, "maximum desired peers") diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index e1e803771c..f00c75ad04 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -25,7 +25,6 @@ func RegisterInterupts(s *eth.Ethereum) { go func() { for sig := range c { fmt.Printf("Shutting down (%v) ... \n", sig) - s.Stop() } }() @@ -36,8 +35,25 @@ func main() { runtime.GOMAXPROCS(runtime.NumCPU()) - ethchain.InitFees() + // set logger + var logger *log.Logger + flags := log.LstdFlags + + if LogFile != "" { + logfile, err := os.OpenFile(LogFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666) + if err != nil { + panic(fmt.Sprintf("error opening log file '%s': %v", LogFile, err)) + } + defer logfile.Close() + log.SetOutput(logfile) + logger = log.New(logfile, "", flags) + } else { + logger = log.New(os.Stdout, "", flags) + } ethutil.ReadConfig(DataDir) + ethutil.Config.Log.AddLogSystem(logger) + + ethchain.InitFees() ethutil.Config.Seed = UseSeed // Instantiated a eth stack @@ -108,7 +124,7 @@ func main() { os.Exit(0) } - log.Printf("Starting Ethereum v%s\n", ethutil.Config.Ver) + ethutil.Config.Log.Infoln(fmt.Sprintf("Starting Ethereum v%s", ethutil.Config.Ver)) // Set the max peers ethereum.MaxPeers = MaxPeer @@ -128,13 +144,13 @@ func main() { ethereum.Start() if StartMining { - log.Printf("Miner started\n") + ethutil.Config.Log.Infoln("Miner started") // Fake block mining. It broadcasts a new block every 5 seconds go func() { if StartMining { - log.Printf("Miner started\n") + ethutil.Config.Log.Infoln("Miner started") go func() { data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) From 32b09d652de90d1626888c4ed6b61fb5bce0a7dc Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 16 Apr 2014 14:57:51 +0100 Subject: [PATCH 3/4] non-interactive option - add -y flag for non-interactive use - refactor main - output to logfile (not ideal..) but not to all ethutil loggers for privacy --- ethereum/config.go | 2 + ethereum/ethereum.go | 104 +++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 57 deletions(-) diff --git a/ethereum/config.go b/ethereum/config.go index 899a17ca6c..b796af5cd6 100644 --- a/ethereum/config.go +++ b/ethereum/config.go @@ -17,12 +17,14 @@ var ImportKey string var ExportKey bool var LogFile string var DataDir string +var NonInteractive bool func Init() { flag.BoolVar(&StartConsole, "c", false, "debug and testing console") flag.BoolVar(&StartMining, "m", false, "start dagger mining") flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits") //flag.BoolVar(&UseGui, "gui", true, "use the gui") + flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") flag.BoolVar(&UseSeed, "seed", true, "seed peers") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index f00c75ad04..4f5c3756ad 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -30,13 +30,27 @@ func RegisterInterupts(s *eth.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" +} + func main() { Init() runtime.GOMAXPROCS(runtime.NumCPU()) // set logger - var logger *log.Logger + var logSys *log.Logger flags := log.LstdFlags if LogFile != "" { @@ -46,12 +60,13 @@ func main() { } defer logfile.Close() log.SetOutput(logfile) - logger = log.New(logfile, "", flags) + logSys = log.New(logfile, "", flags) } else { - logger = log.New(os.Stdout, "", flags) + logSys = log.New(os.Stdout, "", flags) } ethutil.ReadConfig(DataDir) - ethutil.Config.Log.AddLogSystem(logger) + logger := ethutil.Config.Log + logger.AddLogSystem(logSys) ethchain.InitFees() ethutil.Config.Seed = UseSeed @@ -64,67 +79,42 @@ func main() { } ethereum.Port = OutboundPort - if GenAddr { - fmt.Println("This action overwrites your old private key. 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) - } - } - - if r == "y" { + // bookkeeping tasks + switch { + case GenAddr: + if NonInteractive || confirm("This action overwrites your old private key.") { utils.CreateKeyPair(true) } os.Exit(0) - } else { - if len(ImportKey) > 0 { - fmt.Println("This action overwrites your old private key. 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) - } - } - - if r == "y" { - mnemonic := strings.Split(ImportKey, " ") - if len(mnemonic) == 24 { - fmt.Println("Got mnemonic key, importing.") - key := ethutil.MnemonicDecode(mnemonic) - utils.ImportPrivateKey(key) - } else if len(mnemonic) == 1 { - fmt.Println("Got hex key, importing.") - utils.ImportPrivateKey(ImportKey) - } else { - fmt.Println("Did not recognise format, exiting.") - } - os.Exit(0) + case len(ImportKey) > 0: + if NonInteractive || confirm("This action overwrites your old private key.") { + mnemonic := strings.Split(ImportKey, " ") + if len(mnemonic) == 24 { + logSys.Println("Got mnemonic key, importing.") + key := ethutil.MnemonicDecode(mnemonic) + utils.ImportPrivateKey(key) + } else if len(mnemonic) == 1 { + logSys.Println("Got hex key, importing.") + utils.ImportPrivateKey(ImportKey) + } else { + logSys.Println("Did not recognise format, exiting.") } - } else { - utils.CreateKeyPair(false) } - } - - if ExportKey { + os.Exit(0) + case len(ImportKey) == 0: + utils.CreateKeyPair(false) + fallthrough + case ExportKey: key := ethutil.Config.Db.GetKeys()[0] - fmt.Printf("%x\n", key.PrivateKey) + logSys.Println(fmt.Sprintf("prvk: %x\n", key.PrivateKey)) os.Exit(0) - } - - if ShowGenesis { - fmt.Println(ethereum.BlockChain().Genesis()) + case ShowGenesis: + logSys.Println(ethereum.BlockChain().Genesis()) os.Exit(0) } - ethutil.Config.Log.Infoln(fmt.Sprintf("Starting Ethereum v%s", ethutil.Config.Ver)) + // client + logger.Infoln(fmt.Sprintf("Starting Ethereum v%s", ethutil.Config.Ver)) // Set the max peers ethereum.MaxPeers = MaxPeer @@ -144,13 +134,13 @@ func main() { ethereum.Start() if StartMining { - ethutil.Config.Log.Infoln("Miner started") + logger.Infoln("Miner started") // Fake block mining. It broadcasts a new block every 5 seconds go func() { if StartMining { - ethutil.Config.Log.Infoln("Miner started") + logger.Infoln("Miner started") go func() { data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) From 59a7b130191286f141a40d294981805677414eb5 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 16 Apr 2014 15:01:22 +0100 Subject: [PATCH 4/4] typo interrupt --- ethereum/ethereum.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index 4f5c3756ad..881f39ece8 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -17,7 +17,7 @@ import ( const Debug = true // Register interrupt handlers so we can stop the ethereum -func RegisterInterupts(s *eth.Ethereum) { +func RegisterInterrupts(s *eth.Ethereum) { // Buffered chan of one is enough c := make(chan os.Signal, 1) // Notify about interrupts for now @@ -130,7 +130,7 @@ func main() { go console.Start() } - RegisterInterupts(ethereum) + RegisterInterrupts(ethereum) ethereum.Start() if StartMining {