From 176b7802510a667b8973f2be232f7a8213b3474b Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 23 Jun 2014 11:28:05 +0200 Subject: [PATCH 01/27] Added a execBlock method which replays the given block --- ethereum/javascript_runtime.go | 16 ++++++++++++++++ utils/cmd.go | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index b05d39232..737f7663f 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -138,6 +138,7 @@ func (self *JSRE) initStdFuncs() { eth.Set("require", self.require) eth.Set("stopMining", self.stopMining) eth.Set("startMining", self.startMining) + eth.Set("blockDo", self.execBlock) } /* @@ -207,3 +208,18 @@ func (self *JSRE) require(call otto.FunctionCall) otto.Value { return t } + +func (self *JSRE) execBlock(call otto.FunctionCall) otto.Value { + hash, err := call.Argument(0).ToString() + if err != nil { + return otto.UndefinedValue() + } + + err = self.ethereum.BlockDo(ethutil.FromHex(hash)) + if err != nil { + fmt.Println(err) + return otto.FalseValue() + } + + return otto.TrueValue() +} diff --git a/utils/cmd.go b/utils/cmd.go index e1fc0fc00..e66bb2612 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -38,9 +38,11 @@ func DoMining(ethereum *eth.Ethereum) { // Give it some time to connect with peers time.Sleep(3 * time.Second) - for ethereum.IsUpToDate() == false { - time.Sleep(5 * time.Second) - } + /* + for ethereum.IsUpToDate() == false { + time.Sleep(5 * time.Second) + } + */ ethutil.Config.Log.Infoln("Miner started") From f90001e938ce34457cc0ed5822c8e7dff52ec58c Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 11:38:14 +0100 Subject: [PATCH 02/27] add logging start/exit to js console --- ethereum/repl.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ethereum/repl.go b/ethereum/repl.go index 0208459ad..a95d73300 100644 --- a/ethereum/repl.go +++ b/ethereum/repl.go @@ -23,11 +23,13 @@ func NewJSRepl(ethereum *eth.Ethereum) *JSRepl { } func (self *JSRepl) Start() { + logger.Infoln("init JS Console") self.read() } func (self *JSRepl) Stop() { self.re.Stop() + logger.Infoln("exit JS Console") } func (self *JSRepl) parseInput(code string) { From 7bcf875c577cd9710d27dd4511ae21aa62067d79 Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 11:39:09 +0100 Subject: [PATCH 03/27] add logging for jsre --- ethereum/javascript_runtime.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index b05d39232..34b805e7f 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/go-ethereum/utils" "github.com/obscuren/otto" "io/ioutil" @@ -14,6 +15,8 @@ import ( "path/filepath" ) +var jsrelogger = ethlog.NewLogger("JSRE") + type JSRE struct { ethereum *eth.Ethereum vm *otto.Otto @@ -31,7 +34,7 @@ func (jsre *JSRE) LoadExtFile(path string) { if err == nil { jsre.vm.Run(result) } else { - ethutil.Config.Log.Debugln("Could not load file:", path) + jsrelogger.Debugln("Could not load file:", path) } } @@ -65,6 +68,8 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { re.initStdFuncs() + jsrelogger.Infoln("started") + return re } @@ -99,6 +104,7 @@ func (self *JSRE) Stop() { close(self.blockChan) close(self.quitChan) close(self.changeChan) + jsrelogger.Infoln("stopped") } func (self *JSRE) mainLoop() { From d060ae6a368bb880132e548c58b33e2508adc125 Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 11:41:11 +0100 Subject: [PATCH 04/27] changed logger API, functions that allow Gui to implement ethlog.LogSystem for gui logging --- ethereal/ui/gui.go | 57 ++++++++++++++++++++--------------- ethereal/ui/html_container.go | 4 +-- ethereal/ui/ui_lib.go | 6 ++-- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 01d963332..d3b298d90 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/eth-go/ethdb" "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "math/big" @@ -15,6 +16,8 @@ import ( "time" ) +var logger = ethlog.NewLogger("GUI") + type Gui struct { // The main application window win *qml.Window @@ -33,10 +36,11 @@ type Gui struct { addr []byte pub *ethpub.PEthereum + logLevel ethlog.LogLevel } // Create GUI, but doesn't start it -func New(ethereum *eth.Ethereum) *Gui { +func New(ethereum *eth.Ethereum, logLevel ethlog.LogLevel) *Gui { lib := &EthLib{stateManager: ethereum.StateManager(), blockChain: ethereum.BlockChain(), txPool: ethereum.TxPool()} db, err := ethdb.NewLDBDatabase("tx_database") if err != nil { @@ -52,7 +56,7 @@ func New(ethereum *eth.Ethereum) *Gui { pub := ethpub.NewPEthereum(ethereum) - return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub} + return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: logLevel} } func (gui *Gui) Start(assetPath string) { @@ -90,16 +94,15 @@ func (gui *Gui) Start(assetPath string) { win, err = gui.showKeyImport(context) } else { win, err = gui.showWallet(context) - - ethutil.Config.Log.AddLogSystem(gui) + ethlog.AddLogSystem(gui) } if err != nil { - ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'", err) + logger.Errorln("asset not found: you can set an alternative asset path on the command line using option 'asset_path'", err) panic(err) } - ethutil.Config.Log.Infoln("[GUI] Starting GUI") + logger.Infoln("Starting GUI") win.Show() win.Wait() @@ -315,22 +318,6 @@ func (gui *Gui) setPeerInfo() { } } -// Logging functions that log directly to the GUI interface -func (gui *Gui) Println(v ...interface{}) { - str := strings.TrimRight(fmt.Sprintln(v...), "\n") - lines := strings.Split(str, "\n") - for _, line := range lines { - gui.win.Root().Call("addLog", line) - } -} - -func (gui *Gui) Printf(format string, v ...interface{}) { - str := strings.TrimRight(fmt.Sprintf(format, v...), "\n") - lines := strings.Split(str, "\n") - for _, line := range lines { - gui.win.Root().Call("addLog", line) - } -} func (gui *Gui) RegisterName(name string) { keyPair := ethutil.GetKeyRing().Get(0) name = fmt.Sprintf("\"%s\"\n1", name) @@ -357,6 +344,28 @@ func (gui *Gui) ClientId() string { return ethutil.Config.Identifier } -func (gui *Gui) SetLogLevel(level int) { - ethutil.Config.Log.SetLevel(level) +// functions that allow Gui to implement interface ethlog.LogSystem +func (gui *Gui) SetLogLevel(level ethlog.LogLevel) { + gui.logLevel = level +} + +func (gui *Gui) GetLogLevel() ethlog.LogLevel { + return gui.logLevel +} + +func (gui *Gui) Println(v ...interface{}) { + gui.printLog(fmt.Sprintln(v...)) +} + +func (gui *Gui) Printf(format string, v ...interface{}) { + gui.printLog(fmt.Sprintf(format, v...)) +} + +// Print function that logs directly to the GUI +func (gui *Gui) printLog(s string) { + str := strings.TrimRight(s, "\n") + lines := strings.Split(str, "\n") + for _, line := range lines { + gui.win.Root().Call("addLog", line) + } } diff --git a/ethereal/ui/html_container.go b/ethereal/ui/html_container.go index 3867c0353..d7dc80af7 100644 --- a/ethereal/ui/html_container.go +++ b/ethereal/ui/html_container.go @@ -96,11 +96,11 @@ func (app *HtmlApplication) NewWatcher(quitChan chan bool) { app.watcher.Close() break out case <-app.watcher.Event: - //ethutil.Config.Log.Debugln("Got event:", ev) + //logger.Debugln("Got event:", ev) app.webView.Call("reload") case err := <-app.watcher.Error: // TODO: Do something here - ethutil.Config.Log.Infoln("Watcher error:", err) + logger.Infoln("Watcher error:", err) } } }() diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 9f2cca1e0..eb607aac5 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -40,7 +40,7 @@ func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib { func (ui *UiLib) Open(path string) { component, err := ui.engine.LoadFile(path[7:]) if err != nil { - ethutil.Config.Log.Debugln(err) + logger.Debugln(err) } win := component.CreateWindow(nil) @@ -60,7 +60,7 @@ func (ui *UiLib) OpenHtml(path string) { func (ui *UiLib) Muted(content string) { component, err := ui.engine.LoadFile(ui.AssetPath("qml/muted.qml")) if err != nil { - ethutil.Config.Log.Debugln(err) + logger.Debugln(err) return } @@ -144,7 +144,7 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) script, err := ethutil.Compile(data) if err != nil { - ethutil.Config.Log.Debugln(err) + logger.Debugln(err) return } From 456167aca0b795c625d6718ef8a06fe5fcb00c2e Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 12:13:06 +0100 Subject: [PATCH 05/27] fix gitignore to ignore executables --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f816a06a1..de3a847ac 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ *un~ .DS_Store */**/.DS_Store -./ethereum/ethereum +ethereum/ethereum +ethereal/ethereal From 1024766514eea7bb628ec6e5ed974e997b8faefc Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 12:20:59 +0100 Subject: [PATCH 06/27] 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 --- ethereal/config.go | 43 ----- ethereal/ethereum.go | 142 ---------------- ethereal/flags.go | 81 ++++++++++ ethereal/main.go | 43 +++++ ethereal/ui/ui_lib.go | 30 +--- ethereum/cmd.go | 33 ++++ ethereum/ethereum.go | 193 ---------------------- ethereum/{config.go => flags.go} | 32 +++- ethereum/main.go | 47 ++++++ utils/cmd.go | 268 ++++++++++++++++++++++++------- 10 files changed, 438 insertions(+), 474 deletions(-) delete mode 100644 ethereal/config.go delete mode 100644 ethereal/ethereum.go create mode 100644 ethereal/flags.go create mode 100644 ethereal/main.go create mode 100644 ethereum/cmd.go delete mode 100644 ethereum/ethereum.go rename ethereum/{config.go => flags.go} (61%) create mode 100644 ethereum/main.go diff --git a/ethereal/config.go b/ethereal/config.go deleted file mode 100644 index 2315d1435..000000000 --- a/ethereal/config.go +++ /dev/null @@ -1,43 +0,0 @@ -package main - -import ( - "flag" -) - -var Identifier string - -//var StartMining bool -var StartRpc bool -var RpcPort int -var UseUPnP bool -var OutboundPort string -var ShowGenesis bool -var AddPeer string -var MaxPeer int -var GenAddr bool -var UseSeed bool -var ImportKey string -var ExportKey bool -var AssetPath string - -var Datadir string - -func Init() { - flag.StringVar(&Identifier, "id", "", "Custom client identifier") - flag.StringVar(&OutboundPort, "port", "30303", "listening port") - flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") - flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") - flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") - flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") - flag.StringVar(&AssetPath, "asset_path", "", "absolute path to GUI assets directory") - - flag.BoolVar(&ShowGenesis, "genesis", false, "prints genesis header and exits") - flag.BoolVar(&UseSeed, "seed", true, "seed peers") - flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") - flag.BoolVar(&ExportKey, "export", false, "export private key") - flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") - - flag.StringVar(&Datadir, "datadir", ".ethereal", "specifies the datadir to use. Takes precedence over config file.") - - flag.Parse() -} diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go deleted file mode 100644 index 0db1fa4cd..000000000 --- a/ethereal/ethereum.go +++ /dev/null @@ -1,142 +0,0 @@ -package main - -import ( - "fmt" - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/go-ethereum/ethereal/ui" - "github.com/ethereum/go-ethereum/utils" - "github.com/go-qml/qml" - "github.com/rakyll/globalconf" - "log" - "os" - "os/signal" - "path" - "runtime" -) - -const Debug = true - -// Register interrupt handlers so we can stop the ethereum -func RegisterInterupts(s *eth.Ethereum) { - // Buffered chan of one is enough - c := make(chan os.Signal, 1) - // Notify about interrupts for now - signal.Notify(c, os.Interrupt) - go func() { - for sig := range c { - fmt.Printf("Shutting down (%v) ... \n", sig) - - s.Stop() - } - }() -} - -func main() { - Init() - - qml.Init(nil) - - runtime.GOMAXPROCS(runtime.NumCPU()) - - g, err := globalconf.NewWithOptions(&globalconf.Options{ - Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"), - }) - if err != nil { - fmt.Println(err) - } else { - g.ParseAll() - } - ethutil.ReadConfig(Datadir, ethutil.LogFile|ethutil.LogStd, g, Identifier) - - // Instantiated a eth stack - ethereum, err := eth.New(eth.CapDefault, UseUPnP) - if err != nil { - log.Println("eth start err:", err) - return - } - 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" { - 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" { - utils.ImportPrivateKey(ImportKey) - os.Exit(0) - } - } - } - - if ExportKey { - 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) - - os.Exit(0) - } - - if ShowGenesis { - fmt.Println(ethereum.BlockChain().Genesis()) - os.Exit(0) - } - - /* - if StartMining { - utils.DoMining(ethereum) - } - */ - - if StartRpc { - utils.DoRpc(ethereum, RpcPort) - } - - log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver) - - // Set the max peers - ethereum.MaxPeers = MaxPeer - - gui := ethui.New(ethereum) - - ethereum.Start(UseSeed) - - gui.Start(AssetPath) - - // Wait for shutdown - ethereum.WaitForShutdown() -} diff --git a/ethereal/flags.go b/ethereal/flags.go new file mode 100644 index 000000000..18f55071a --- /dev/null +++ b/ethereal/flags.go @@ -0,0 +1,81 @@ +package main + +import ( + "flag" +) + +var Identifier string +var StartRpc bool +var RpcPort int +var UseUPnP bool +var OutboundPort string +var ShowGenesis bool +var AddPeer string +var MaxPeer int +var GenAddr bool +var UseSeed bool +var ImportKey string +var ExportKey bool +var NonInteractive bool +var Datadir string +var LogFile string +var ConfigFile string +var DebugFile string +var LogLevel int + +// flags specific to gui client +var AssetPath string + +func defaultAssetPath() string { + var assetPath string + // If the current working directory is the go-ethereum dir + // assume a debug build and use the source directory as + // asset directory. + pwd, _ := os.Getwd() + if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") { + assetPath = path.Join(pwd, "assets") + } else { + switch runtime.GOOS { + case "darwin": + // Get Binary Directory + exedir, _ := osext.ExecutableFolder() + assetPath = filepath.Join(exedir, "../Resources") + case "linux": + assetPath = "/usr/share/ethereal" + case "window": + fallthrough + default: + assetPath = "." + } + } + return assetPath +} + +func defaultDataDir() string { + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereum") +} + +var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") + +func Init() { + flag.StringVar(&Identifier, "id", "", "Custom client identifier") + flag.StringVar(&OutboundPort, "port", "30303", "listening port") + flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") + flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") + flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") + flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") + flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") + flag.BoolVar(&UseSeed, "seed", true, "seed peers") + flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") + flag.BoolVar(&ExportKey, "export", false, "export private key") + flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)") + flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") + flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") + flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") + flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") + flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") + flag.StringVar(&AssetPath, "asset_path", defaultAssetPath, "absolute path to GUI assets directory") + + flag.Parse() +} diff --git a/ethereal/main.go b/ethereal/main.go new file mode 100644 index 000000000..4af068197 --- /dev/null +++ b/ethereal/main.go @@ -0,0 +1,43 @@ +package main + +import ( + "fmt" + "github.com/ethereum/go-ethereum/ethereal/ui" + "github.com/ethereum/go-ethereum/utils" + "github.com/go-qml/qml" + "runtime" +) + +const Debug = true + +func main() { + qml.Init(nil) + + runtime.GOMAXPROCS(runtime.NumCPU()) + + // precedence: code-internal flag default < config file < environment variables < command line + Init() // parsing command line + utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") + + utils.InitDataDir(Datadir) + + utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile) + + ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer) + + // create, import, export keys + utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) + + if ShowGenesis { + utils.ShowGenesis(ethereum) + } + + if StartRpc { + utils.StartRpc(ethereum, RpcPort) + } + + utils.StartEthereum(ethereum, UseSeed) + + gui := ethui.New(ethereum, logLevel) + gui.Start(AssetPath) +} diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 2dd66f4fd..156d55157 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -29,9 +29,6 @@ type UiLib struct { } func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib { - if assetPath == "" { - assetPath = DefaultAssetPath() - } return &UiLib{engine: engine, eth: eth, assetPath: assetPath} } @@ -88,6 +85,7 @@ func (ui *UiLib) ConnectToPeer(addr string) { func (ui *UiLib) AssetPath(p string) string { return path.Join(ui.assetPath, p) } + func (self *UiLib) StartDbWithContractAndData(contractHash, data string) { dbWindow := NewDebuggerWindow(self) object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash)) @@ -111,29 +109,3 @@ func (self *UiLib) StartDebugger() { dbWindow.Show() } - -func DefaultAssetPath() string { - var base string - // If the current working directory is the go-ethereum dir - // assume a debug build and use the source directory as - // asset directory. - pwd, _ := os.Getwd() - if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") { - base = path.Join(pwd, "assets") - } else { - switch runtime.GOOS { - case "darwin": - // Get Binary Directory - exedir, _ := osext.ExecutableFolder() - base = filepath.Join(exedir, "../Resources") - case "linux": - base = "/usr/share/ethereal" - case "window": - fallthrough - default: - base = "." - } - } - - return base -} diff --git a/ethereum/cmd.go b/ethereum/cmd.go new file mode 100644 index 000000000..0e9c2be8c --- /dev/null +++ b/ethereum/cmd.go @@ -0,0 +1,33 @@ +package main + +import ( + "github.com/ethereum/eth-go" + "github.com/ethereum/go-ethereum/utils" + "os" + "io/ioutil" +) + +func InitJsConsole(ethereum *eth.Ethereum) { + repl := NewJSRepl(ethereum) + go repl.Start() + utils.RegisterInterrupt(func(os.Signal) { + repl.Stop() + ethereum.Stop() + }) +} + +func ExecJsFile (ethereum *eth.Ethereum, InputFile string) { + file, err := os.Open(InputFile) + if err != nil { + logger.Fatalln(err) + } + content, err := ioutil.ReadAll(file) + if err != nil { + logger.Fatalln(err) + } + re := NewJSRE(ethereum) + utils.RegisterInterrupt(func(os.Signal) { + re.Stop() + }) + re.Run(string(content)) +} diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go deleted file mode 100644 index 8812e0a60..000000000 --- a/ethereum/ethereum.go +++ /dev/null @@ -1,193 +0,0 @@ -package main - -import ( - "fmt" - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/go-ethereum/utils" - "github.com/rakyll/globalconf" - "io/ioutil" - "log" - "os" - "os/signal" - "path" - "runtime" - "strings" -) - -const Debug = true - -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) - } - }() -} - -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 logSys *log.Logger - flags := log.LstdFlags - - var lt ethutil.LoggerType - if StartJsConsole || len(InputFile) > 0 { - lt = ethutil.LogFile - } else { - lt = ethutil.LogFile | ethutil.LogStd - } - - g, err := globalconf.NewWithOptions(&globalconf.Options{ - Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"), - }) - if err != nil { - fmt.Println(err) - } else { - g.ParseAll() - } - ethutil.ReadConfig(Datadir, lt, g, Identifier) - - logger := ethutil.Config.Log - - 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) - logSys = log.New(logfile, "", flags) - logger.AddLogSystem(logSys) - } else { - logSys = log.New(os.Stdout, "", flags) - } - - // Instantiated a eth stack - ethereum, err := eth.New(eth.CapDefault, UseUPnP) - if err != nil { - log.Println("eth start err:", err) - return - } - ethereum.Port = OutboundPort - - // bookkeeping tasks - switch { - case GenAddr: - if NonInteractive || confirm("This action overwrites your old private key.") { - utils.CreateKeyPair(true) - } - 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.") - } - } - os.Exit(0) - case ExportKey: - 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) - - os.Exit(0) - case ShowGenesis: - logSys.Println(ethereum.BlockChain().Genesis()) - os.Exit(0) - default: - // Creates a keypair if non exists - utils.CreateKeyPair(false) - } - - // client - logger.Infoln(fmt.Sprintf("Starting Ethereum v%s", ethutil.Config.Ver)) - - // Set the max peers - ethereum.MaxPeers = MaxPeer - - // Set Mining status - ethereum.Mining = StartMining - - if StartMining { - utils.DoMining(ethereum) - } - - if StartJsConsole { - repl := NewJSRepl(ethereum) - - go repl.Start() - - RegisterInterrupt(func(os.Signal) { - repl.Stop() - }) - } else if len(InputFile) > 0 { - file, err := os.Open(InputFile) - if err != nil { - ethutil.Config.Log.Fatal(err) - } - - content, err := ioutil.ReadAll(file) - if err != nil { - ethutil.Config.Log.Fatal(err) - } - - re := NewJSRE(ethereum) - RegisterInterrupt(func(os.Signal) { - re.Stop() - }) - re.Run(string(content)) - } - - if StartRpc { - utils.DoRpc(ethereum, RpcPort) - } - - RegisterInterrupt(func(sig os.Signal) { - fmt.Printf("Shutting down (%v) ... \n", sig) - ethereum.Stop() - }) - - ethereum.Start(UseSeed) - - // Wait for shutdown - ethereum.WaitForShutdown() -} diff --git a/ethereum/config.go b/ethereum/flags.go similarity index 61% rename from ethereum/config.go rename to ethereum/flags.go index a80b47a8e..513d93a6d 100644 --- a/ethereum/config.go +++ b/ethereum/flags.go @@ -4,10 +4,12 @@ import ( "flag" "fmt" "os" + "os/user" + "path" + "github.com/ethereum/eth-go/ethlog" ) var Identifier string -var StartMining bool var StartRpc bool var RpcPort int var UseUPnP bool @@ -19,16 +21,28 @@ var GenAddr bool var UseSeed bool var ImportKey string var ExportKey bool -var LogFile string var NonInteractive bool +var Datadir string +var LogFile string +var ConfigFile string +var DebugFile string +var LogLevel int + +// flags specific to cli client +var StartMining bool var StartJsConsole bool var InputFile string -var Datadir string +func defaultDataDir() string { + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereum") +} + +var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") func Init() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, "%s [options] [filename]:\n", os.Args[0]) + fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line", os.Args[0]) flag.PrintDefaults() } @@ -38,17 +52,19 @@ func Init() { flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") - flag.BoolVar(&StartJsConsole, "js", false, "exp") - - flag.BoolVar(&StartMining, "mine", false, "start dagger mining") flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") flag.BoolVar(&UseSeed, "seed", true, "seed peers") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.BoolVar(&ExportKey, "export", false, "export private key") flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") + flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") + flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") + flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") + flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") - flag.StringVar(&Datadir, "datadir", ".ethereum", "specifies the datadir to use. Takes precedence over config file.") + flag.BoolVar(&StartMining, "mine", false, "start dagger mining") + flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console") flag.Parse() diff --git a/ethereum/main.go b/ethereum/main.go new file mode 100644 index 000000000..bbbaf5541 --- /dev/null +++ b/ethereum/main.go @@ -0,0 +1,47 @@ +package main + +import ( + "github.com/ethereum/go-ethereum/utils" + "github.com/ethereum/eth-go/ethlog" + "runtime" +) + +var logger = ethlog.NewLogger("CLI") + +func main() { + runtime.GOMAXPROCS(runtime.NumCPU()) + + // precedence: code-internal flag default < config file < environment variables < command line + Init() // parsing command line + utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") + + utils.InitDataDir(Datadir) + + utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile) + + ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer) + + // create, import, export keys + utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) + + if ShowGenesis { + utils.ShowGenesis(ethereum) + } + + if StartMining { + utils.StartMining(ethereum) + } + + // better reworked as cases + if StartJsConsole { + InitJsConsole(ethereum) + } else if len(InputFile) > 0 { + ExecJsFile(ethereum, InputFile) + } + + if StartRpc { + utils.StartRpc(ethereum, RpcPort) + } + + utils.StartEthereum(ethereum, UseSeed) +} 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) + } + }() +} + +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" +} + +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)) + } +} + +func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix string) { + ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix) + ethutil.Config.Set("rpcport", "700") +} + +func exit(status int) { + 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 +} + +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() + }) +} + +func ShowGenesis(ethereum *eth.Ethereum) { + 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(` +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) + } +} + +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() + }) + } } var miner ethminer.Miner -func DoMining(ethereum *eth.Ethereum) { - // Set Mining status - ethereum.Mining = true +func StartMining(ethereum *eth.Ethereum) bool { + if !ethereum.Mining { + ethereum.Mining = true - 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() + 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) - } - - ethutil.Config.Log.Infoln("Miner started") - - miner := ethminer.NewDefaultMiner(addr, ethereum) - miner.Start() - }() + 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 } func StopMining(ethereum *eth.Ethereum) bool { - if ethereum.Mining { - miner.Stop() - - ethutil.Config.Log.Infoln("Miner stopped") - - ethereum.Mining = false - - return true - } - - return false -} - -func StartMining(ethereum *eth.Ethereum) bool { - if !ethereum.Mining { - DoMining(ethereum) - - return true - } - - return false + if ethereum.Mining { + miner.Stop() + logger.Infoln("Miner stopped") + ethereum.Mining = false + return true + } + return false } From 6f09a3e8200ba2eeeeb296141d6644d04078a9c4 Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 12:38:23 +0100 Subject: [PATCH 07/27] fix imports in ui_lib and flags cos of defaultAssetPath move; fix logLevel type for gui --- ethereal/flags.go | 15 ++++++++++++++- ethereal/main.go | 5 +---- ethereal/ui/gui.go | 4 ++-- ethereal/ui/ui_lib.go | 4 ---- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ethereal/flags.go b/ethereal/flags.go index 18f55071a..5975439c9 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -1,7 +1,15 @@ package main import ( + "fmt" + "os" + "os/user" + "path" + "github.com/ethereum/eth-go/ethlog" "flag" + "bitbucket.org/kardianos/osext" + "path/filepath" + "runtime" ) var Identifier string @@ -59,6 +67,11 @@ func defaultDataDir() string { var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") func Init() { + flag.Usage = func() { + fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line", os.Args[0]) + flag.PrintDefaults() + } + flag.StringVar(&Identifier, "id", "", "Custom client identifier") flag.StringVar(&OutboundPort, "port", "30303", "listening port") flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") @@ -75,7 +88,7 @@ func Init() { flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") - flag.StringVar(&AssetPath, "asset_path", defaultAssetPath, "absolute path to GUI assets directory") + flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory") flag.Parse() } diff --git a/ethereal/main.go b/ethereal/main.go index 4af068197..10571be7b 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -1,15 +1,12 @@ package main import ( - "fmt" "github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "runtime" ) -const Debug = true - func main() { qml.Init(nil) @@ -38,6 +35,6 @@ func main() { utils.StartEthereum(ethereum, UseSeed) - gui := ethui.New(ethereum, logLevel) + gui := ethui.New(ethereum, LogLevel) gui.Start(AssetPath) } diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index ed29e2485..f3a918ea0 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -40,7 +40,7 @@ type Gui struct { } // Create GUI, but doesn't start it -func New(ethereum *eth.Ethereum, logLevel ethlog.LogLevel) *Gui { +func New(ethereum *eth.Ethereum, logLevel int) *Gui { lib := &EthLib{stateManager: ethereum.StateManager(), blockChain: ethereum.BlockChain(), txPool: ethereum.TxPool()} db, err := ethdb.NewLDBDatabase("tx_database") if err != nil { @@ -56,7 +56,7 @@ func New(ethereum *eth.Ethereum, logLevel ethlog.LogLevel) *Gui { pub := ethpub.NewPEthereum(ethereum) - return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: logLevel} + return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: ethlog.LogLevel(logLevel)} } func (gui *Gui) Start(assetPath string) { diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 156d55157..5f6a9ef0b 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -1,14 +1,10 @@ package ethui import ( - "bitbucket.org/kardianos/osext" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethutil" "github.com/go-qml/qml" - "os" "path" - "path/filepath" - "runtime" ) type memAddr struct { From f6aabb7a90903a681eca44976301620756124137 Mon Sep 17 00:00:00 2001 From: Maran Date: Mon, 23 Jun 2014 16:25:57 +0200 Subject: [PATCH 08/27] Implements QML Apps. Implements #47 You are welcome Stephan. --- ethereal/assets/qml/QmlApp.qml | 22 +++++++++ ethereal/assets/qml/test_app.qml | 81 +++++++++++++++++++++++--------- ethereal/assets/qml/wallet.qml | 10 +++- ethereal/ui/qml_app.go | 59 +++++++++++++++++++++++ ethereal/ui/ui_lib.go | 15 ++---- 5 files changed, 152 insertions(+), 35 deletions(-) create mode 100644 ethereal/assets/qml/QmlApp.qml create mode 100644 ethereal/ui/qml_app.go diff --git a/ethereal/assets/qml/QmlApp.qml b/ethereal/assets/qml/QmlApp.qml new file mode 100644 index 000000000..f5c503f4c --- /dev/null +++ b/ethereal/assets/qml/QmlApp.qml @@ -0,0 +1,22 @@ +import QtQuick 2.0 +import QtQuick.Controls 1.0; +import QtQuick.Layouts 1.0; +import Ethereum 1.0 + +ApplicationWindow { + minimumWidth: 500 + maximumWidth: 500 + maximumHeight: 400 + minimumHeight: 400 + + function onNewBlockCb(block) { + console.log("Please overwrite onNewBlock(block):", block) + } + function onObjectChangeCb(stateObject) { + console.log("Please overwrite onObjectChangeCb(object)", stateObject) + } + function onStorageChangeCb(storageObject) { + var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":"); + console.log("Please overwrite onStorageChangeCb(object)", ev) + } +} diff --git a/ethereal/assets/qml/test_app.qml b/ethereal/assets/qml/test_app.qml index aace4e881..c69587839 100644 --- a/ethereal/assets/qml/test_app.qml +++ b/ethereal/assets/qml/test_app.qml @@ -3,33 +3,68 @@ import QtQuick.Controls 1.0; import QtQuick.Layouts 1.0; import Ethereum 1.0 -ApplicationWindow { - minimumWidth: 500 - maximumWidth: 500 - maximumHeight: 100 - minimumHeight: 100 +QmlApp { + minimumWidth: 350 + maximumWidth: 350 + maximumHeight: 80 + minimumHeight: 80 - title: "Ethereum Dice" + title: "Generic Coin" - TextField { - id: textField - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - placeholderText: "Amount" + property string contractAddr: "f299f6c74515620e4c4cd8fe3d205b5c4f2e25c8" + property string addr: "2ef47100e0787b915105fd5e3f4ff6752079d5cb" + + Component.onCompleted: { + eth.watch(contractAddr, addr) + eth.watch(addr, contractAddr) + setAmount() } - Label { - id: txHash - anchors.bottom: textField.top - anchors.bottomMargin: 5 - anchors.horizontalCenter: parent.horizontalCenter + + function onStorageChangeCb(storageObject) { + setAmount() } - Button { - anchors.top: textField.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: 5 - text: "Place bet" - onClicked: { - txHash.text = eth.createTx("e6716f9544a56c530d868e4bfbacb172315bdead", textField.text) + + function setAmount(){ + var state = eth.getStateObject(contractAddr) + var storage = state.getStorage(addr) + amountLabel.text = storage + } + Column { + spacing: 5 + Row { + spacing: 20 + Label { + id: genLabel + text: "Generic coin balance:" + } + Label { + id: amountLabel + } + } + Row { + spacing: 20 + TextField { + id: address + placeholderText: "Address" + } + TextField { + id: amount + placeholderText: "Amount" + } + } + Button { + text: "Send coins" + onClicked: { + var privKey = eth.getKey().privateKey + if(privKey){ + var result = eth.transact(privKey, contractAddr, 0,"100000","250", "0x" + address.text + "\n" + amount.text) + resultTx.text = result.hash + } + } + } + Label { + id: resultTx } } + } diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index a7c03f6d1..454d0f3f0 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -372,7 +372,15 @@ ApplicationWindow { onAccepted: { //ui.open(openAppDialog.fileUrl.toString()) //ui.openHtml(Qt.resolvedUrl(ui.assetPath("test.html"))) - ui.openHtml(openAppDialog.fileUrl.toString()) + var path = openAppDialog.fileUrl.toString() + console.log(path) + var ext = path.split('.').pop() + console.log(ext) + if(ext == "html" || ext == "htm") { + ui.openHtml(path) + }else if(ext == "qml"){ + ui.openQml(path) + } } } diff --git a/ethereal/ui/qml_app.go b/ethereal/ui/qml_app.go new file mode 100644 index 000000000..d47751616 --- /dev/null +++ b/ethereal/ui/qml_app.go @@ -0,0 +1,59 @@ +package ethui + +import ( + "github.com/ethereum/eth-go/ethchain" + "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethutil" + "github.com/go-qml/qml" +) + +type QmlApplication struct { + win *qml.Window + engine *qml.Engine + lib *UiLib + path string +} + +func NewQmlApplication(path string, lib *UiLib) *QmlApplication { + engine := qml.NewEngine() + return &QmlApplication{engine: engine, path: path, lib: lib} +} + +func (app *QmlApplication) Create() error { + component, err := app.engine.LoadFile(app.path) + if err != nil { + ethutil.Config.Log.Debugln(err) + } + app.win = component.CreateWindow(nil) + + return nil +} + +func (app *QmlApplication) Destroy() { + app.engine.Destroy() +} + +func (app *QmlApplication) NewWatcher(quitChan chan bool) { +} + +// Events +func (app *QmlApplication) NewBlock(block *ethchain.Block) { + pblock := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())} + app.win.Call("onNewBlockCb", pblock) +} + +func (app *QmlApplication) ObjectChanged(stateObject *ethchain.StateObject) { + app.win.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject)) +} + +func (app *QmlApplication) StorageChanged(storageObject *ethchain.StorageState) { + app.win.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject)) +} + +// Getters +func (app *QmlApplication) Engine() *qml.Engine { + return app.engine +} +func (app *QmlApplication) Window() *qml.Window { + return app.win +} diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 791d4fe09..908497be3 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -35,18 +35,11 @@ func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib { return &UiLib{engine: engine, eth: eth, assetPath: assetPath} } -// Opens a QML file (external application) -func (ui *UiLib) Open(path string) { - component, err := ui.engine.LoadFile(path[7:]) - if err != nil { - ethutil.Config.Log.Debugln(err) - } - win := component.CreateWindow(nil) +func (ui *UiLib) OpenQml(path string) { + container := NewQmlApplication(path[7:], ui) + app := NewExtApplication(container, ui) - go func() { - win.Show() - win.Wait() - }() + go app.run() } func (ui *UiLib) OpenHtml(path string) { From 17e8d7519b1aac322db08b857e63db82a322d6cf Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 24 Jun 2014 09:36:05 +0200 Subject: [PATCH 09/27] Renamed execBlock --- ethereum/javascript_runtime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index 737f7663f..92d9c119f 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -138,7 +138,7 @@ func (self *JSRE) initStdFuncs() { eth.Set("require", self.require) eth.Set("stopMining", self.stopMining) eth.Set("startMining", self.startMining) - eth.Set("blockDo", self.execBlock) + eth.Set("execBlock", self.execBlock) } /* From fd1ddbce6892e3f0e09eec68687b6ef34b216888 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 24 Jun 2014 10:09:02 +0200 Subject: [PATCH 10/27] Save repl history to file and recall on next session --- ethereum/repl.go | 27 ++++++++++++++++++++++++++- ethereum/repl_darwin.go | 4 +++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ethereum/repl.go b/ethereum/repl.go index 0208459ad..dd8d08179 100644 --- a/ethereum/repl.go +++ b/ethereum/repl.go @@ -1,10 +1,15 @@ package main import ( + "bufio" "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethutil" "github.com/obscuren/otto" + "io" + "os" + "path" ) type Repl interface { @@ -16,18 +21,38 @@ type JSRepl struct { re *JSRE prompt string + + history *os.File } func NewJSRepl(ethereum *eth.Ethereum) *JSRepl { - return &JSRepl{re: NewJSRE(ethereum), prompt: "> "} + hist, err := os.OpenFile(path.Join(ethutil.Config.ExecPath, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm) + if err != nil { + panic(err) + } + + return &JSRepl{re: NewJSRE(ethereum), prompt: "> ", history: hist} } func (self *JSRepl) Start() { + reader := bufio.NewReader(self.history) + for { + line, err := reader.ReadString('\n') + if err != nil && err == io.EOF { + break + } else if err != nil { + fmt.Println("error reading history", err) + break + } + + addHistory(line[:len(line)-1]) + } self.read() } func (self *JSRepl) Stop() { self.re.Stop() + self.history.Close() } func (self *JSRepl) parseInput(code string) { diff --git a/ethereum/repl_darwin.go b/ethereum/repl_darwin.go index b61d4edd7..62b40059a 100644 --- a/ethereum/repl_darwin.go +++ b/ethereum/repl_darwin.go @@ -102,7 +102,9 @@ L: break L } - addHistory(str[:len(str)-1]) //allow user to recall this line + hist := str[:len(str)-1] + addHistory(hist) //allow user to recall this line + self.history.WriteString(str) self.parseInput(str) From 1e965cb8f5c63d73a5aac1556a2638345ba2824c Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 25 Jun 2014 09:47:11 +0200 Subject: [PATCH 11/27] Moved BlockDo to utils --- ethereum/javascript_runtime.go | 2 +- utils/cmd.go | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index 92d9c119f..a9b12629a 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -215,7 +215,7 @@ func (self *JSRE) execBlock(call otto.FunctionCall) otto.Value { return otto.UndefinedValue() } - err = self.ethereum.BlockDo(ethutil.FromHex(hash)) + err = utils.BlockDo(self.ethereum, ethutil.FromHex(hash)) if err != nil { fmt.Println(err) return otto.FalseValue() diff --git a/utils/cmd.go b/utils/cmd.go index e66bb2612..368f2381e 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -1,6 +1,7 @@ package utils import ( + "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethminer" "github.com/ethereum/eth-go/ethpub" @@ -74,3 +75,21 @@ func StartMining(ethereum *eth.Ethereum) bool { return false } + +// Replay block +func BlockDo(ethereum *eth.Ethereum, hash []byte) error { + block := ethereum.BlockChain().GetBlock(hash) + if block == nil { + return fmt.Errorf("unknown block %x", hash) + } + + parent := ethereum.BlockChain().GetBlock(block.PrevHash) + + _, err := ethereum.StateManager().ApplyDiff(parent.State(), parent, block) + if err != nil { + return err + } + + return nil + +} From 9654b809120d1cc3c53ffe268fe47869ef0dc0a8 Mon Sep 17 00:00:00 2001 From: Maran Date: Wed, 25 Jun 2014 16:12:53 +0200 Subject: [PATCH 12/27] Implemented TX History for ethjs --- ethereal/assets/ext/ethereum.js | 3 +++ ethereal/assets/qml/webapp.qml | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/ethereal/assets/ext/ethereum.js b/ethereal/assets/ext/ethereum.js index c58fe24c2..de6fb0255 100644 --- a/ethereal/assets/ext/ethereum.js +++ b/ethereal/assets/ext/ethereum.js @@ -58,6 +58,9 @@ window.eth = { getBalanceAt: function(address, cb) { postData({call: "getBalance", args: [address]}, cb); }, + getTransactionsFor: function(address, cb) { + postData({call: "getTransactionsFor", args: [address]}, cb); + }, getSecretToAddress: function(sec, cb) { postData({call: "getSecretToAddress", args: [sec]}, cb); diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 4a5a1293a..63927f0eb 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -103,6 +103,12 @@ ApplicationWindow { postData(data._seed,stateObject) break + case "getTransactionsFor": + require(1); + var txs = eth.getTransactionsFor(data.args[0], true) + postData(data._seed, txs) + + break case "getBalance": require(1); From 1268413ba7f7a3bc0c60fbe47e582864b2de8ccd Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 25 Jun 2014 17:26:16 +0200 Subject: [PATCH 13/27] Removed old compile methods --- utils/compile.go | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 utils/compile.go diff --git a/utils/compile.go b/utils/compile.go deleted file mode 100644 index 967bd099b..000000000 --- a/utils/compile.go +++ /dev/null @@ -1,41 +0,0 @@ -package utils - -import ( - "fmt" - "github.com/obscuren/mutan" - "strings" -) - -// General compile function -func Compile(script string) ([]byte, error) { - byteCode, errors := mutan.Compile(strings.NewReader(script), false) - if len(errors) > 0 { - var errs string - for _, er := range errors { - if er != nil { - errs += er.Error() - } - } - return nil, fmt.Errorf("%v", errs) - } - - return byteCode, nil -} - -func CompileScript(script string) ([]byte, []byte, error) { - // Preprocess - mainInput, initInput := mutan.PreParse(script) - // Compile main script - mainScript, err := Compile(mainInput) - if err != nil { - return nil, nil, err - } - - // Compile init script - initScript, err := Compile(initInput) - if err != nil { - return nil, nil, err - } - - return mainScript, initScript, nil -} From 39c0f7f3865965ae64ea51aba4de5b7350539ea8 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 16:53:19 +0100 Subject: [PATCH 14/27] fix logSlider: now has 5 levels, initialized to gui.GetLogLevel which is set through command line flag (defaults to InfoLevel) --- ethereal/assets/qml/wallet.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 454d0f3f0..eb3aa6df5 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -319,7 +319,7 @@ ApplicationWindow { Slider { id: logLevelSlider - value: 1 + value: eth.getLogLevel() anchors { right: parent.right top: parent.top @@ -332,7 +332,7 @@ ApplicationWindow { } orientation: Qt.Vertical - maximumValue: 3 + maximumValue: 5 stepSize: 1 onValueChanged: { From 8ee1abecb971e39ad5e0ed5b199ff4bf553ca67a Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 16:54:29 +0100 Subject: [PATCH 15/27] update log levels to include DebugDetail; correct default datadir for ethereal --- ethereal/flags.go | 5 +++-- ethereum/flags.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ethereal/flags.go b/ethereal/flags.go index 5975439c9..5ab4c80e2 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -61,7 +61,7 @@ func defaultAssetPath() string { func defaultDataDir() string { usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereum") + return path.Join(usr.HomeDir, ".ethereal") } var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") @@ -87,7 +87,8 @@ func Init() { flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") - flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") + flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") + flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory") flag.Parse() diff --git a/ethereum/flags.go b/ethereum/flags.go index 513d93a6d..99aa9b250 100644 --- a/ethereum/flags.go +++ b/ethereum/flags.go @@ -61,7 +61,7 @@ func Init() { flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") - flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") + flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") flag.BoolVar(&StartMining, "mine", false, "start dagger mining") flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console") From bf57e9603b9ef2c96e8e6d7c3d22ea674392d56b Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 18:09:42 +0100 Subject: [PATCH 16/27] add newline to help usage msg --- ethereal/flags.go | 2 +- ethereum/flags.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ethereal/flags.go b/ethereal/flags.go index 5ab4c80e2..7e83e355f 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -68,7 +68,7 @@ var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") func Init() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line", os.Args[0]) + fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line\n", os.Args[0]) flag.PrintDefaults() } diff --git a/ethereum/flags.go b/ethereum/flags.go index 99aa9b250..232a2bc92 100644 --- a/ethereum/flags.go +++ b/ethereum/flags.go @@ -42,7 +42,7 @@ var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") func Init() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line", os.Args[0]) + fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line\n", os.Args[0]) flag.PrintDefaults() } From 6763d28a170b4e91c78532feed68805fe88c41dd Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 18:18:22 +0100 Subject: [PATCH 17/27] repl.Stop() to only if running, fixes panic after js> exit followed by interrupt --- ethereum/repl.go | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/ethereum/repl.go b/ethereum/repl.go index c162c78b0..34380a06f 100644 --- a/ethereum/repl.go +++ b/ethereum/repl.go @@ -23,6 +23,8 @@ type JSRepl struct { prompt string history *os.File + + running bool } func NewJSRepl(ethereum *eth.Ethereum) *JSRepl { @@ -35,26 +37,32 @@ func NewJSRepl(ethereum *eth.Ethereum) *JSRepl { } func (self *JSRepl) Start() { - logger.Infoln("init JS Console") - reader := bufio.NewReader(self.history) - for { - line, err := reader.ReadString('\n') - if err != nil && err == io.EOF { - break - } else if err != nil { - fmt.Println("error reading history", err) - break - } + if !self.running { + self.running = true + logger.Infoln("init JS Console") + reader := bufio.NewReader(self.history) + for { + line, err := reader.ReadString('\n') + if err != nil && err == io.EOF { + break + } else if err != nil { + fmt.Println("error reading history", err) + break + } - addHistory(line[:len(line)-1]) + addHistory(line[:len(line)-1]) + } + self.read() } - self.read() } func (self *JSRepl) Stop() { - self.re.Stop() - logger.Infoln("exit JS Console") - self.history.Close() + if self.running { + self.running = false + self.re.Stop() + logger.Infoln("exit JS Console") + self.history.Close() + } } func (self *JSRepl) parseInput(code string) { From 9a06efd0809c370451c5e85ce4688104cd5df461 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 18:28:38 +0100 Subject: [PATCH 18/27] new logger API for upstream merge --- ethereal/ui/qml_app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereal/ui/qml_app.go b/ethereal/ui/qml_app.go index d47751616..39ab7f922 100644 --- a/ethereal/ui/qml_app.go +++ b/ethereal/ui/qml_app.go @@ -22,7 +22,7 @@ func NewQmlApplication(path string, lib *UiLib) *QmlApplication { func (app *QmlApplication) Create() error { component, err := app.engine.LoadFile(app.path) if err != nil { - ethutil.Config.Log.Debugln(err) + logger.Warnln(err) } app.win = component.CreateWindow(nil) From b3367ec0e3e69694481cccd9335a63d2c559a543 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 10:37:48 +0200 Subject: [PATCH 19/27] Added option to not break eachline --- ethereal/assets/debugger/debugger.qml | 6 ++++++ ethereal/ui/debugger.go | 24 ++++++++++++++---------- ethereal/ui/gui.go | 4 ---- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index 31e0eb781..6f53697c9 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -208,6 +208,12 @@ ApplicationWindow { } text: "Next" } + CheckBox { + id: breakEachLine + objectName: "breakEachLine" + text: "Break each instruction" + checked: true + } } } diff --git a/ethereal/ui/debugger.go b/ethereal/ui/debugger.go index 9d60c7587..f49741e09 100644 --- a/ethereal/ui/debugger.go +++ b/ethereal/ui/debugger.go @@ -26,7 +26,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow { } win := component.CreateWindow(nil) - db := &Debugger{win, make(chan bool), make(chan bool), true, false} + db := &Debugger{win, make(chan bool), make(chan bool), true, false, true} return &DebuggerWindow{engine: engine, win: win, lib: lib, Db: db} } @@ -59,6 +59,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data if !self.Db.done { self.Db.Q <- true } + self.Db.breakOnInstr = self.win.Root().ObjectByName("breakEachLine").Bool("checked") defer func() { if r := recover(); r != nil { @@ -164,6 +165,7 @@ type Debugger struct { N chan bool Q chan bool done, interrupt bool + breakOnInstr bool } type storeVal struct { @@ -190,16 +192,18 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())}) }) -out: - for { - select { - case <-d.N: - break out - case <-d.Q: - d.interrupt = true - d.clearBuffers() + if d.breakOnInstr { + out: + for { + select { + case <-d.N: + break out + case <-d.Q: + d.interrupt = true + d.clearBuffers() - return false + return false + } } } diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 1037ba5ac..7b59e2fbc 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -154,10 +154,6 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window { gui.win = win gui.uiLib.win = win - db := &Debugger{gui.win, make(chan bool), make(chan bool), true, false} - gui.lib.Db = db - gui.uiLib.Db = db - return gui.win } func (gui *Gui) setInitialBlockChain() { From 2f96652bb408e65c205317403d749ba9a395c6bb Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 10:47:45 +0100 Subject: [PATCH 20/27] interrupt handlers now ordered --- ethereal/main.go | 12 ++++++++---- ethereum/cmd.go | 1 - ethereum/main.go | 2 ++ utils/cmd.go | 25 ++++++++++++++----------- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ethereal/main.go b/ethereal/main.go index 10571be7b..5dfab4c45 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -8,10 +8,12 @@ import ( ) func main() { - qml.Init(nil) - runtime.GOMAXPROCS(runtime.NumCPU()) + utils.HandleInterrupt() + + qml.Init(nil) + // precedence: code-internal flag default < config file < environment variables < command line Init() // parsing command line utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") @@ -33,8 +35,10 @@ func main() { utils.StartRpc(ethereum, RpcPort) } - utils.StartEthereum(ethereum, UseSeed) - gui := ethui.New(ethereum, LogLevel) gui.Start(AssetPath) + + utils.StartEthereum(ethereum, UseSeed) + + } diff --git a/ethereum/cmd.go b/ethereum/cmd.go index 0e9c2be8c..2dfd54666 100644 --- a/ethereum/cmd.go +++ b/ethereum/cmd.go @@ -12,7 +12,6 @@ func InitJsConsole(ethereum *eth.Ethereum) { go repl.Start() utils.RegisterInterrupt(func(os.Signal) { repl.Stop() - ethereum.Stop() }) } diff --git a/ethereum/main.go b/ethereum/main.go index bbbaf5541..800486e56 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -11,6 +11,8 @@ var logger = ethlog.NewLogger("CLI") func main() { runtime.GOMAXPROCS(runtime.NumCPU()) + utils.HandleInterrupt() + // precedence: code-internal flag default < config file < environment variables < command line Init() // parsing command line utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") 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() - }) } } From b89076faa2748a41031c4bc33bbdeba3e2effd01 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 12:10:11 +0200 Subject: [PATCH 21/27] Added amount to contract during debugging --- ethereal/assets/debugger/debugger.qml | 6 +++--- ethereal/ui/debugger.go | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index 6f53697c9..d54c79523 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -10,9 +10,9 @@ ApplicationWindow { visible: false title: "IceCREAM" minimumWidth: 1280 - minimumHeight: 900 + minimumHeight: 700 width: 1290 - height: 900 + height: 700 property alias codeText: codeEditor.text property alias dataText: rawDataField.text @@ -56,7 +56,7 @@ ApplicationWindow { Rectangle { color: "#00000000" - height: 500 + height: 330 anchors.left: parent.left anchors.right: parent.right diff --git a/ethereal/ui/debugger.go b/ethereal/ui/debugger.go index f49741e09..85dd45563 100644 --- a/ethereal/ui/debugger.go +++ b/ethereal/ui/debugger.go @@ -96,16 +96,20 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data self.win.Root().Call("setAsm", str) } - gas := ethutil.Big(gasStr) - gasPrice := ethutil.Big(gasPriceStr) - // Contract addr as test address - keyPair := ethutil.GetKeyRing().Get(0) - callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script) + var ( + gas = ethutil.Big(gasStr) + gasPrice = ethutil.Big(gasPriceStr) + value = ethutil.Big(valueStr) + // Contract addr as test address + keyPair = ethutil.GetKeyRing().Get(0) + callerTx = ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script) + ) callerTx.Sign(keyPair.PrivateKey) state := self.lib.eth.BlockChain().CurrentBlock.State() account := self.lib.eth.StateManager().TransState().GetAccount(keyPair.Address()) contract := ethchain.MakeContract(callerTx, state) + contract.Amount = value callerClosure := ethchain.NewClosure(account, contract, script, state, gas, gasPrice) block := self.lib.eth.BlockChain().CurrentBlock From c0a05fcf8984f04f198c5c0f8be4f73090f99403 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 12:13:31 +0100 Subject: [PATCH 22/27] log slider - only add the gui logger after window is shown otherwise slider wont be shown - need to silence gui logger after window closed otherwise logsystem hangs - gui.GetLogLevelInt() extra function needed to give correcty int typecast value to gui widget that sets initial loglevel to default --- ethereal/assets/qml/wallet.qml | 2 +- ethereal/ui/gui.go | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index eb3aa6df5..84f8fd5cf 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -319,7 +319,7 @@ ApplicationWindow { Slider { id: logLevelSlider - value: eth.getLogLevel() + value: eth.getLogLevelInt() anchors { right: parent.right top: parent.top diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index f3a918ea0..8845f6af3 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -90,11 +90,12 @@ func (gui *Gui) Start(assetPath string) { var win *qml.Window var err error + var addlog = false if len(data) == 0 { win, err = gui.showKeyImport(context) } else { win, err = gui.showWallet(context) - ethlog.AddLogSystem(gui) + addlog = true } if err != nil { logger.Errorln("asset not found: you can set an alternative asset path on the command line using option 'asset_path'", err) @@ -105,8 +106,13 @@ func (gui *Gui) Start(assetPath string) { logger.Infoln("Starting GUI") win.Show() + // only add the gui logger after window is shown otherwise slider wont be shown + if addlog { + ethlog.AddLogSystem(gui) + } win.Wait() - + // need to silence gui logger after window closed otherwise logsystem hangs + gui.SetLogLevel(ethlog.Silence) gui.eth.Stop() } @@ -353,6 +359,12 @@ func (gui *Gui) GetLogLevel() ethlog.LogLevel { return gui.logLevel } +// this extra function needed to give int typecast value to gui widget +// that sets initial loglevel to default +func (gui *Gui) GetLogLevelInt() int { + return int(gui.logLevel) +} + func (gui *Gui) Println(v ...interface{}) { gui.printLog(fmt.Sprintln(v...)) } From 21d86ca486a88c936a1fe71f78d76c78df36a7eb Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 16:26:14 +0100 Subject: [PATCH 23/27] 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 --- ethereal/main.go | 27 ++++++++++++++++++++++----- ethereal/ui/gui.go | 16 +++++++++++++--- ethereum/main.go | 4 ++++ utils/cmd.go | 13 ++++++++----- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/ethereal/main.go b/ethereal/main.go index 5dfab4c45..cfd85afe7 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -3,17 +3,24 @@ package main import ( "github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/utils" + "github.com/ethereum/eth-go/ethlog" "github.com/go-qml/qml" "runtime" + "os" ) func main() { runtime.GOMAXPROCS(runtime.NumCPU()) - utils.HandleInterrupt() - qml.Init(nil) + var interrupted = false + utils.RegisterInterrupt(func(os.Signal) { + interrupted = true + }) + + utils.HandleInterrupt() + // precedence: code-internal flag default < config file < environment variables < command line Init() // parsing command line utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") @@ -36,9 +43,19 @@ func main() { } gui := ethui.New(ethereum, LogLevel) - gui.Start(AssetPath) + utils.RegisterInterrupt(func(os.Signal) { + gui.Stop() + }) utils.StartEthereum(ethereum, UseSeed) - - + // gui blocks the main thread + gui.Start(AssetPath) + // we need to run the interrupt callbacks in case gui is closed + // this skips if we got here by actual interrupt stopping the GUI + if !interrupted { + utils.RunInterruptCallbacks(os.Interrupt) + } + // this blocks the thread + ethereum.WaitForShutdown() + ethlog.Flush() } diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 8845f6af3..938037b90 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -37,6 +37,7 @@ type Gui struct { pub *ethpub.PEthereum logLevel ethlog.LogLevel + open bool } // Create GUI, but doesn't start it @@ -56,7 +57,7 @@ func New(ethereum *eth.Ethereum, logLevel int) *Gui { pub := ethpub.NewPEthereum(ethereum) - return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: ethlog.LogLevel(logLevel)} + return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: ethlog.LogLevel(logLevel), open: false} } func (gui *Gui) Start(assetPath string) { @@ -104,7 +105,7 @@ func (gui *Gui) Start(assetPath string) { } logger.Infoln("Starting GUI") - + gui.open = true win.Show() // only add the gui logger after window is shown otherwise slider wont be shown if addlog { @@ -113,7 +114,16 @@ func (gui *Gui) Start(assetPath string) { win.Wait() // need to silence gui logger after window closed otherwise logsystem hangs gui.SetLogLevel(ethlog.Silence) - gui.eth.Stop() + gui.open = false +} + +func (gui *Gui) Stop() { + if gui.open { + gui.SetLogLevel(ethlog.Silence) + gui.open = false + gui.win.Hide() + } + logger.Infoln("Stopped") } func (gui *Gui) ToggleMining() { diff --git a/ethereum/main.go b/ethereum/main.go index 800486e56..93b2b47d3 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -46,4 +46,8 @@ func main() { } utils.StartEthereum(ethereum, UseSeed) + + // this blocks the thread + ethereum.WaitForShutdown() + ethlog.Flush() } 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) { From 8100903d922dbced4f03db18ff766f28bdd2f706 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 18:58:37 +0200 Subject: [PATCH 24/27] Increase width of asm instruction --- ethereal/assets/debugger/debugger.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index d54c79523..3e653882c 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -42,7 +42,7 @@ ApplicationWindow { TableView { id: asmTableView width: 200 - TableViewColumn{ role: "value" ; title: "" ; width: 100 } + TableViewColumn{ role: "value" ; title: "" ; width: 200 } model: asmModel } From b57ee874852cc49210c68dce14eb45db448d9ae7 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 19:04:53 +0200 Subject: [PATCH 25/27] bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7dc1999c3..d2a55ce0f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Ethereum Ethereum Go Client © 2014 Jeffrey Wilcke. -Current state: Proof of Concept 5.0 RC14. +Current state: Proof of Concept 0.5.15. For the development package please see the [eth-go package](https://github.com/ethereum/eth-go). From ae5ace16190d48bfe7a0364fdb0b51644518ec42 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 18:41:36 +0100 Subject: [PATCH 26/27] go fmt --- ethereal/flags.go | 16 +- ethereal/main.go | 32 ++-- ethereal/ui/gui.go | 6 +- ethereum/cmd.go | 46 ++--- ethereum/flags.go | 10 +- ethereum/javascript_runtime.go | 4 +- ethereum/main.go | 14 +- utils/cmd.go | 310 ++++++++++++++++----------------- 8 files changed, 219 insertions(+), 219 deletions(-) diff --git a/ethereal/flags.go b/ethereal/flags.go index 7e83e355f..9bed38d9f 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -1,13 +1,13 @@ package main import ( - "fmt" - "os" - "os/user" - "path" - "github.com/ethereum/eth-go/ethlog" - "flag" "bitbucket.org/kardianos/osext" + "flag" + "fmt" + "github.com/ethereum/eth-go/ethlog" + "os" + "os/user" + "path" "path/filepath" "runtime" ) @@ -60,8 +60,8 @@ func defaultAssetPath() string { } func defaultDataDir() string { - usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereal") + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereal") } var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") diff --git a/ethereal/main.go b/ethereal/main.go index cfd85afe7..799b50e4b 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -1,12 +1,12 @@ package main import ( + "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/utils" - "github.com/ethereum/eth-go/ethlog" "github.com/go-qml/qml" - "runtime" "os" + "runtime" ) func main() { @@ -32,11 +32,11 @@ func main() { ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer) // create, import, export keys - utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) + utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) - if ShowGenesis { - utils.ShowGenesis(ethereum) - } + if ShowGenesis { + utils.ShowGenesis(ethereum) + } if StartRpc { utils.StartRpc(ethereum, RpcPort) @@ -45,17 +45,17 @@ func main() { gui := ethui.New(ethereum, LogLevel) utils.RegisterInterrupt(func(os.Signal) { - gui.Stop() - }) + gui.Stop() + }) utils.StartEthereum(ethereum, UseSeed) - // gui blocks the main thread - gui.Start(AssetPath) - // we need to run the interrupt callbacks in case gui is closed - // this skips if we got here by actual interrupt stopping the GUI + // gui blocks the main thread + gui.Start(AssetPath) + // we need to run the interrupt callbacks in case gui is closed + // this skips if we got here by actual interrupt stopping the GUI if !interrupted { utils.RunInterruptCallbacks(os.Interrupt) - } - // this blocks the thread - ethereum.WaitForShutdown() - ethlog.Flush() + } + // this blocks the thread + ethereum.WaitForShutdown() + ethlog.Flush() } diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 83b1508e9..be7b395d8 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethdb" + "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "math/big" @@ -35,9 +35,9 @@ type Gui struct { addr []byte - pub *ethpub.PEthereum + pub *ethpub.PEthereum logLevel ethlog.LogLevel - open bool + open bool } // Create GUI, but doesn't start it diff --git a/ethereum/cmd.go b/ethereum/cmd.go index 2dfd54666..08147824d 100644 --- a/ethereum/cmd.go +++ b/ethereum/cmd.go @@ -1,32 +1,32 @@ package main import ( - "github.com/ethereum/eth-go" - "github.com/ethereum/go-ethereum/utils" - "os" - "io/ioutil" + "github.com/ethereum/eth-go" + "github.com/ethereum/go-ethereum/utils" + "io/ioutil" + "os" ) func InitJsConsole(ethereum *eth.Ethereum) { - repl := NewJSRepl(ethereum) - go repl.Start() - utils.RegisterInterrupt(func(os.Signal) { - repl.Stop() - }) + repl := NewJSRepl(ethereum) + go repl.Start() + utils.RegisterInterrupt(func(os.Signal) { + repl.Stop() + }) } -func ExecJsFile (ethereum *eth.Ethereum, InputFile string) { - file, err := os.Open(InputFile) - if err != nil { - logger.Fatalln(err) - } - content, err := ioutil.ReadAll(file) - if err != nil { - logger.Fatalln(err) - } - re := NewJSRE(ethereum) - utils.RegisterInterrupt(func(os.Signal) { - re.Stop() - }) - re.Run(string(content)) +func ExecJsFile(ethereum *eth.Ethereum, InputFile string) { + file, err := os.Open(InputFile) + if err != nil { + logger.Fatalln(err) + } + content, err := ioutil.ReadAll(file) + if err != nil { + logger.Fatalln(err) + } + re := NewJSRE(ethereum) + utils.RegisterInterrupt(func(os.Signal) { + re.Stop() + }) + re.Run(string(content)) } diff --git a/ethereum/flags.go b/ethereum/flags.go index 232a2bc92..8fb87cf34 100644 --- a/ethereum/flags.go +++ b/ethereum/flags.go @@ -3,10 +3,10 @@ package main import ( "flag" "fmt" + "github.com/ethereum/eth-go/ethlog" "os" - "os/user" - "path" - "github.com/ethereum/eth-go/ethlog" + "os/user" + "path" ) var Identifier string @@ -34,8 +34,8 @@ var StartJsConsole bool var InputFile string func defaultDataDir() string { - usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereum") + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereum") } var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index 0a9a882ad..0dfe07a54 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -1,12 +1,12 @@ - package main +package main import ( "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" + "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/go-ethereum/utils" "github.com/obscuren/otto" "io/ioutil" diff --git a/ethereum/main.go b/ethereum/main.go index 93b2b47d3..6b1995eec 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/ethereum/go-ethereum/utils" "github.com/ethereum/eth-go/ethlog" + "github.com/ethereum/go-ethereum/utils" "runtime" ) @@ -24,11 +24,11 @@ func main() { ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer) // create, import, export keys - utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) + utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) - if ShowGenesis { - utils.ShowGenesis(ethereum) - } + if ShowGenesis { + utils.ShowGenesis(ethereum) + } if StartMining { utils.StartMining(ethereum) @@ -48,6 +48,6 @@ func main() { utils.StartEthereum(ethereum, UseSeed) // this blocks the thread - ethereum.WaitForShutdown() - ethlog.Flush() + ethereum.WaitForShutdown() + ethlog.Flush() } 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) + 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 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 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) - } - } + _, 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 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 !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() + 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 + 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 From a68bfd215f7b1859c1b14b0df59f3260b35df828 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 19:54:00 +0200 Subject: [PATCH 27/27] bump --- ethereal/ui/gui.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index be7b395d8..f861236aa 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -61,7 +61,7 @@ func New(ethereum *eth.Ethereum, logLevel int) *Gui { } func (gui *Gui) Start(assetPath string) { - const version = "0.5.0 RC14" + const version = "0.5.0 RC15" defer gui.txDb.Close()