2 files changed, 63 insertions, 11 deletions

diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index c42e91615..defbb43ec 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"time"
@@ -9,6 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/logger/glog"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -50,15 +52,11 @@ func (js *jsre) adminBindings() {
 	debug.Set("printBlock", js.printBlock)
 	debug.Set("dumpBlock", js.dumpBlock)
 	debug.Set("getBlockRlp", js.getBlockRlp)
+	debug.Set("setHead", js.setHead)
+	debug.Set("block", js.debugBlock)
 }
 
-func (js *jsre) downloadProgress(call otto.FunctionCall) otto.Value {
-	current, max := js.ethereum.Downloader().Stats()
-
-	return js.re.ToVal(fmt.Sprintf("%d/%d", current, max))
-}
-
-func (js *jsre) getBlockRlp(call otto.FunctionCall) otto.Value {
+func (js *jsre) getBlock(call otto.FunctionCall) (*types.Block, error) {
 	var block *types.Block
 	if len(call.ArgumentList) > 0 {
 		if call.Argument(0).IsNumber() {
@@ -68,12 +66,66 @@ func (js *jsre) getBlockRlp(call otto.FunctionCall) otto.Value {
 			hash, _ := call.Argument(0).ToString()
 			block = js.ethereum.ChainManager().GetBlock(common.HexToHash(hash))
 		} else {
-			fmt.Println("invalid argument for dump. Either hex string or number")
+			return nil, errors.New("invalid argument for dump. Either hex string or number")
 		}
+		return block, nil
+	}
 
-	} else {
-		block = js.ethereum.ChainManager().CurrentBlock()
+	return nil, errors.New("requires block number or block hash as argument")
+}
+
+func (js *jsre) debugBlock(call otto.FunctionCall) otto.Value {
+	block, err := js.getBlock(call)
+	if err != nil {
+		fmt.Println(err)
+		return otto.UndefinedValue()
+	}
+
+	if block == nil {
+		fmt.Println("block not found")
+		return otto.UndefinedValue()
 	}
+
+	old := vm.Debug
+	vm.Debug = true
+	_, err = js.ethereum.BlockProcessor().RetryProcess(block)
+	if err != nil {
+		glog.Infoln(err)
+	}
+	vm.Debug = old
+
+	return otto.UndefinedValue()
+}
+
+func (js *jsre) setHead(call otto.FunctionCall) otto.Value {
+	block, err := js.getBlock(call)
+	if err != nil {
+		fmt.Println(err)
+		return otto.UndefinedValue()
+	}
+
+	if block == nil {
+		fmt.Println("block not found")
+		return otto.UndefinedValue()
+	}
+
+	js.ethereum.ChainManager().SetHead(block)
+	return otto.UndefinedValue()
+}
+
+func (js *jsre) downloadProgress(call otto.FunctionCall) otto.Value {
+	current, max := js.ethereum.Downloader().Stats()
+
+	return js.re.ToVal(fmt.Sprintf("%d/%d", current, max))
+}
+
+func (js *jsre) getBlockRlp(call otto.FunctionCall) otto.Value {
+	block, err := js.getBlock(call)
+	if err != nil {
+		fmt.Println(err)
+		return otto.UndefinedValue()
+	}
+
 	if block == nil {
 		fmt.Println("block not found")
 		return otto.UndefinedValue()
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 5b523da3e..97d358407 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -49,7 +49,7 @@ import _ "net/http/pprof"
 
 const (
 	ClientIdentifier = "Geth"
-	Version          = "0.9.10"
+	Version          = "0.9.11"
 )
 
 var app = utils.NewApp(Version, "the go-ethereum command line interface")