Separated block db from state db. Partial fix for #416

2 files changed, 4 insertions, 4 deletions

diff --git a/cmd/ethereum/js.go b/cmd/ethereum/js.go
index 9125ccbba..d5cf62146 100644
--- a/cmd/ethereum/js.go
+++ b/cmd/ethereum/js.go
@@ -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 d9fbabdb7..d29ae3f78 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -171,7 +171,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 {
@@ -182,7 +182,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) {
@@ -195,7 +195,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)
 		}