Merge branch 'feature/new_vm' into develop

obscuren · obscuren · commit 0ca776a6b800 · 2014-07-24T14:16:25.000+02:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Ethereum
 
 Ethereum Go Client © 2014 Jeffrey Wilcke.
 
-Current state: Proof of Concept 0.5.17.
+Current state: Proof of Concept 0.6.0.
 
 For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
 
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
@@ -249,6 +249,8 @@ ApplicationWindow {
 					}
 					TextField {
 						text: eth.getCustomIdentifier()
+						width: 500
+						placeholderText: "Anonymous"
 						onTextChanged: {
 							eth.setCustomIdentifier(text)
 						}
diff --git a/ethereal/debugger.go b/ethereal/debugger.go
@@ -3,7 +3,10 @@ package main
 import (
 	"fmt"
 	"github.com/ethereum/eth-go/ethchain"
+	"github.com/ethereum/eth-go/ethstate"
 	"github.com/ethereum/eth-go/ethutil"
+	"github.com/ethereum/eth-go/ethvm"
+	"github.com/ethereum/go-ethereum/utils"
 	"github.com/go-qml/qml"
 	"math/big"
 	"strconv"
@@ -15,10 +18,10 @@ type DebuggerWindow struct {
 	engine *qml.Engine
 	lib    *UiLib
 
-	vm *ethchain.Vm
+	vm *ethvm.Vm
 	Db *Debugger
 
-	state *ethchain.State
+	state *ethstate.State
 }
 
 func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
@@ -32,7 +35,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
 
 	win := component.CreateWindow(nil)
 
-	w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &ethchain.Vm{}}
+	w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &ethvm.Vm{}}
 	w.Db = NewDebugger(w)
 
 	return w
@@ -130,24 +133,29 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 
 	state := self.lib.eth.StateManager().TransState()
 	account := self.lib.eth.StateManager().TransState().GetAccount(keyPair.Address())
-	contract := ethchain.NewStateObject([]byte{0})
+	contract := ethstate.NewStateObject([]byte{0})
 	contract.Amount = value
 
 	self.SetAsm(script)
 
-	callerClosure := ethchain.NewClosure(account, contract, script, state, gas, gasPrice)
+	callerClosure := ethvm.NewClosure(account, contract, script, gas, gasPrice)
 
 	block := self.lib.eth.BlockChain().CurrentBlock
-	vm := ethchain.NewVm(state, self.lib.eth.StateManager(), ethchain.RuntimeVars{
-		Block:       block,
-		Origin:      account.Address(),
-		BlockNumber: block.Number,
-		PrevHash:    block.PrevHash,
-		Coinbase:    block.Coinbase,
-		Time:        block.Time,
-		Diff:        block.Difficulty,
-		Value:       ethutil.Big(valueStr),
-	})
+
+	/*
+		vm := ethchain.NewVm(state, self.lib.eth.StateManager(), ethchain.RuntimeVars{
+			Block:       block,
+			Origin:      account.Address(),
+			BlockNumber: block.Number,
+			PrevHash:    block.PrevHash,
+			Coinbase:    block.Coinbase,
+			Time:        block.Time,
+			Diff:        block.Difficulty,
+			Value:       ethutil.Big(valueStr),
+		})
+	*/
+	env := utils.NewEnv(state, block, account.Address(), value)
+	vm := ethvm.New(env)
 	vm.Verbose = true
 	vm.Dbg = self.Db
 
@@ -257,13 +265,13 @@ type storeVal struct {
 	Key, Value string
 }
 
-func (self *Debugger) BreakHook(pc int, op ethchain.OpCode, mem *ethchain.Memory, stack *ethchain.Stack, stateObject *ethchain.StateObject) bool {
+func (self *Debugger) BreakHook(pc int, op ethvm.OpCode, mem *ethvm.Memory, stack *ethvm.Stack, stateObject *ethstate.StateObject) bool {
 	self.main.Logln("break on instr:", pc)
 
 	return self.halting(pc, op, mem, stack, stateObject)
 }
 
-func (self *Debugger) StepHook(pc int, op ethchain.OpCode, mem *ethchain.Memory, stack *ethchain.Stack, stateObject *ethchain.StateObject) bool {
+func (self *Debugger) StepHook(pc int, op ethvm.OpCode, mem *ethvm.Memory, stack *ethvm.Stack, stateObject *ethstate.StateObject) bool {
 	return self.halting(pc, op, mem, stack, stateObject)
 }
 
@@ -275,7 +283,7 @@ func (self *Debugger) BreakPoints() []int64 {
 	return self.breakPoints
 }
 
-func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, stack *ethchain.Stack, stateObject *ethchain.StateObject) bool {
+func (d *Debugger) halting(pc int, op ethvm.OpCode, mem *ethvm.Memory, stack *ethvm.Stack, stateObject *ethstate.StateObject) bool {
 	d.win.Root().Call("setInstruction", pc)
 	d.win.Root().Call("clearMem")
 	d.win.Root().Call("clearStack")
diff --git a/ethereal/ext_app.go b/ethereal/ext_app.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethpub"
+	"github.com/ethereum/eth-go/ethstate"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/go-qml/qml"
 )
@@ -16,8 +17,8 @@ type AppContainer interface {
 	Engine() *qml.Engine
 
 	NewBlock(*ethchain.Block)
-	ObjectChanged(*ethchain.StateObject)
-	StorageChanged(*ethchain.StorageState)
+	ObjectChanged(*ethstate.StateObject)
+	StorageChanged(*ethstate.StorageState)
 	NewWatcher(chan bool)
 }
 
@@ -108,9 +109,9 @@ out:
 				app.container.NewBlock(block)
 			}
 		case object := <-app.changeChan:
-			if stateObject, ok := object.Resource.(*ethchain.StateObject); ok {
+			if stateObject, ok := object.Resource.(*ethstate.StateObject); ok {
 				app.container.ObjectChanged(stateObject)
-			} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
+			} else if storageObject, ok := object.Resource.(*ethstate.StorageState); ok {
 				app.container.StorageChanged(storageObject)
 			}
 		}
diff --git a/ethereal/html_container.go b/ethereal/html_container.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethpub"
+	"github.com/ethereum/eth-go/ethstate"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/go-qml/qml"
 	"github.com/howeyc/fsnotify"
@@ -121,11 +122,11 @@ func (app *HtmlApplication) NewBlock(block *ethchain.Block) {
 	app.webView.Call("onNewBlockCb", b)
 }
 
-func (app *HtmlApplication) ObjectChanged(stateObject *ethchain.StateObject) {
+func (app *HtmlApplication) ObjectChanged(stateObject *ethstate.StateObject) {
 	app.webView.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject))
 }
 
-func (app *HtmlApplication) StorageChanged(storageObject *ethchain.StorageState) {
+func (app *HtmlApplication) StorageChanged(storageObject *ethstate.StorageState) {
 	app.webView.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject))
 }
 
diff --git a/ethereal/main.go b/ethereal/main.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	ClientIdentifier = "Ethereal"
-	Version          = "0.5.17"
+	Version          = "0.6.0"
 )
 
 func main() {
diff --git a/ethereal/qml_container.go b/ethereal/qml_container.go
@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethpub"
+	"github.com/ethereum/eth-go/ethstate"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/go-qml/qml"
 	"runtime"
@@ -50,11 +51,11 @@ func (app *QmlApplication) NewBlock(block *ethchain.Block) {
 	app.win.Call("onNewBlockCb", pblock)
 }
 
-func (app *QmlApplication) ObjectChanged(stateObject *ethchain.StateObject) {
+func (app *QmlApplication) ObjectChanged(stateObject *ethstate.StateObject) {
 	app.win.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject))
 }
 
-func (app *QmlApplication) StorageChanged(storageObject *ethchain.StorageState) {
+func (app *QmlApplication) StorageChanged(storageObject *ethstate.StorageState) {
 	app.win.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject))
 }
 
diff --git a/ethereal/ui_lib.go b/ethereal/ui_lib.go
@@ -78,8 +78,8 @@ func (ui *UiLib) AssetPath(p string) string {
 func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
 	dbWindow := NewDebuggerWindow(self)
 	object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.Hex2Bytes(contractHash))
-	if len(object.Script()) > 0 {
-		dbWindow.SetCode("0x" + ethutil.Bytes2Hex(object.Script()))
+	if len(object.Code) > 0 {
+		dbWindow.SetCode("0x" + ethutil.Bytes2Hex(object.Code))
 	}
 	dbWindow.SetData("0x" + data)
 
diff --git a/ethereum/main.go b/ethereum/main.go
@@ -9,7 +9,7 @@ import (
 
 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.5.17"
+	Version          = "0.6.0"
 )
 
 var logger = ethlog.NewLogger("CLI")
diff --git a/ethereum/repl/javascript_runtime.go b/ethereum/repl/javascript_runtime.go
@@ -6,6 +6,7 @@ import (
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethlog"
 	"github.com/ethereum/eth-go/ethpub"
+	"github.com/ethereum/eth-go/ethstate"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/utils"
 	"github.com/obscuren/otto"
@@ -121,12 +122,12 @@ out:
 			if _, ok := block.Resource.(*ethchain.Block); ok {
 			}
 		case object := <-self.changeChan:
-			if stateObject, ok := object.Resource.(*ethchain.StateObject); ok {
+			if stateObject, ok := object.Resource.(*ethstate.StateObject); ok {
 				for _, cb := range self.objectCb[ethutil.Bytes2Hex(stateObject.Address())] {
 					val, _ := self.vm.ToValue(ethpub.NewPStateObject(stateObject))
 					cb.Call(cb, val)
 				}
-			} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
+			} else if storageObject, ok := object.Resource.(*ethstate.StorageState); ok {
 				for _, cb := range self.objectCb[ethutil.Bytes2Hex(storageObject.StateAddress)+ethutil.Bytes2Hex(storageObject.Address)] {
 					val, _ := self.vm.ToValue(ethpub.NewPStorageState(storageObject))
 					cb.Call(cb, val)
diff --git a/utils/vm_env.go b/utils/vm_env.go
@@ -0,0 +1,33 @@
+package utils
+
+import (
+	"github.com/ethereum/eth-go/ethchain"
+	"github.com/ethereum/eth-go/ethstate"
+	"math/big"
+)
+
+type VMEnv struct {
+	state *ethstate.State
+	block *ethchain.Block
+
+	transactor []byte
+	value      *big.Int
+}
+
+func NewEnv(state *ethstate.State, block *ethchain.Block, transactor []byte, value *big.Int) *VMEnv {
+	return &VMEnv{
+		state:      state,
+		block:      block,
+		transactor: transactor,
+		value:      value,
+	}
+}
+
+func (self *VMEnv) Origin() []byte         { return self.transactor }
+func (self *VMEnv) BlockNumber() *big.Int  { return self.block.Number }
+func (self *VMEnv) PrevHash() []byte       { return self.block.PrevHash }
+func (self *VMEnv) Coinbase() []byte       { return self.block.Coinbase }
+func (self *VMEnv) Time() int64            { return self.block.Time }
+func (self *VMEnv) Difficulty() *big.Int   { return self.block.Difficulty }
+func (self *VMEnv) Value() *big.Int        { return self.value }
+func (self *VMEnv) State() *ethstate.State { return self.state }

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,8 @@ ApplicationWindow {`
`249`	`249`	`}`
`250`	`250`	`TextField {`
`251`	`251`	`text: eth.getCustomIdentifier()`
	`252`	`+ width: 500`
	`253`	`+ placeholderText: "Anonymous"`
`252`	`254`	`onTextChanged: {`
`253`	`255`	`eth.setCustomIdentifier(text)`
`254`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"github.com/ethereum/eth-go/ethchain"`
`6`	`6`	`"github.com/ethereum/eth-go/ethpub"`
	`7`	`+ "github.com/ethereum/eth-go/ethstate"`
`7`	`8`	`"github.com/ethereum/eth-go/ethutil"`
`8`	`9`	`"github.com/go-qml/qml"`
`9`	`10`	`)`
`@@ -16,8 +17,8 @@ type AppContainer interface {`
`16`	`17`	`Engine() *qml.Engine`
`17`	`18`
`18`	`19`	`NewBlock(*ethchain.Block)`
`19`		`- ObjectChanged(*ethchain.StateObject)`
`20`		`- StorageChanged(*ethchain.StorageState)`
	`20`	`+ ObjectChanged(*ethstate.StateObject)`
	`21`	`+ StorageChanged(*ethstate.StorageState)`
`21`	`22`	`NewWatcher(chan bool)`
`22`	`23`	`}`
`23`	`24`
`@@ -108,9 +109,9 @@ out:`
`108`	`109`	`app.container.NewBlock(block)`
`109`	`110`	`}`
`110`	`111`	`case object := <-app.changeChan:`
`111`		`- if stateObject, ok := object.Resource.(*ethchain.StateObject); ok {`
	`112`	`+ if stateObject, ok := object.Resource.(*ethstate.StateObject); ok {`
`112`	`113`	`app.container.ObjectChanged(stateObject)`
`113`		`- } else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {`
	`114`	`+ } else if storageObject, ok := object.Resource.(*ethstate.StorageState); ok {`
`114`	`115`	`app.container.StorageChanged(storageObject)`
`115`	`116`	`}`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"github.com/ethereum/eth-go/ethchain"`
`6`	`6`	`"github.com/ethereum/eth-go/ethpub"`
	`7`	`+ "github.com/ethereum/eth-go/ethstate"`
`7`	`8`	`"github.com/ethereum/eth-go/ethutil"`
`8`	`9`	`"github.com/go-qml/qml"`
`9`	`10`	`"github.com/howeyc/fsnotify"`
`@@ -121,11 +122,11 @@ func (app HtmlApplication) NewBlock(block ethchain.Block) {`
`121`	`122`	`app.webView.Call("onNewBlockCb", b)`
`122`	`123`	`}`
`123`	`124`
`124`		`-func (app HtmlApplication) ObjectChanged(stateObject ethchain.StateObject) {`
	`125`	`+func (app HtmlApplication) ObjectChanged(stateObject ethstate.StateObject) {`
`125`	`126`	`app.webView.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject))`
`126`	`127`	`}`
`127`	`128`
`128`		`-func (app HtmlApplication) StorageChanged(storageObject ethchain.StorageState) {`
	`129`	`+func (app HtmlApplication) StorageChanged(storageObject ethstate.StorageState) {`
`129`	`130`	`app.webView.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject))`
`130`	`131`	`}`
`131`	`132`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`const (`
`12`	`12`	`ClientIdentifier = "Ethereal"`
`13`		`- Version = "0.5.17"`
	`13`	`+ Version = "0.6.0"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"github.com/ethereum/eth-go/ethchain"`
`5`	`5`	`"github.com/ethereum/eth-go/ethpub"`
	`6`	`+ "github.com/ethereum/eth-go/ethstate"`
`6`	`7`	`"github.com/ethereum/eth-go/ethutil"`
`7`	`8`	`"github.com/go-qml/qml"`
`8`	`9`	`"runtime"`
`@@ -50,11 +51,11 @@ func (app QmlApplication) NewBlock(block ethchain.Block) {`
`50`	`51`	`app.win.Call("onNewBlockCb", pblock)`
`51`	`52`	`}`
`52`	`53`
`53`		`-func (app QmlApplication) ObjectChanged(stateObject ethchain.StateObject) {`
	`54`	`+func (app QmlApplication) ObjectChanged(stateObject ethstate.StateObject) {`
`54`	`55`	`app.win.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject))`
`55`	`56`	`}`
`56`	`57`
`57`		`-func (app QmlApplication) StorageChanged(storageObject ethchain.StorageState) {`
	`58`	`+func (app QmlApplication) StorageChanged(storageObject ethstate.StorageState) {`
`58`	`59`	`app.win.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject))`
`59`	`60`	`}`
`60`	`61`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`const (`
`11`	`11`	`ClientIdentifier = "Ethereum(G)"`
`12`		`- Version = "0.5.17"`
	`12`	`+ Version = "0.6.0"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var logger = ethlog.NewLogger("CLI")`