Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier

cmd/blocktest/main.go

@@ -168,7 +168,7 @@ func main() {
 		logger.Flush()
 	}()
 
-	utils.HandleInterrupt()
+	//utils.HandleInterrupt()
 
 	utils.InitConfig(VmType, ConfigFile, Datadir, "ethblocktest")
 
@@ -190,12 +190,17 @@ func main() {
 		MinerThreads: MinerThreads,
 	})
 
+	utils.StartEthereumForTest(ethereum)
 	utils.StartRpc(ethereum, RpcListenAddress, RpcPort)
-	utils.StartEthereum(ethereum)
 
 	ethereum.ChainManager().ResetWithGenesisBlock(blocks[0])
+	// bph := ethereum.ChainManager().GetBlock(blocks[1].Header().ParentHash)
+	// fmt.Println("bph: ", bph)
 
-	// fmt.Println("HURR: ", hex.EncodeToString(ethutil.Encode(blocks[0].RlpData())))
+	//fmt.Println("b0: ", hex.EncodeToString(ethutil.Encode(blocks[0].RlpData())))
+	//fmt.Println("b0: ", hex.EncodeToString(blocks[0].Hash()))
+	//fmt.Println("b1: ", hex.EncodeToString(ethutil.Encode(blocks[1].RlpData())))
+	//fmt.Println("b1: ", hex.EncodeToString(blocks[1].Hash()))
 
 	go ethereum.ChainManager().InsertChain(types.Blocks{blocks[1]})
 	fmt.Println("OK! ")
@@ -254,6 +259,9 @@ func loadBlocksFromTestFile(filePath string) (blocks types.Blocks, err error) {
 	}
 
 	gb := types.NewBlockWithHeader(gbh)
+	//gb.uncles = *new([]*types.Header)
+	//gb.transactions = *new(types.Transactions)
+	gb.Td = new(big.Int)
 	gb.Reward = new(big.Int)
 
 	testBlock := new(types.Block)

cmd/ethereum/main.go

@@ -87,6 +87,11 @@ runtime will execute the file and exit.
 			Name:   "import",
 			Usage:  `import a blockchain file`,
 		},
+		{
+			Action: exportchain,
+			Name:   "export",
+			Usage:  `export blockchain into file`,
+		},
 	}
 	app.Author = ""
 	app.Email = ""
@@ -171,25 +176,39 @@ func importchain(ctx *cli.Context) {
 	if len(ctx.Args()) != 1 {
 		utils.Fatalf("This command requires an argument.")
 	}
-	chain, _, _ := utils.GetChain(ctx)
+	chainmgr, _, _ := utils.GetChain(ctx)
 	start := time.Now()
-	err := utils.ImportChain(chain, ctx.Args().First())
+	err := utils.ImportChain(chainmgr, ctx.Args().First())
 	if err != nil {
 		utils.Fatalf("Import error: %v\n", err)
 	}
-	fmt.Printf("Import done in", time.Since(start))
+	fmt.Printf("Import done in %v", time.Since(start))
+	return
+}
+
+func exportchain(ctx *cli.Context) {
+	if len(ctx.Args()) != 1 {
+		utils.Fatalf("This command requires an argument.")
+	}
+	chainmgr, _, _ := utils.GetChain(ctx)
+	start := time.Now()
+	err := utils.ExportChain(chainmgr, ctx.Args().First())
+	if err != nil {
+		utils.Fatalf("Export error: %v\n", err)
+	}
+	fmt.Printf("Export done in %v", time.Since(start))
 	return
 }
 
 func dump(ctx *cli.Context) {
-	chain, _, stateDb := utils.GetChain(ctx)
+	chainmgr, _, stateDb := utils.GetChain(ctx)
 	for _, arg := range ctx.Args() {
 		var block *types.Block
 		if hashish(arg) {
-			block = chain.GetBlock(ethutil.Hex2Bytes(arg))
+			block = chainmgr.GetBlock(ethutil.Hex2Bytes(arg))
 		} else {
 			num, _ := strconv.Atoi(arg)
-			block = chain.GetBlockByNumber(uint64(num))
+			block = chainmgr.GetBlockByNumber(uint64(num))
 		}
 		if block == nil {
 			fmt.Println("{}")
@@ -209,11 +228,13 @@ func hashish(x string) bool {
 }
 
 func version(c *cli.Context) {
-	fmt.Printf(`%v %v
-PV=%d
-GOOS=%s
-GO=%s
+	fmt.Printf(`%v
+Version: %v
+Protocol Version: %d
+Network Id: %d
+GO: %s
+OS: %s
 GOPATH=%s
 GOROOT=%s
-`, ClientIdentifier, Version, eth.ProtocolVersion, runtime.GOOS, runtime.Version(), os.Getenv("GOPATH"), runtime.GOROOT())
+`, ClientIdentifier, Version, eth.ProtocolVersion, eth.NetworkId, runtime.Version(), runtime.GOOS, os.Getenv("GOPATH"), runtime.GOROOT())
 }

cmd/mist/assets/examples/coin.html

@@ -35,7 +35,7 @@
 	var web3 = require('web3');
 	var eth = web3.eth;
 
-	web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8545'));
+	web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));
 	var desc = [{
 		"name": "balance(address)",
 		"type": "function",

cmd/mist/assets/qml/main.qml

@@ -194,13 +194,6 @@ ApplicationWindow {
 
         Menu {
             title: "Developer"
-            MenuItem {
-                iconSource: "../icecream.png"
-                text: "Debugger"
-                shortcut: "Ctrl+d"
-                onTriggered: eth.startDebugger()
-            }
-
             MenuItem {
                 text: "Import Tx"
                 onTriggered: {
@@ -756,24 +749,6 @@ ApplicationWindow {
                      }
                  }
 
-                 Rectangle {
-                     height: 55
-                     color: "transparent"
-                     visible: true
-                     Text {
-                         text: "DEBUG"
-                         font.family: sourceSansPro.name 
-                         font.weight: Font.DemiBold
-                         anchors {
-                             left: parent.left
-                             top: parent.verticalCenter
-                             leftMargin: 16
-                         }
-                         color: "#AAA0A0"
-                     }
-                 }
-
-
                  ColumnLayout {
                      id: menuLegacy
                      visible: true

cmd/mist/assets/qml/views/chain.qml

@@ -178,7 +178,6 @@ Rectangle {
 		}
 
 		function showContractData(tx) {
-			txDetailsDebugButton.tx = tx
 			if(tx.createsContract) {
 				contractData.text = tx.data
 				contractLabel.text = "<h4> Transaction created contract " + tx.address + "</h4>"
@@ -202,22 +201,6 @@ Rectangle {
 				id: contractLabel
 				anchors.leftMargin: 10
 			}
-			Button {
-				property var tx
-				id: txDetailsDebugButton
-				anchors.right: parent.right
-				anchors.rightMargin: 10
-				anchors.top: parent.top
-				anchors.topMargin: 10
-				text: "Debug contract"
-				onClicked: {
-					if(tx && tx.createsContract){
-						eth.startDbWithCode(tx.rawData)
-					}else {
-						eth.startDbWithContractAndData(tx.address, tx.rawData)
-					}
-				}
-			}
 			TextArea {
 				id: contractData
 				text: "Contract"

cmd/mist/debugger.go

-/*
-	This file is part of go-ethereum
-
-	go-ethereum 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.
-
-	go-ethereum 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 go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @authors
- * 	Jeffrey Wilcke <i@jev.io>
- */
-package main
-
-import (
-	"fmt"
-	"math/big"
-	"strconv"
-	"strings"
-	"unicode"
-
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
-	"github.com/obscuren/qml"
-)
-
-type DebuggerWindow struct {
-	win    *qml.Window
-	engine *qml.Engine
-	lib    *UiLib
-
-	vm *vm.Vm
-	Db *Debugger
-
-	state *state.StateDB
-}
-
-func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
-	engine := qml.NewEngine()
-	component, err := engine.LoadFile(lib.AssetPath("debugger/debugger.qml"))
-	if err != nil {
-		fmt.Println(err)
-
-		return nil
-	}
-
-	win := component.CreateWindow(nil)
-
-	w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &vm.Vm{}}
-	w.Db = NewDebugger(w)
-
-	return w
-}
-
-func (self *DebuggerWindow) Show() {
-	context := self.engine.Context()
-	context.SetVar("dbg", self)
-
-	go func() {
-		self.win.Show()
-		self.win.Wait()
-	}()
-}
-
-func (self *DebuggerWindow) SetCode(code string) {
-	self.win.Set("codeText", code)
-}
-
-func (self *DebuggerWindow) SetData(data string) {
-	self.win.Set("dataText", data)
-}
-
-func (self *DebuggerWindow) SetAsm(data []byte) {
-	self.win.Root().Call("clearAsm")
-
-	dis := core.Disassemble(data)
-	for _, str := range dis {
-		self.win.Root().Call("setAsm", str)
-	}
-}
-
-func (self *DebuggerWindow) Compile(code string) {
-	var err error
-	script := ethutil.StringToByteFunc(code, func(s string) (ret []byte) {
-		ret, err = ethutil.Compile(s, true)
-		return
-	})
-
-	if err == nil {
-		self.SetAsm(script)
-	}
-}
-
-// Used by QML
-func (self *DebuggerWindow) AutoComp(code string) {
-	if self.Db.done {
-		self.Compile(code)
-	}
-}
-
-func (self *DebuggerWindow) ClearLog() {
-	self.win.Root().Call("clearLog")
-}
-
-func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) {
-	self.Stop()
-
-	defer func() {
-		if r := recover(); r != nil {
-			self.Logf("compile FAULT: %v", r)
-		}
-	}()
-
-	data := utils.FormatTransactionData(dataStr)
-
-	var err error
-	script := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) {
-		ret, err = ethutil.Compile(s, false)
-		return
-	})
-
-	if err != nil {
-		self.Logln(err)
-
-		return
-	}
-
-	var (
-		gas      = ethutil.Big(gasStr)
-		gasPrice = ethutil.Big(gasPriceStr)
-		value    = ethutil.Big(valueStr)
-		// Contract addr as test address
-		keyPair = self.lib.eth.KeyManager().KeyPair()
-	)
-
-	statedb := self.lib.eth.ChainManager().TransState()
-	account := self.lib.eth.ChainManager().TransState().GetAccount(keyPair.Address())
-	contract := statedb.NewStateObject([]byte{0})
-	contract.SetCode(script)
-	contract.SetBalance(value)
-
-	self.SetAsm(script)
-
-	block := self.lib.eth.ChainManager().CurrentBlock()
-
-	msg := types.NewTransactionMessage(nil, value, gas, gasPrice, data)
-	env := core.NewEnv(statedb, self.lib.eth.ChainManager(), msg, block)
-
-	self.Logf("callsize %d", len(script))
-	go func() {
-		pgas := new(big.Int).Set(gas)
-		ret, err := env.Call(account, contract.Address(), data, gas, gasPrice, ethutil.Big0)
-
-		rgas := new(big.Int).Sub(pgas, gas)
-		tot := new(big.Int).Mul(rgas, gasPrice)
-		self.Logf("gas usage %v total price = %v (%v)", rgas, tot, ethutil.CurrencyToString(tot))
-		if err != nil {
-			self.Logln("exited with errors:", err)
-		} else {
-			if len(ret) > 0 {
-				self.Logf("exited: % x", ret)
-			} else {
-				self.Logf("exited: nil")
-			}
-		}
-
-		statedb.Reset()
-
-		if !self.Db.interrupt {
-			self.Db.done = true
-		} else {
-			self.Db.interrupt = false
-		}
-	}()
-}
-
-func (self *DebuggerWindow) Logf(format string, v ...interface{}) {
-	self.win.Root().Call("setLog", fmt.Sprintf(format, v...))
-}
-
-func (self *DebuggerWindow) Logln(v ...interface{}) {
-	str := fmt.Sprintln(v...)
-	self.Logf("%s", str[:len(str)-1])
-}
-
-func (self *DebuggerWindow) Next() {
-	self.Db.Next()
-}
-
-func (self *DebuggerWindow) Continue() {
-	self.vm.Stepping = false
-	self.Next()
-}
-
-func (self *DebuggerWindow) Stop() {
-	if !self.Db.done {
-		self.Db.Q <- true
-	}
-}
-
-func (self *DebuggerWindow) ExecCommand(command string) {
-	if len(command) > 0 {
-		cmd := strings.Split(command, " ")
-		switch cmd[0] {
-		case "help":
-			self.Logln("Debugger commands:")
-			self.Logln("break, bp                 Set breakpoint on instruction")
-			self.Logln("clear [log, break, bp]    Clears previous set sub-command(s)")
-		case "break", "bp":
-			if len(cmd) > 1 {
-				lineNo, err := strconv.Atoi(cmd[1])
-				if err != nil {
-					self.Logln(err)
-					break
-				}
-				self.Db.breakPoints = append(self.Db.breakPoints, int64(lineNo))
-				self.Logf("break point set on instruction %d", lineNo)
-			} else {
-				self.Logf("'%s' requires line number", cmd[0])
-			}
-		case "clear":
-			if len(cmd) > 1 {
-				switch cmd[1] {
-				case "break", "bp":
-					self.Db.breakPoints = nil
-
-					self.Logln("Breakpoints cleared")
-				case "log":
-					self.ClearLog()
-				default:
-					self.Logf("clear '%s' is not valid", cmd[1])
-				}
-			} else {
-				self.Logln("'clear' requires sub command")
-			}
-
-		default:
-			self.Logf("Unknown command %s", cmd[0])
-		}
-	}
-}
-
-type Debugger struct {
-	N               chan bool
-	Q               chan bool
-	done, interrupt bool
-	breakPoints     []int64
-	main            *DebuggerWindow
-	win             *qml.Window
-}
-
-func NewDebugger(main *DebuggerWindow) *Debugger {
-	db := &Debugger{make(chan bool), make(chan bool), true, false, nil, main, main.win}
-
-	return db
-}
-
-type storeVal struct {
-	Key, Value string
-}
-
-func (self *Debugger) Step(evm vm.VirtualMachine, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, context *vm.Context) {
-}
-
-func (self *Debugger) BreakHook(pc int, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, stateObject *state.StateObject) bool {
-	self.main.Logln("break on instr:", pc)
-
-	return self.halting(pc, op, mem, stack, stateObject)
-}
-
-func (self *Debugger) StepHook(pc int, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, stateObject *state.StateObject) bool {
-	return self.halting(pc, op, mem, stack, stateObject)
-}
-
-func (self *Debugger) SetCode(byteCode []byte) {
-	self.main.SetAsm(byteCode)
-}
-
-func (self *Debugger) BreakPoints() []int64 {
-	return self.breakPoints
-}
-
-func (d *Debugger) halting(pc int, op vm.OpCode, mem *vm.Memory, stack *vm.Stack, stateObject *state.StateObject) bool {
-	d.win.Root().Call("setInstruction", pc)
-	d.win.Root().Call("clearMem")
-	d.win.Root().Call("clearStack")
-	d.win.Root().Call("clearStorage")
-
-	addr := 0
-	for i := 0; i+16 <= mem.Len(); i += 16 {
-		dat := mem.Data()[i : i+16]
-		var str string
-
-		for _, d := range dat {
-			if unicode.IsGraphic(rune(d)) {
-				str += string(d)
-			} else {
-				str += "?"
-			}
-		}
-
-		d.win.Root().Call("setMem", memAddr{fmt.Sprintf("%03d", addr), fmt.Sprintf("%s  % x", str, dat)})
-		addr += 16
-	}
-
-	for _, val := range stack.Data() {
-		d.win.Root().Call("setStack", val.String())
-	}
-
-	it := stateObject.Trie().Iterator()
-	for it.Next() {
-		d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", it.Key), fmt.Sprintf("% x", it.Value)})
-
-	}
-
-	stackFrameAt := new(big.Int).SetBytes(mem.Get(0, 32))
-	psize := mem.Len() - int(new(big.Int).SetBytes(mem.Get(0, 32)).Uint64())
-	d.win.Root().ObjectByName("stackFrame").Set("text", fmt.Sprintf(`<b>stack ptr</b>: %v`, stackFrameAt))
-	d.win.Root().ObjectByName("stackSize").Set("text", fmt.Sprintf(`<b>stack size</b>: %d`, psize))
-	d.win.Root().ObjectByName("memSize").Set("text", fmt.Sprintf(`<b>mem size</b>: %v`, mem.Len()))
-
-out:
-	for {
-		select {
-		case <-d.N:
-			break out
-		case <-d.Q:
-			d.interrupt = true
-			d.clearBuffers()
-
-			return false
-		}
-	}
-
-	return true
-}
-
-func (d *Debugger) clearBuffers() {
-out:
-	// drain
-	for {
-		select {
-		case <-d.N:
-		case <-d.Q:
-		default:
-			break out
-		}
-	}
-}
-
-func (d *Debugger) Next() {
-	if !d.done {
-		d.N <- true
-	}
-}

cmd/mist/ui_lib.go

@@ -47,9 +47,7 @@ type UiLib struct {
 	connected bool
 	assetPath string
 	// The main application window
-	win      *qml.Window
-	Db       *Debugger
-	DbWindow *DebuggerWindow
+	win *qml.Window
 
 	jsEngine *javascript.JSRE
 
@@ -126,29 +124,6 @@ func (ui *UiLib) AssetPath(p string) string {
 	return path.Join(ui.assetPath, p)
 }
 
-func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
-	dbWindow := NewDebuggerWindow(self)
-	object := self.eth.ChainManager().State().GetStateObject(ethutil.Hex2Bytes(contractHash))
-	if len(object.Code()) > 0 {
-		dbWindow.SetCode(ethutil.Bytes2Hex(object.Code()))
-	}
-	dbWindow.SetData(data)
-
-	dbWindow.Show()
-}
-
-func (self *UiLib) StartDbWithCode(code string) {
-	dbWindow := NewDebuggerWindow(self)
-	dbWindow.SetCode(code)
-	dbWindow.Show()
-}
-
-func (self *UiLib) StartDebugger() {
-	dbWindow := NewDebuggerWindow(self)
-
-	dbWindow.Show()
-}
-
 func (self *UiLib) Transact(params map[string]interface{}) (string, error) {
 	object := mapToTxParams(params)
 

cmd/utils/cmd.go

@@ -35,7 +35,6 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/rlp"
 	rpchttp "github.com/ethereum/go-ethereum/rpc/http"
-	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
 )
 
@@ -134,6 +133,15 @@ func StartEthereum(ethereum *eth.Ethereum) {
 	})
 }
 
+func StartEthereumForTest(ethereum *eth.Ethereum) {
+	clilogger.Infoln("Starting ", ethereum.Name())
+	ethereum.StartForTest()
+	RegisterInterrupt(func(sig os.Signal) {
+		ethereum.Stop()
+		logger.Flush()
+	})
+}
+
 func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) {
 	var err error
 	switch {
@@ -188,27 +196,8 @@ func FormatTransactionData(data string) []byte {
 	return d
 }
 
-// Replay block
-func BlockDo(ethereum *eth.Ethereum, hash []byte) error {
-	block := ethereum.ChainManager().GetBlock(hash)
-	if block == nil {
-		return fmt.Errorf("unknown block %x", hash)
-	}
-
-	parent := ethereum.ChainManager().GetBlock(block.ParentHash())
-
-	statedb := state.New(parent.Root(), ethereum.StateDb())
-	_, err := ethereum.BlockProcessor().TransitionState(statedb, parent, block, true)
-	if err != nil {
-		return err
-	}
-
-	return nil
-
-}
-
-func ImportChain(chain *core.ChainManager, fn string) error {
-	fmt.Printf("importing chain '%s'\n", fn)
+func ImportChain(chainmgr *core.ChainManager, fn string) error {
+	fmt.Printf("importing blockchain '%s'\n", fn)
 	fh, err := os.OpenFile(fn, os.O_RDONLY, os.ModePerm)
 	if err != nil {
 		return err
@@ -220,11 +209,24 @@ func ImportChain(chain *core.ChainManager, fn string) error {
 		return err
 	}
 
-	chain.Reset()
-	if err := chain.InsertChain(blocks); err != nil {
+	chainmgr.Reset()
+	if err := chainmgr.InsertChain(blocks); err != nil {
 		return err
 	}
 	fmt.Printf("imported %d blocks\n", len(blocks))
 
 	return nil
 }
+
+func ExportChain(chainmgr *core.ChainManager, fn string) error {
+	fmt.Printf("exporting blockchain '%s'\n", fn)
+
+	data := chainmgr.Export()
+
+	if err := ethutil.WriteFile(fn, data); err != nil {
+		return err
+	}
+	fmt.Printf("exported blockchain\n")
+
+	return nil
+}

core/block_processor.go

@@ -261,7 +261,7 @@ func (sm *BlockProcessor) ValidateHeader(block, parent *types.Header) error {
 	}
 
 	if block.Time <= parent.Time {
-		return ValidationError("Block timestamp not after or equal to prev block (%v - %v)", block.Time, parent.Time)
+		return ValidationError("Block timestamp equal or less than previous block (%v - %v)", block.Time, parent.Time)
 	}
 
 	if int64(block.Time) > time.Now().Unix() {

eth/backend.go

@@ -275,6 +275,17 @@ func (s *Ethereum) Start() error {
 	return nil
 }
 
+func (s *Ethereum) StartForTest() {
+		jsonlogger.LogJson(&logger.LogStarting{
+		ClientString:    s.net.Name,
+		ProtocolVersion: ProtocolVersion,
+	})
+
+	// Start services
+	s.txPool.Start()
+	s.blockPool.Start()
+}
+
 func (self *Ethereum) SuggestPeer(nodeURL string) error {
 	n, err := discover.ParseNode(nodeURL)
 	if err != nil {

ethutil/natspec/natspec.go

 package natspec
 
 import (
+	"fmt"
 	"github.com/obscuren/otto"
-	"io/ioutil"
 )
 
 type NatSpec struct {
 	jsvm *otto.Otto
 }
 
-func NewNATSpec(transaction string) (self *NatSpec, err error) {
+// TODO: should initialise with abi and userdoc jsons
+func New() (self *NatSpec, err error) {
 
 	self = new(NatSpec)
 	self.jsvm = otto.New()
-	code, err := ioutil.ReadFile("natspec.js")
-	if err != nil {
-		return
-	}
 
-	_, err = self.jsvm.Run(string(code))
+	_, err = self.jsvm.Run(natspecJS)
 	if err != nil {
 		return
 	}
@@ -27,39 +24,40 @@ func NewNATSpec(transaction string) (self *NatSpec, err error) {
 		return
 	}
 
-	self.jsvm.Run("var transaction = " + transaction + ";")
-
-	return
-}
-
-func (self *NatSpec) SetDescription(desc string) (err error) {
-
-	_, err = self.jsvm.Run("var expression = \"" + desc + "\";")
 	return
-
 }
 
-func (self *NatSpec) SetABI(abi string) (err error) {
-
-	_, err = self.jsvm.Run("var abi = " + abi + ";")
-	return
-
-}
-
-func (self *NatSpec) SetMethod(method string) (err error) {
+func (self *NatSpec) Notice(transaction, abi, method, expression string) (string, error) {
+	var err error
+	if _, err = self.jsvm.Run("var transaction = " + transaction + ";"); err != nil {
+		return "", fmt.Errorf("natspec.js error setting transaction: %v", err)
+	}
 
-	_, err = self.jsvm.Run("var method = '" + method + "';")
-	return
+	if _, err = self.jsvm.Run("var abi = " + abi + ";"); err != nil {
+		return "", fmt.Errorf("natspec.js error setting abi: %v", err)
+	}
 
-}
+	if _, err = self.jsvm.Run("var method = '" + method + "';"); err != nil {
+		return "", fmt.Errorf("natspec.js error setting method: %v", err)
+	}
 
-func (self *NatSpec) Parse() string {
+	if _, err = self.jsvm.Run("var expression = \"" + expression + "\";"); err != nil {
+		return "", fmt.Errorf("natspec.js error setting expression: %v", err)
+	}
 
 	self.jsvm.Run("var call = {method: method,abi: abi,transaction: transaction};")
 	value, err := self.jsvm.Run("natspec.evaluateExpression(expression, call);")
 	if err != nil {
-		return err.Error()
+		return "", fmt.Errorf("natspec.js error evaluating expression: %v", err)
+	}
+	evalError := "Natspec evaluation failed, wrong input params"
+	if value.String() == evalError {
+		return "", fmt.Errorf("natspec.js error evaluating expression: wrong input params in expression '%s'", expression)
 	}
-	return value.String()
+	if len(value.String()) == 0 {
+		return "", fmt.Errorf("natspec.js error evaluating expression")
+	}
+
+	return value.String(), nil
 
 }

ethutil/natspec/natspec.js → ethutil/natspec/natspec_js.go

-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+package natspec
+
+const natspecJS = `require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 
 },{}],2:[function(require,module,exports){
 // shim for using process in browser
@@ -291,26 +293,26 @@ if (process.env.NODE_ENV !== 'build') {
     var BigNumber = require('bignumber.js'); // jshint ignore:line
 }
 
-var ETH_UNITS = [ 
-    'wei', 
-    'Kwei', 
-    'Mwei', 
-    'Gwei', 
-    'szabo', 
-    'finney', 
-    'ether', 
-    'grand', 
-    'Mether', 
-    'Gether', 
-    'Tether', 
-    'Pether', 
-    'Eether', 
-    'Zether', 
-    'Yether', 
-    'Nether', 
-    'Dether', 
-    'Vether', 
-    'Uether' 
+var ETH_UNITS = [
+    'wei',
+    'Kwei',
+    'Mwei',
+    'Gwei',
+    'szabo',
+    'finney',
+    'ether',
+    'grand',
+    'Mether',
+    'Gether',
+    'Tether',
+    'Pether',
+    'Eether',
+    'Zether',
+    'Yether',
+    'Nether',
+    'Dether',
+    'Vether',
+    'Uether'
 ];
 
 module.exports = {
@@ -375,7 +377,7 @@ var formatInputInt = function (value) {
         BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
         value = value.round();
 
-        if (value.lessThan(0)) 
+        if (value.lessThan(0))
             value = new BigNumber("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16).plus(value).plus(1);
         value = value.toString(16);
     }
@@ -404,7 +406,7 @@ var formatInputBool = function (value) {
 /// Values are multiplied by 2^m and encoded as integers
 /// @returns byte representation of real
 var formatInputReal = function (value) {
-    return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128))); 
+    return formatInputInt(new BigNumber(value).times(new BigNumber(2).pow(128)));
 };
 
 
@@ -436,12 +438,12 @@ var formatOutputUInt = function (value) {
 
 /// @returns input bytes formatted to real
 var formatOutputReal = function (value) {
-    return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128)); 
+    return formatOutputInt(value).dividedBy(new BigNumber(2).pow(128));
 };
 
 /// @returns input bytes formatted to ureal
 var formatOutputUReal = function (value) {
-    return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128)); 
+    return formatOutputUInt(value).dividedBy(new BigNumber(2).pow(128));
 };
 
 /// @returns right-aligned input bytes formatted to hex
@@ -524,14 +526,14 @@ var namedType = function (name) {
 };
 
 /// Setups input formatters for solidity types
-/// @returns an array of input formatters 
+/// @returns an array of input formatters
 var inputTypes = function () {
-    
+
     return [
         { type: prefixedType('uint'), format: f.formatInputInt },
         { type: prefixedType('int'), format: f.formatInputInt },
         { type: prefixedType('hash'), format: f.formatInputInt },
-        { type: prefixedType('string'), format: f.formatInputString }, 
+        { type: prefixedType('string'), format: f.formatInputString },
         { type: prefixedType('real'), format: f.formatInputReal },
         { type: prefixedType('ureal'), format: f.formatInputReal },
         { type: namedType('address'), format: f.formatInputInt },
@@ -620,7 +622,7 @@ var toAscii = function(hex) {
 
     return str;
 };
-    
+
 var toHex = function(str) {
     var hex = "";
     for(var i = 0; i < str.length; i++) {
@@ -642,7 +644,7 @@ var fromAscii = function(str, pad) {
 
 /// @returns display name for function/event eg. multiply(uint256) -> multiply
 var extractDisplayName = function (name) {
-    var length = name.indexOf('('); 
+    var length = name.indexOf('(');
     return length !== -1 ? name.substr(0, length) : name;
 };
 
@@ -657,8 +659,8 @@ var extractTypeName = function (name) {
 /// @returns abi array with filtered objects of type 'function'
 var filterFunctions = function (json) {
     return json.filter(function (current) {
-        return current.type === 'function'; 
-    }); 
+        return current.type === 'function';
+    });
 };
 
 /// Filters all events form input abi
@@ -3404,7 +3406,7 @@ module.exports = {
  * @date 2015
  */
 
-var abi = require('./node_modules/ethereum.js/lib/abi.js'); 
+var abi = require('./node_modules/ethereum.js/lib/abi.js');
 
 /**
  * This object should be used to evaluate natspec expression
@@ -3418,7 +3420,7 @@ var natspec = (function () {
             context[key] = obj[key];
         });
     }
-    
+
     /// generate codes, which will be evaluated
     var generateCode = function (obj) {
         return Object.keys(obj).reduce(function (acc, key) {
@@ -3440,20 +3442,20 @@ var natspec = (function () {
     /// @returns hashmap with all contract's method input variables
     var getMethodInputParams = function (method, transaction) {
         // do it with output formatter (cause we have to decode)
-        var params = abi.formatOutput(method.inputs, '0x' + transaction.params[0].data.slice(10)); 
+        var params = abi.formatOutput(method.inputs, '0x' + transaction.params[0].data.slice(10));
 
         return method.inputs.reduce(function (acc, current, index) {
             acc[current.name] = params[index];
             return acc;
         }, {});
     };
-    
+
     /// Should be called to evaluate expression
     var mapExpressionsToEvaluate = function (expression, cb) {
         var evaluatedExpression = "";
 
-        // match everything in `` quotes
-        var pattern = /\`(?:\\.|[^`\\])*\`/gim
+        // match everything in backtick
+        var pattern = /\` + "`" + `(?:\\.|[^` + "`" + `\\])*\` + "`" + `/gim
         var match;
         var lastIndex = 0;
         while ((match = pattern.exec(expression)) !== null) {
@@ -3464,9 +3466,9 @@ var natspec = (function () {
             evaluatedExpression += evaluatedPart;
             lastIndex = pattern.lastIndex;
         }
-        
+
         evaluatedExpression += expression.slice(lastIndex);
-    
+
         return evaluatedExpression;
     };
 
@@ -3478,11 +3480,11 @@ var natspec = (function () {
     var evaluateExpression = function (expression, call) {
         //var self = this;
         var context = {};
-        
+
         if (!!call) {
             try {
                 var method = getMethodWithName(call.abi, call.method);
-                var params = getMethodInputParams(method, call.transaction); 
+                var params = getMethodInputParams(method, call.transaction);
                 copyToContext(params, context);
             }
             catch (err) {
@@ -3498,7 +3500,7 @@ var natspec = (function () {
                 return fn(context).toString();
             }
             catch (err) {
-                return 'undefined'; 
+                return 'undefined';
             }
         });
 
@@ -3511,7 +3513,8 @@ var natspec = (function () {
 
 })();
 
-module.exports = natspec; 
+module.exports = natspec;
 
 
 },{"./node_modules/ethereum.js/lib/abi.js":3}]},{},[]);
+`

tests/vm/gh_test.go

@@ -80,13 +80,6 @@ func RunVmTest(p string, t *testing.T) {
 	helper.CreateFileTests(t, p, &tests)
 
 	for name, test := range tests {
-		/*
-			vm.Debug = true
-			helper.Logger.SetLogLevel(4)
-			if name != "refund_CallToSuicideTwice" {
-				continue
-			}
-		*/
 		db, _ := ethdb.NewMemDatabase()
 		statedb := state.New(nil, db)
 		for addr, account := range test.Pre {

vm/context.go

@@ -58,7 +58,7 @@ func (c *Context) GetRangeValue(x, size uint64) []byte {
 	x = uint64(math.Min(float64(x), float64(len(c.Code))))
 	y := uint64(math.Min(float64(x+size), float64(len(c.Code))))
 
-	return ethutil.LeftPadBytes(c.Code[x:y], int(size))
+	return ethutil.RightPadBytes(c.Code[x:y], int(size))
 }
 
 func (c *Context) GetCode(x, size uint64) []byte {