diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/evm/main.go | 12 | ||||
| -rw-r--r-- | cmd/geth/main.go | 23 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 2 |
3 files changed, 29 insertions, 8 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index aa48f6ede..09cc9ee1f 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -117,10 +117,13 @@ func run(ctx *cli.Context) error { statedb, _ := state.New(common.Hash{}, db) sender := statedb.CreateAccount(common.StringToAddress("sender")) + logger := vm.NewStructLogger(nil) + vmenv := NewEnv(statedb, common.StringToAddress("evmuser"), common.Big(ctx.GlobalString(ValueFlag.Name)), vm.Config{ Debug: ctx.GlobalBool(DebugFlag.Name), ForceJit: ctx.GlobalBool(ForceJitFlag.Name), EnableJit: !ctx.GlobalBool(DisableJitFlag.Name), + Tracer: logger, }) tstart := time.Now() @@ -157,7 +160,7 @@ func run(ctx *cli.Context) error { statedb.Commit() fmt.Println(string(statedb.Dump())) } - vm.StdErrFormat(vmenv.StructLogs()) + vm.StdErrFormat(logger.StructLogs()) if ctx.GlobalBool(SysStatFlag.Name) { var mem runtime.MemStats @@ -209,7 +212,6 @@ func NewEnv(state *state.StateDB, transactor common.Address, value *big.Int, cfg value: value, time: big.NewInt(time.Now().Unix()), } - cfg.Logger.Collector = env env.evm = vm.New(env, cfg) return env @@ -242,12 +244,6 @@ func (self *VMEnv) GetHash(n uint64) common.Hash { } return common.Hash{} } -func (self *VMEnv) AddStructLog(log vm.StructLog) { - self.logs = append(self.logs, log) -} -func (self *VMEnv) StructLogs() []vm.StructLog { - return self.logs -} func (self *VMEnv) AddLog(log *vm.Log) { self.state.AddLog(log) } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index de679ccca..a5b46d7a4 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -143,6 +143,11 @@ This is a destructive action and changes the network in which you will be participating. `, }, + { + Action: license, + Name: "license", + Usage: "displays geth's license information", + }, } app.Flags = []cli.Flag{ @@ -408,3 +413,21 @@ func version(c *cli.Context) error { return nil } + +func license(c *cli.Context) error { + fmt.Println(`Geth is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Geth is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with geth. If not, see <http://www.gnu.org/licenses/>. +`) + + return nil +} diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index eb897d2b5..b08de247b 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -30,6 +30,8 @@ import ( var AppHelpTemplate = `NAME: {{.App.Name}} - {{.App.Usage}} + Copyright 2013-2016 The go-ethereum Authors + USAGE: {{.App.HelpName}} [options]{{if .App.Commands}} command [command options]{{end}} {{if .App.ArgsUsage}}{{.App.ArgsUsage}}{{else}}[arguments...]{{end}} {{if .App.Version}} |