diff options
Diffstat (limited to 'cmd/evm')
| -rw-r--r-- | cmd/evm/main.go | 12 |
1 files changed, 4 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) } |