diff options
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/js.go | 6 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cmd/ethereum/js.go b/cmd/ethereum/js.go index 9125ccbba..e3165d3f5 100644 --- a/cmd/ethereum/js.go +++ b/cmd/ethereum/js.go @@ -46,7 +46,7 @@ func execJsFile(ethereum *eth.Ethereum, filename string) { if err != nil { utils.Fatalf("%v", err) } - re := javascript.NewJSRE(xeth.New(ethereum)) + re := javascript.NewJSRE(xeth.New(ethereum, nil)) if _, err := re.Run(string(content)); err != nil { utils.Fatalf("Javascript Error: %v", err) } @@ -61,7 +61,7 @@ type repl struct { } func runREPL(ethereum *eth.Ethereum) { - xeth := xeth.New(ethereum) + xeth := xeth.New(ethereum, nil) repl := &repl{ re: javascript.NewJSRE(xeth), xeth: xeth, @@ -229,7 +229,7 @@ func (self *repl) dump(call otto.FunctionCall) otto.Value { block = self.ethereum.ChainManager().CurrentBlock() } - statedb := state.New(block.Root(), self.ethereum.Db()) + statedb := state.New(block.Root(), self.ethereum.StateDb()) v, _ := self.re.Vm.ToValue(statedb.RawDump()) diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 4855a3e4a..1ae8e46a2 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -40,7 +40,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.8.6" + Version = "0.9.0" ) var ( @@ -121,7 +121,8 @@ runtime will execute the file and exit. utils.RPCEnabledFlag, utils.RPCListenAddrFlag, utils.RPCPortFlag, - utils.VMTypeFlag, + utils.VMDebugFlag, + //utils.VMTypeFlag, } // missing: @@ -212,7 +213,7 @@ func importchain(ctx *cli.Context) { if len(ctx.Args()) != 1 { utils.Fatalf("This command requires an argument.") } - chain, _ := utils.GetChain(ctx) + chain, _, _ := utils.GetChain(ctx) start := time.Now() err := utils.ImportChain(chain, ctx.Args().First()) if err != nil { @@ -223,7 +224,7 @@ func importchain(ctx *cli.Context) { } func dump(ctx *cli.Context) { - chain, db := utils.GetChain(ctx) + chain, _, stateDb := utils.GetChain(ctx) for _, arg := range ctx.Args() { var block *types.Block if hashish(arg) { @@ -236,7 +237,7 @@ func dump(ctx *cli.Context) { fmt.Println("{}") utils.Fatalf("block not found") } else { - statedb := state.New(block.Root(), db) + statedb := state.New(block.Root(), stateDb) fmt.Printf("%s\n", statedb.Dump()) // fmt.Println(block) } |