diff --git a/chain/execution.go b/chain/execution.go
new file mode 100644
index 0000000000000000000000000000000000000000..932ffa868ef0113f81be61fc48a8a063c0d903a1
--- /dev/null
+++ b/chain/execution.go
@@ -0,0 +1,80 @@
+package chain
+
+import (
+ "fmt"
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/state"
+ "github.com/ethereum/go-ethereum/vm"
+)
+
+type Execution struct {
+ vm vm.VirtualMachine
+ address, input []byte
+ Gas, price, value *big.Int
+ object *state.StateObject
+ SkipTransfer bool
+}
+
+func NewExecution(vm vm.VirtualMachine, address, input []byte, gas, gasPrice, value *big.Int) *Execution {
+ return &Execution{vm: vm, address: address, input: input, Gas: gas, price: gasPrice, value: value}
+}
+
+func (self *Execution) Addr() []byte {
+ return self.address
+}
+
+func (self *Execution) Call(codeAddr []byte, caller vm.ClosureRef) ([]byte, error) {
+ // Retrieve the executing code
+ code := self.vm.Env().State().GetCode(codeAddr)
+
+ return self.exec(code, codeAddr, caller)
+}
+
+func (self *Execution) exec(code, caddr []byte, caller vm.ClosureRef) (ret []byte, err error) {
+ env := self.vm.Env()
+
+ chainlogger.Debugf("pre state %x\n", env.State().Root())
+ snapshot := env.State().Copy()
+ defer func() {
+ if vm.IsDepthErr(err) || vm.IsOOGErr(err) {
+ env.State().Set(snapshot)
+ }
+ chainlogger.Debugf("post state %x\n", env.State().Root())
+ }()
+
+ from, to := env.State().GetStateObject(caller.Address()), env.State().GetOrNewStateObject(self.address)
+ // Skipping transfer is used on testing for the initial call
+ if !self.SkipTransfer {
+ err = env.Transfer(from, to, self.value)
+ }
+
+ if err != nil {
+ caller.ReturnGas(self.Gas, self.price)
+
+ err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
+ } else {
+ self.object = to
+ // Pre-compiled contracts (address.go) 1, 2 & 3.
+ naddr := ethutil.BigD(caddr).Uint64()
+ if p := vm.Precompiled[naddr]; p != nil {
+ if self.Gas.Cmp(p.Gas) >= 0 {
+ ret = p.Call(self.input)
+ self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
+ self.vm.Endl()
+ }
+ } else {
+ ret, err = self.vm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
+ }
+ }
+
+ return
+}
+
+func (self *Execution) Create(caller vm.ClosureRef) (ret []byte, err error, account *state.StateObject) {
+ ret, err = self.exec(self.input, nil, caller)
+ account = self.vm.Env().State().GetStateObject(self.address)
+
+ return
+}
diff --git a/chain/state_transition.go b/chain/state_transition.go
index 8f7b55cd45778937bfc21eedc32d8e62703763c6..b2ba4f22a5ac2522c6a6ec653265d236f93dd158 100644
--- a/chain/state_transition.go
+++ b/chain/state_transition.go
@@ -169,120 +169,21 @@ func (self *StateTransition) TransitionState() (err error) {
return
}
- if sender.Balance().Cmp(self.value) < 0 {
- return fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, sender.Balance)
- }
-
- var snapshot *state.State
- // If the receiver is nil it's a contract (\0*32).
+ var ret []byte
+ vmenv := NewEnv(self.state, self.tx, self.block)
+ var ref vm.ClosureRef
if tx.CreatesContract() {
- // Subtract the (irreversible) amount from the senders account
- sender.SubAmount(self.value)
+ self.rec = MakeContract(tx, self.state)
- snapshot = self.state.Copy()
-
- // Create a new state object for the contract
- receiver = MakeContract(tx, self.state)
- self.rec = receiver
- if receiver == nil {
- return fmt.Errorf("Unable to create contract")
- }
-
- // Add the amount to receivers account which should conclude this transaction
- receiver.AddAmount(self.value)
+ ret, err, ref = vmenv.Create(sender, receiver.Address(), self.tx.Data, self.gas, self.gasPrice, self.value)
+ ref.SetCode(ret)
} else {
- receiver = self.Receiver()
-
- // Subtract the amount from the senders account
- sender.SubAmount(self.value)
- // Add the amount to receivers account which should conclude this transaction
- receiver.AddAmount(self.value)
-
- snapshot = self.state.Copy()
+ ret, err = vmenv.Call(self.Sender(), self.Receiver().Address(), self.tx.Data, self.gas, self.gasPrice, self.value)
}
-
- msg := self.state.Manifest().AddMessage(&state.Message{
- To: receiver.Address(), From: sender.Address(),
- Input: self.tx.Data,
- Origin: sender.Address(),
- Block: self.block.Hash(), Timestamp: self.block.Time, Coinbase: self.block.Coinbase, Number: self.block.Number,
- Value: self.value,
- })
-
- // Process the init code and create 'valid' contract
- if types.IsContractAddr(self.receiver) {
- // Evaluate the initialization script
- // and use the return value as the
- // script section for the state object.
- self.data = nil
-
- code, evmerr := self.Eval(msg, receiver.Init(), receiver)
- if evmerr != nil {
- self.state.Set(snapshot)
-
- statelogger.Debugf("Error during init execution %v", evmerr)
- }
-
- receiver.Code = code
- msg.Output = code
- } else {
- if len(receiver.Code) > 0 {
- ret, evmerr := self.Eval(msg, receiver.Code, receiver)
- if evmerr != nil {
- self.state.Set(snapshot)
-
- statelogger.Debugf("Error during code execution %v", evmerr)
- }
-
- msg.Output = ret
- }
+ if err != nil {
+ statelogger.Debugln(err)
}
- /*
- * XXX The following _should_ replace the above transaction
- * execution (also for regular calls. Will replace / test next
- * phase
- */
- /*
- // Execute transaction
- if tx.CreatesContract() {
- self.rec = MakeContract(tx, self.state)
- }
-
- address := self.Receiver().Address()
- evm := vm.New(NewEnv(state, self.tx, self.block), vm.DebugVmTy)
- exe := NewExecution(evm, address, self.tx.Data, self.gas, self.gas.Price, self.tx.Value)
- ret, err := msg.Exec(address, self.Sender())
- if err != nil {
- statelogger.Debugln(err)
- } else {
- if tx.CreatesContract() {
- self.Receiver().Code = ret
- }
- msg.Output = ret
- }
- */
-
- // Add default LOG. Default = big(sender.addr) + 1
- //addr := ethutil.BigD(receiver.Address())
- //self.state.AddLog(&state.Log{ethutil.U256(addr.Add(addr, ethutil.Big1)).Bytes(), [][]byte{sender.Address()}, nil})
-
- return
-}
-
-func (self *StateTransition) Eval(msg *state.Message, script []byte, context *state.StateObject) (ret []byte, err error) {
- var (
- transactor = self.Sender()
- state = self.state
- env = NewEnv(state, self.tx, self.block)
- callerClosure = vm.NewClosure(msg, transactor, context, script, self.gas, self.gasPrice)
- )
-
- evm := vm.New(env, vm.DebugVmTy)
- // TMP this will change in the refactor
- callerClosure.SetExecution(vm.NewExecution(evm, nil, nil, nil, nil, self.tx.Value))
- ret, _, err = callerClosure.Call(evm, self.tx.Data)
-
return
}
diff --git a/chain/vm_env.go b/chain/vm_env.go
index c1911ff5106221322e78c0a95aeefeda4d8f3258..c2428c23449bdd26ba36e9f1cfaba98d2874a796 100644
--- a/chain/vm_env.go
+++ b/chain/vm_env.go
@@ -12,6 +12,7 @@ type VMEnv struct {
state *state.State
block *types.Block
tx *types.Transaction
+ depth int
}
func NewEnv(state *state.State, tx *types.Transaction, block *types.Block) *VMEnv {
@@ -32,9 +33,31 @@ func (self *VMEnv) BlockHash() []byte { return self.block.Hash() }
func (self *VMEnv) Value() *big.Int { return self.tx.Value }
func (self *VMEnv) State() *state.State { return self.state }
func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit }
+func (self *VMEnv) Depth() int { return self.depth }
+func (self *VMEnv) SetDepth(i int) { self.depth = i }
func (self *VMEnv) AddLog(log *state.Log) {
self.state.AddLog(log)
}
func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
return vm.Transfer(from, to, amount)
}
+
+func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *Execution {
+ evm := vm.New(self, vm.DebugVmTy)
+
+ return NewExecution(evm, addr, data, gas, price, value)
+}
+
+func (self *VMEnv) Call(me vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+ exe := self.vm(addr, data, gas, price, value)
+ return exe.Call(addr, me)
+}
+func (self *VMEnv) CallCode(me vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+ exe := self.vm(me.Address(), data, gas, price, value)
+ return exe.Call(addr, me)
+}
+
+func (self *VMEnv) Create(me vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) {
+ exe := self.vm(addr, data, gas, price, value)
+ return exe.Create(me)
+}
diff --git a/state/state_object.go b/state/state_object.go
index 47c882463d9c4a4dd494cd444606cb3ac02d64e6..a56e91bc591761c16b99d801b2e8ad9eda05d4a7 100644
--- a/state/state_object.go
+++ b/state/state_object.go
@@ -276,15 +276,14 @@ func (c *StateObject) Init() Code {
return c.InitCode
}
-// To satisfy ClosureRef
-func (self *StateObject) Object() *StateObject {
- return self
-}
-
func (self *StateObject) Root() []byte {
return self.State.Trie.GetRoot()
}
+func (self *StateObject) SetCode(code []byte) {
+ self.Code = code
+}
+
//
// Encoding
//
diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index 8e6645fc3148f58028cc94db0d526ff11748af91..6ee50a5ae0d7c435bda57c8bcea9a518d19a6324 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -3,6 +3,7 @@ package helper
import (
"math/big"
+ "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
@@ -10,7 +11,10 @@ import (
)
type Env struct {
- state *state.State
+ depth int
+ state *state.State
+ skipTransfer bool
+ Gas *big.Int
origin []byte
parent []byte
@@ -56,33 +60,71 @@ func (self *Env) GasLimit() *big.Int { return self.gasLimit }
func (self *Env) AddLog(log *state.Log) {
self.logs = append(self.logs, log)
}
+func (self *Env) Depth() int { return self.depth }
+func (self *Env) SetDepth(i int) { self.depth = i }
func (self *Env) Transfer(from, to vm.Account, amount *big.Int) error {
return vm.Transfer(from, to, amount)
}
+func (self *Env) vm(addr, data []byte, gas, price, value *big.Int) *chain.Execution {
+ evm := vm.New(self, vm.DebugVmTy)
+ exec := chain.NewExecution(evm, addr, data, gas, price, value)
+ exec.SkipTransfer = self.skipTransfer
+
+ return exec
+}
+
+func (self *Env) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+ exe := self.vm(addr, data, gas, price, value)
+ ret, err := exe.Call(addr, caller)
+ self.Gas = exe.Gas
+
+ return ret, err
+}
+func (self *Env) CallCode(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+ exe := self.vm(caller.Address(), data, gas, price, value)
+ return exe.Call(addr, caller)
+}
+
+func (self *Env) Create(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) {
+ exe := self.vm(addr, data, gas, price, value)
+ return exe.Create(caller)
+}
+
func RunVm(state *state.State, env, exec map[string]string) ([]byte, state.Logs, *big.Int, error) {
- address := FromHex(exec["address"])
- caller := state.GetOrNewStateObject(FromHex(exec["caller"]))
+ var (
+ to = FromHex(exec["address"])
+ from = FromHex(exec["caller"])
+ data = FromHex(exec["data"])
+ gas = ethutil.Big(exec["gas"])
+ price = ethutil.Big(exec["gasPrice"])
+ value = ethutil.Big(exec["value"])
+ )
+
+ caller := state.GetOrNewStateObject(from)
vmenv := NewEnvFromMap(state, env, exec)
- evm := vm.New(vmenv, vm.DebugVmTy)
- execution := vm.NewExecution(evm, address, FromHex(exec["data"]), ethutil.Big(exec["gas"]), ethutil.Big(exec["gasPrice"]), ethutil.Big(exec["value"]))
- execution.SkipTransfer = true
- ret, err := execution.Exec(address, caller)
+ vmenv.skipTransfer = true
+ ret, err := vmenv.Call(caller, to, data, gas, price, value)
- return ret, vmenv.logs, execution.Gas, err
+ return ret, vmenv.logs, vmenv.Gas, err
}
func RunState(state *state.State, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) {
- address := FromHex(tx["to"])
- keyPair, _ := crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(tx["secretKey"])))
+ var (
+ keyPair, _ = crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(tx["secretKey"])))
+ to = FromHex(tx["to"])
+ data = FromHex(tx["data"])
+ gas = ethutil.Big(tx["gasLimit"])
+ price = ethutil.Big(tx["gasPrice"])
+ value = ethutil.Big(tx["value"])
+ )
+
caller := state.GetOrNewStateObject(keyPair.Address())
vmenv := NewEnvFromMap(state, env, tx)
vmenv.origin = caller.Address()
- evm := vm.New(vmenv, vm.DebugVmTy)
- execution := vm.NewExecution(evm, address, FromHex(tx["data"]), ethutil.Big(tx["gasLimit"]), ethutil.Big(tx["gasPrice"]), ethutil.Big(tx["value"]))
- ret, err := execution.Exec(address, caller)
+ ret, err := vmenv.Call(caller, to, data, gas, price, value)
- return ret, vmenv.logs, execution.Gas, err
+ return ret, vmenv.logs, vmenv.Gas, err
}
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 4c18d29e64cdd5a0d4f973cd1a0cd84ccccc6502..5c4df19757c727e5eb71de608a4f6edc3558edd4 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -1,147 +1,12 @@
package vm
-<<<<<<< HEAD
-// import (
-// "bytes"
-// "testing"
-
-// "github.com/ethereum/go-ethereum/ethutil"
-// "github.com/ethereum/go-ethereum/state"
-// "github.com/ethereum/go-ethereum/tests/helper"
-// )
-
-// type Account struct {
-// Balance string
-// Code string
-// Nonce string
-// Storage map[string]string
-// }
-
-// func StateObjectFromAccount(addr string, account Account) *state.StateObject {
-// obj := state.NewStateObject(ethutil.Hex2Bytes(addr))
-// obj.SetBalance(ethutil.Big(account.Balance))
-
-// if ethutil.IsHex(account.Code) {
-// account.Code = account.Code[2:]
-// }
-// obj.Code = ethutil.Hex2Bytes(account.Code)
-// obj.Nonce = ethutil.Big(account.Nonce).Uint64()
-
-// return obj
-// }
-
-// type VmTest struct {
-// Callcreates interface{}
-// Env map[string]string
-// Exec map[string]string
-// Gas string
-// Out string
-// Post map[string]Account
-// Pre map[string]Account
-// }
-
-// func RunVmTest(p string, t *testing.T) {
-// tests := make(map[string]VmTest)
-// helper.CreateFileTests(t, p, &tests)
-
-// for name, test := range tests {
-// state := state.New(helper.NewTrie())
-// for addr, account := range test.Pre {
-// obj := StateObjectFromAccount(addr, account)
-// state.SetStateObject(obj)
-// }
-
-// ret, gas, err := helper.RunVm(state, test.Env, test.Exec)
-// // When an error is returned it doesn't always mean the tests fails.
-// // Have to come up with some conditional failing mechanism.
-// if err != nil {
-// t.Errorf("%s", err)
-// helper.Log.Infoln(err)
-// }
-
-// rexp := helper.FromHex(test.Out)
-// if bytes.Compare(rexp, ret) != 0 {
-// t.Errorf("%s's return failed. Expected %x, got %x\n", name, rexp, ret)
-// }
-
-// gexp := ethutil.Big(test.Gas)
-// if gexp.Cmp(gas) != 0 {
-// t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
-// }
-
-// for addr, account := range test.Post {
-// obj := state.GetStateObject(helper.FromHex(addr))
-// for addr, value := range account.Storage {
-// v := obj.GetState(helper.FromHex(addr)).Bytes()
-// vexp := helper.FromHex(value)
-
-// if bytes.Compare(v, vexp) != 0 {
-// t.Errorf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, ethutil.BigD(vexp), ethutil.BigD(v))
-// }
-// }
-// }
-// }
-// }
-
-// // I've created a new function for each tests so it's easier to identify where the problem lies if any of them fail.
-// func TestVMArithmetic(t *testing.T) {
-// //helper.Logger.SetLogLevel(5)
-// const fn = "../files/vmtests/vmArithmeticTest.json"
-// RunVmTest(fn, t)
-// }
-
-// /*
-// deleted?
-// func TestVMSystemOperation(t *testing.T) {
-// helper.Logger.SetLogLevel(5)
-// const fn = "../files/vmtests/vmSystemOperationsTest.json"
-// RunVmTest(fn, t)
-// }
-// */
-
-// func TestBitwiseLogicOperation(t *testing.T) {
-// const fn = "../files/vmtests/vmBitwiseLogicOperationTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestBlockInfo(t *testing.T) {
-// const fn = "../files/vmtests/vmBlockInfoTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestEnvironmentalInfo(t *testing.T) {
-// const fn = "../files/vmtests/vmEnvironmentalInfoTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestFlowOperation(t *testing.T) {
-// helper.Logger.SetLogLevel(5)
-// const fn = "../files/vmtests/vmIOandFlowOperationsTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestPushDupSwap(t *testing.T) {
-// const fn = "../files/vmtests/vmPushDupSwapTest.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestVMSha3(t *testing.T) {
-// const fn = "../files/vmtests/vmSha3Test.json"
-// RunVmTest(fn, t)
-// }
-
-// func TestVm(t *testing.T) {
-// const fn = "../files/vmtests/vmtests.json"
-// RunVmTest(fn, t)
-// }
-=======
import (
"bytes"
"math/big"
"strconv"
"testing"
- "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/chain/types"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
@@ -263,7 +128,7 @@ func RunVmTest(p string, t *testing.T) {
}
if len(test.Logs) > 0 {
- genBloom := ethutil.LeftPadBytes(chain.LogsBloom(logs).Bytes(), 64)
+ genBloom := ethutil.LeftPadBytes(types.LogsBloom(logs).Bytes(), 64)
// Logs within the test itself aren't correct, missing empty fields (32 0s)
for bloom /*logs*/, _ := range test.Logs {
if !bytes.Equal(genBloom, ethutil.Hex2Bytes(bloom)) {
@@ -339,4 +204,3 @@ func TestStateSpecialTest(t *testing.T) {
const fn = "../files/StateTests/stSpecialTest.json"
RunVmTest(fn, t)
}
->>>>>>> develop
diff --git a/vm/closure.go b/vm/closure.go
index 5bd8c1bb861e8cda33e6cb0a484516d9163cdc56..2263236e72809a8fa88ad97b619b407819dced63 100644
--- a/vm/closure.go
+++ b/vm/closure.go
@@ -12,7 +12,7 @@ import (
type ClosureRef interface {
ReturnGas(*big.Int, *big.Int)
Address() []byte
- Object() *state.StateObject
+ SetCode([]byte)
GetStorage(*big.Int) *ethutil.Value
SetStorage(*big.Int, *ethutil.Value)
}
@@ -20,10 +20,9 @@ type ClosureRef interface {
// Basic inline closure object which implement the 'closure' interface
type Closure struct {
caller ClosureRef
- object *state.StateObject
+ object ClosureRef
Code []byte
message *state.Message
- exe *Execution
Gas, UsedGas, Price *big.Int
@@ -31,7 +30,7 @@ type Closure struct {
}
// Create a new closure for the given data items
-func NewClosure(msg *state.Message, caller ClosureRef, object *state.StateObject, code []byte, gas, price *big.Int) *Closure {
+func NewClosure(msg *state.Message, caller ClosureRef, object ClosureRef, code []byte, gas, price *big.Int) *Closure {
c := &Closure{message: msg, caller: caller, object: object, Code: code, Args: nil}
// Gas should be a pointer so it can safely be reduced through the run
@@ -89,6 +88,10 @@ func (c *Closure) Gets(x, y *big.Int) *ethutil.Value {
return ethutil.NewValue(partial)
}
+func (self *Closure) SetCode(code []byte) {
+ self.Code = code
+}
+
func (c *Closure) SetStorage(x *big.Int, val *ethutil.Value) {
c.object.SetStorage(x, val)
}
@@ -97,6 +100,7 @@ func (c *Closure) Address() []byte {
return c.object.Address()
}
+/*
func (c *Closure) Call(vm VirtualMachine, args []byte) ([]byte, *big.Int, error) {
c.Args = args
@@ -104,6 +108,7 @@ func (c *Closure) Call(vm VirtualMachine, args []byte) ([]byte, *big.Int, error)
return ret, c.UsedGas, err
}
+*/
func (c *Closure) Return(ret []byte) []byte {
// Return the remaining gas to the caller
@@ -131,14 +136,6 @@ func (c *Closure) ReturnGas(gas, price *big.Int) {
c.UsedGas.Sub(c.UsedGas, gas)
}
-func (c *Closure) Object() *state.StateObject {
- return c.object
-}
-
func (c *Closure) Caller() ClosureRef {
return c.caller
}
-
-func (self *Closure) SetExecution(exe *Execution) {
- self.exe = exe
-}
diff --git a/vm/environment.go b/vm/environment.go
index 5604989e1529e418d0ae83fa426369c9030ab00b..3d75d05b942ec5737f72cbc96c2e8d3df348f990 100644
--- a/vm/environment.go
+++ b/vm/environment.go
@@ -21,6 +21,13 @@ type Environment interface {
GasLimit() *big.Int
Transfer(from, to Account, amount *big.Int) error
AddLog(*state.Log)
+
+ Depth() int
+ SetDepth(i int)
+
+ Call(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+ CallCode(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+ Create(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, ClosureRef)
}
type Object interface {
@@ -43,9 +50,5 @@ func Transfer(from, to Account, amount *big.Int) error {
from.SubBalance(amount)
to.AddBalance(amount)
- // Add default LOG. Default = big(sender.addr) + 1
- //addr := ethutil.BigD(receiver.Address())
- //tx.addLog(vm.Log{sender.Address(), [][]byte{ethutil.U256(addr.Add(addr, ethutil.Big1)).Bytes()}, nil})
-
return nil
}
diff --git a/vm/execution.go b/vm/execution.go
deleted file mode 100644
index 8c04cf53662c65d43ed5321ababc3e7c225b8cf9..0000000000000000000000000000000000000000
--- a/vm/execution.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package vm
-
-import (
- "fmt"
- "math/big"
-
- "github.com/ethereum/go-ethereum/ethutil"
- "github.com/ethereum/go-ethereum/state"
-)
-
-type Execution struct {
- vm VirtualMachine
- address, input []byte
- Gas, price, value *big.Int
- object *state.StateObject
- SkipTransfer bool
-}
-
-func NewExecution(vm VirtualMachine, address, input []byte, gas, gasPrice, value *big.Int) *Execution {
- return &Execution{vm: vm, address: address, input: input, Gas: gas, price: gasPrice, value: value}
-}
-
-func (self *Execution) Addr() []byte {
- return self.address
-}
-
-func (self *Execution) Exec(codeAddr []byte, caller ClosureRef) ([]byte, error) {
- // Retrieve the executing code
- code := self.vm.Env().State().GetCode(codeAddr)
-
- return self.exec(code, codeAddr, caller)
-}
-
-func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte, err error) {
- env := self.vm.Env()
-
- vmlogger.Debugf("pre state %x\n", env.State().Root())
- snapshot := env.State().Copy()
- defer func() {
- if IsDepthErr(err) || IsOOGErr(err) {
- env.State().Set(snapshot)
- }
- vmlogger.Debugf("post state %x\n", env.State().Root())
- }()
-
- msg := env.State().Manifest().AddMessage(&state.Message{
- To: self.address, From: caller.Address(),
- Input: self.input,
- Origin: env.Origin(),
- Block: env.BlockHash(), Timestamp: env.Time(), Coinbase: env.Coinbase(), Number: env.BlockNumber(),
- Value: self.value,
- })
-
- from, to := caller.Object(), env.State().GetOrNewStateObject(self.address)
- // Skipping transfer is used on testing for the initial call
- if !self.SkipTransfer {
- err = env.Transfer(from, to, self.value)
- }
-
- if err != nil {
- caller.ReturnGas(self.Gas, self.price)
-
- err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
- } else {
- self.object = to
- // Pre-compiled contracts (address.go) 1, 2 & 3.
- naddr := ethutil.BigD(caddr).Uint64()
- if p := Precompiled[naddr]; p != nil {
- if self.Gas.Cmp(p.Gas) >= 0 {
- ret = p.Call(self.input)
- self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
- self.vm.Endl()
- }
- } else {
- // Create a new callable closure
- c := NewClosure(msg, caller, to, code, self.Gas, self.price)
- c.exe = self
-
- if self.vm.Depth() == MaxCallDepth {
- c.UseGas(self.Gas)
-
- return c.Return(nil), DepthError{}
- }
-
- // Executer the closure and get the return value (if any)
- ret, _, err = c.Call(self.vm, self.input)
- msg.Output = ret
- }
- }
-
- return
-}
-
-func (self *Execution) Create(caller ClosureRef) (ret []byte, err error) {
- return self.exec(self.input, nil, caller)
-}
diff --git a/vm/virtual_machine.go b/vm/virtual_machine.go
index cc8cd39a9ff4aa9dbc13dd43b323bd63ffb08de5..5738075fb442bcc6a72a2ced4e59908937c0f58b 100644
--- a/vm/virtual_machine.go
+++ b/vm/virtual_machine.go
@@ -1,8 +1,10 @@
package vm
+import "math/big"
+
type VirtualMachine interface {
Env() Environment
- RunClosure(*Closure) ([]byte, error)
+ Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
Depth() int
Printf(string, ...interface{}) VirtualMachine
Endl() VirtualMachine
diff --git a/vm/vm.go b/vm/vm.go
index e1c2d9c14d6c982947b6eb4de8e66832238b02cd..968ca10fa36b6911989a0f2e718bd4f44c9dc688 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -1,12 +1,6 @@
package vm
-import (
- "fmt"
- "math/big"
-
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/ethutil"
-)
+import "math/big"
// BIG FAT WARNING. THIS VM IS NOT YET IS USE!
// I want to get all VM tests pass first before updating this VM
@@ -26,686 +20,8 @@ func New(env Environment, typ Type) VirtualMachine {
}
}
-func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
- self.depth++
-
- // Recover from any require exception
- defer func() {
- if r := recover(); r != nil {
- ret = closure.Return(nil)
- err = fmt.Errorf("%v", r)
- }
- }()
-
- // Don't bother with the execution if there's no code.
- if len(closure.Code) == 0 {
- return closure.Return(nil), nil
- }
-
- var (
- op OpCode
-
- mem = &Memory{}
- stack = NewStack()
- pc = 0
- step = 0
- require = func(m int) {
- if stack.Len() < m {
- panic(fmt.Sprintf("%04v (%v) stack err size = %d, required = %d", pc, op, stack.Len(), m))
- }
- }
- )
-
- for {
- // The base for all big integer arithmetic
- base := new(big.Int)
-
- step++
- // Get the memory location of pc
- op := closure.GetOp(pc)
-
- gas := new(big.Int)
- addStepGasUsage := func(amount *big.Int) {
- gas.Add(gas, amount)
- }
-
- addStepGasUsage(GasStep)
-
- var newMemSize *big.Int = ethutil.Big0
- switch op {
- case STOP:
- gas.Set(ethutil.Big0)
- case SUICIDE:
- gas.Set(ethutil.Big0)
- case SLOAD:
- gas.Set(GasSLoad)
- case SSTORE:
- var mult *big.Int
- y, x := stack.Peekn()
- val := closure.GetStorage(x)
- if val.BigInt().Cmp(ethutil.Big0) == 0 && len(y.Bytes()) > 0 {
- mult = ethutil.Big2
- } else if val.BigInt().Cmp(ethutil.Big0) != 0 && len(y.Bytes()) == 0 {
- mult = ethutil.Big0
- } else {
- mult = ethutil.Big1
- }
- gas = new(big.Int).Mul(mult, GasSStore)
- case BALANCE:
- gas.Set(GasBalance)
- case MSTORE:
- require(2)
- newMemSize = calcMemSize(stack.Peek(), u256(32))
- case MLOAD:
- require(1)
-
- newMemSize = calcMemSize(stack.Peek(), u256(32))
- case MSTORE8:
- require(2)
- newMemSize = calcMemSize(stack.Peek(), u256(1))
- case RETURN:
- require(2)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
- case SHA3:
- require(2)
-
- gas.Set(GasSha)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
- case CALLDATACOPY:
- require(2)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
- case CODECOPY:
- require(3)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
- case EXTCODECOPY:
- require(4)
-
- newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-4])
- case CALL, CALLCODE:
- require(7)
- gas.Set(GasCall)
- addStepGasUsage(stack.data[stack.Len()-1])
-
- x := calcMemSize(stack.data[stack.Len()-6], stack.data[stack.Len()-7])
- y := calcMemSize(stack.data[stack.Len()-4], stack.data[stack.Len()-5])
-
- newMemSize = ethutil.BigMax(x, y)
- case CREATE:
- require(3)
- gas.Set(GasCreate)
-
- newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-3])
- }
-
- if newMemSize.Cmp(ethutil.Big0) > 0 {
- newMemSize.Add(newMemSize, u256(31))
- newMemSize.Div(newMemSize, u256(32))
- newMemSize.Mul(newMemSize, u256(32))
-
- if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
- memGasUsage := new(big.Int).Sub(newMemSize, u256(int64(mem.Len())))
- memGasUsage.Mul(GasMemory, memGasUsage)
- memGasUsage.Div(memGasUsage, u256(32))
-
- addStepGasUsage(memGasUsage)
- }
- }
-
- if !closure.UseGas(gas) {
- err := fmt.Errorf("Insufficient gas for %v. req %v has %v", op, gas, closure.Gas)
-
- closure.UseGas(closure.Gas)
-
- return closure.Return(nil), err
- }
-
- mem.Resize(newMemSize.Uint64())
-
- switch op {
- // 0x20 range
- case ADD:
- require(2)
- x, y := stack.Popn()
-
- base.Add(y, x)
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case SUB:
- require(2)
- x, y := stack.Popn()
-
- base.Sub(y, x)
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case MUL:
- require(2)
- x, y := stack.Popn()
-
- base.Mul(y, x)
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case DIV:
- require(2)
- x, y := stack.Popn()
-
- if x.Cmp(ethutil.Big0) != 0 {
- base.Div(y, x)
- }
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case SDIV:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
-
- if x.Cmp(ethutil.Big0) == 0 {
- base.Set(ethutil.Big0)
- } else {
- n := new(big.Int)
- if new(big.Int).Mul(y, x).Cmp(ethutil.Big0) < 0 {
- n.SetInt64(-1)
- } else {
- n.SetInt64(1)
- }
-
- base.Div(y.Abs(y), x.Mul(x.Abs(x), n))
-
- U256(base)
- }
-
- stack.Push(base)
- case MOD:
- require(2)
- x, y := stack.Popn()
-
- base.Mod(y, x)
-
- U256(base)
-
- stack.Push(base)
- case SMOD:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
-
- if x.Cmp(ethutil.Big0) == 0 {
- base.Set(ethutil.Big0)
- } else {
- n := new(big.Int)
- if y.Cmp(ethutil.Big0) < 0 {
- n.SetInt64(-1)
- } else {
- n.SetInt64(1)
- }
-
- base.Mod(y.Abs(y), x.Mul(x.Abs(x), n))
-
- U256(base)
- }
-
- stack.Push(base)
-
- case EXP:
- require(2)
- x, y := stack.Popn()
-
- base.Exp(y, x, Pow256)
-
- U256(base)
-
- stack.Push(base)
- case NOT:
- require(1)
- base.Sub(Pow256, stack.Pop())
-
- base = U256(base)
-
- stack.Push(base)
- case LT:
- require(2)
- x, y := stack.Popn()
- // x < y
- if y.Cmp(x) < 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case GT:
- require(2)
- x, y := stack.Popn()
-
- // x > y
- if y.Cmp(x) > 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
-
- case SLT:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
- // x < y
- if y.Cmp(S256(x)) < 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case SGT:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
-
- // x > y
- if y.Cmp(x) > 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
-
- case EQ:
- require(2)
- x, y := stack.Popn()
-
- // x == y
- if x.Cmp(y) == 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case ISZERO:
- require(1)
- x := stack.Pop()
- if x.Cmp(ethutil.BigFalse) > 0 {
- stack.Push(ethutil.BigFalse)
- } else {
- stack.Push(ethutil.BigTrue)
- }
-
- // 0x10 range
- case AND:
- require(2)
- x, y := stack.Popn()
-
- stack.Push(base.And(y, x))
- case OR:
- require(2)
- x, y := stack.Popn()
-
- stack.Push(base.Or(y, x))
- case XOR:
- require(2)
- x, y := stack.Popn()
-
- stack.Push(base.Xor(y, x))
- case BYTE:
- require(2)
- val, th := stack.Popn()
- if th.Cmp(big.NewInt(32)) < 0 && th.Cmp(big.NewInt(int64(len(val.Bytes())))) < 0 {
- byt := big.NewInt(int64(ethutil.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
- stack.Push(byt)
-
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case ADDMOD:
- require(3)
-
- x := stack.Pop()
- y := stack.Pop()
- z := stack.Pop()
-
- base.Add(x, y)
- base.Mod(base, z)
-
- U256(base)
-
- stack.Push(base)
- case MULMOD:
- require(3)
-
- x := stack.Pop()
- y := stack.Pop()
- z := stack.Pop()
-
- base.Mul(x, y)
- base.Mod(base, z)
-
- U256(base)
-
- stack.Push(base)
-
- // 0x20 range
- case SHA3:
- require(2)
- size, offset := stack.Popn()
- data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
-
- stack.Push(ethutil.BigD(data))
-
- // 0x30 range
- case ADDRESS:
- stack.Push(ethutil.BigD(closure.Address()))
-
- case BALANCE:
- require(1)
-
- addr := stack.Pop().Bytes()
- balance := self.env.State().GetBalance(addr)
-
- stack.Push(balance)
-
- case ORIGIN:
- origin := self.env.Origin()
-
- stack.Push(ethutil.BigD(origin))
-
- case CALLER:
- caller := closure.caller.Address()
- stack.Push(ethutil.BigD(caller))
-
- case CALLVALUE:
- value := closure.exe.value
-
- stack.Push(value)
-
- case CALLDATALOAD:
- require(1)
- var (
- offset = stack.Pop()
- data = make([]byte, 32)
- lenData = big.NewInt(int64(len(closure.Args)))
- )
-
- if lenData.Cmp(offset) >= 0 {
- length := new(big.Int).Add(offset, ethutil.Big32)
- length = ethutil.BigMin(length, lenData)
-
- copy(data, closure.Args[offset.Int64():length.Int64()])
- }
-
- stack.Push(ethutil.BigD(data))
- case CALLDATASIZE:
- l := int64(len(closure.Args))
- stack.Push(big.NewInt(l))
-
- case CALLDATACOPY:
- var (
- size = int64(len(closure.Args))
- mOff = stack.Pop().Int64()
- cOff = stack.Pop().Int64()
- l = stack.Pop().Int64()
- )
-
- if cOff > size {
- cOff = 0
- l = 0
- } else if cOff+l > size {
- l = 0
- }
-
- code := closure.Args[cOff : cOff+l]
-
- mem.Set(mOff, l, code)
- case CODESIZE, EXTCODESIZE:
- var code []byte
- if op == EXTCODECOPY {
- addr := stack.Pop().Bytes()
-
- code = self.env.State().GetCode(addr)
- } else {
- code = closure.Code
- }
-
- l := big.NewInt(int64(len(code)))
- stack.Push(l)
-
- case CODECOPY, EXTCODECOPY:
- var code []byte
- if op == EXTCODECOPY {
- addr := stack.Pop().Bytes()
-
- code = self.env.State().GetCode(addr)
- } else {
- code = closure.Code
- }
-
- var (
- size = int64(len(code))
- mOff = stack.Pop().Int64()
- cOff = stack.Pop().Int64()
- l = stack.Pop().Int64()
- )
-
- if cOff > size {
- cOff = 0
- l = 0
- } else if cOff+l > size {
- l = 0
- }
-
- codeCopy := code[cOff : cOff+l]
-
- mem.Set(mOff, l, codeCopy)
- case GASPRICE:
- stack.Push(closure.Price)
-
- // 0x40 range
- case PREVHASH:
- prevHash := self.env.PrevHash()
-
- stack.Push(ethutil.BigD(prevHash))
-
- case COINBASE:
- coinbase := self.env.Coinbase()
-
- stack.Push(ethutil.BigD(coinbase))
-
- case TIMESTAMP:
- time := self.env.Time()
-
- stack.Push(big.NewInt(time))
-
- case NUMBER:
- number := self.env.BlockNumber()
-
- stack.Push(number)
-
- case DIFFICULTY:
- difficulty := self.env.Difficulty()
-
- stack.Push(difficulty)
-
- case GASLIMIT:
- // TODO
- stack.Push(big.NewInt(0))
-
- // 0x50 range
- case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
- a := int(op - PUSH1 + 1)
- val := ethutil.BigD(closure.GetBytes(int(pc+1), a))
- // Push value to stack
- stack.Push(val)
-
- pc += a
-
- step += int(op) - int(PUSH1) + 1
- case POP:
- require(1)
- stack.Pop()
- case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
- n := int(op - DUP1 + 1)
- stack.Dupn(n)
- case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
- n := int(op - SWAP1 + 2)
- stack.Swapn(n)
-
- case MLOAD:
- require(1)
- offset := stack.Pop()
- val := ethutil.BigD(mem.Get(offset.Int64(), 32))
- stack.Push(val)
-
- case MSTORE: // Store the value at stack top-1 in to memory at location stack top
- require(2)
- // Pop value of the stack
- val, mStart := stack.Popn()
- mem.Set(mStart.Int64(), 32, ethutil.BigToBytes(val, 256))
-
- case MSTORE8:
- require(2)
- off := stack.Pop()
- val := stack.Pop()
-
- mem.store[off.Int64()] = byte(val.Int64() & 0xff)
-
- case SLOAD:
- require(1)
- loc := stack.Pop()
- val := closure.GetStorage(loc)
-
- stack.Push(val.BigInt())
-
- case SSTORE:
- require(2)
- val, loc := stack.Popn()
- closure.SetStorage(loc, ethutil.NewValue(val))
-
- closure.message.AddStorageChange(loc.Bytes())
-
- case JUMP:
- require(1)
- pc = int(stack.Pop().Int64())
- // Reduce pc by one because of the increment that's at the end of this for loop
-
- continue
- case JUMPI:
- require(2)
- cond, pos := stack.Popn()
- if cond.Cmp(ethutil.BigTrue) >= 0 {
- pc = int(pos.Int64())
-
- if closure.GetOp(int(pc)) != JUMPDEST {
- return closure.Return(nil), fmt.Errorf("JUMP missed JUMPDEST %v", pc)
- }
-
- continue
- }
- case JUMPDEST:
- case PC:
- stack.Push(u256(int64(pc)))
- case MSIZE:
- stack.Push(big.NewInt(int64(mem.Len())))
- case GAS:
- stack.Push(closure.Gas)
- // 0x60 range
- case CREATE:
- require(3)
-
- var (
- err error
- value = stack.Pop()
- size, offset = stack.Popn()
- input = mem.Get(offset.Int64(), size.Int64())
- gas = new(big.Int).Set(closure.Gas)
-
- // Snapshot the current stack so we are able to
- // revert back to it later.
- //snapshot = self.env.State().Copy()
- )
-
- // Generate a new address
- addr := crypto.CreateAddress(closure.Address(), closure.object.Nonce)
- closure.object.Nonce++
-
- closure.UseGas(closure.Gas)
-
- msg := NewExecution(self, addr, input, gas, closure.Price, value)
- ret, err := msg.Exec(addr, closure)
- if err != nil {
- stack.Push(ethutil.BigFalse)
-
- // Revert the state as it was before.
- //self.env.State().Set(snapshot)
-
- } else {
- msg.object.Code = ret
-
- stack.Push(ethutil.BigD(addr))
- }
-
- case CALL, CALLCODE:
- require(7)
-
- gas := stack.Pop()
- // Pop gas and value of the stack.
- value, addr := stack.Popn()
- // Pop input size and offset
- inSize, inOffset := stack.Popn()
- // Pop return size and offset
- retSize, retOffset := stack.Popn()
-
- // Get the arguments from the memory
- args := mem.Get(inOffset.Int64(), inSize.Int64())
-
- var executeAddr []byte
- if op == CALLCODE {
- executeAddr = closure.Address()
- } else {
- executeAddr = addr.Bytes()
- }
-
- msg := NewExecution(self, executeAddr, args, gas, closure.Price, value)
- ret, err := msg.Exec(addr.Bytes(), closure)
- if err != nil {
- stack.Push(ethutil.BigFalse)
- } else {
- stack.Push(ethutil.BigTrue)
-
- mem.Set(retOffset.Int64(), retSize.Int64(), ret)
- }
-
- case RETURN:
- require(2)
- size, offset := stack.Popn()
- ret := mem.Get(offset.Int64(), size.Int64())
-
- return closure.Return(ret), nil
- case SUICIDE:
- require(1)
-
- receiver := self.env.State().GetOrNewStateObject(stack.Pop().Bytes())
-
- receiver.AddAmount(closure.object.Balance())
-
- closure.object.MarkForDeletion()
-
- fallthrough
- case STOP: // Stop the closure
-
- return closure.Return(nil), nil
- default:
- vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
-
- //panic(fmt.Sprintf("Invalid opcode %x", op))
-
- return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
- }
-
- pc++
- }
+func (self *Vm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) (ret []byte, err error) {
+ return nil, nil
}
func (self *Vm) Env() Environment {
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
index 91d3c55c1b39f47a6d311ec50d3a105277c84a6e..26756fceb9fe94f189cb931c48d8908a024c34f1 100644
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
@@ -35,11 +35,26 @@ func NewDebugVm(env Environment) *DebugVm {
lt = LogTyDiff
}
- return &DebugVm{env: env, logTy: lt, Recoverable: false}
+ return &DebugVm{env: env, logTy: lt, Recoverable: true}
}
-func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
- self.depth++
+func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
+ self.env.SetDepth(self.env.Depth() + 1)
+
+ msg := self.env.State().Manifest().AddMessage(&state.Message{
+ To: me.Address(), From: caller.Address(),
+ Input: callData,
+ Origin: self.env.Origin(),
+ Block: self.env.BlockHash(), Timestamp: self.env.Time(), Coinbase: self.env.Coinbase(), Number: self.env.BlockNumber(),
+ Value: value,
+ })
+ closure := NewClosure(msg, caller, me, code, gas, price)
+
+ if self.env.Depth() == MaxCallDepth {
+ closure.UseGas(gas)
+
+ return closure.Return(nil), DepthError{}
+ }
if self.Recoverable {
// Recover from any require exception
@@ -96,17 +111,12 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
}
)
- // Debug hook
- if self.Dbg != nil {
- self.Dbg.SetCode(closure.Code)
- }
-
// Don't bother with the execution if there's no code.
- if len(closure.Code) == 0 {
+ if len(code) == 0 {
return closure.Return(nil), nil
}
- vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.depth, closure.Address(), closure.Gas, closure.Args)
+ vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.depth, closure.Address(), closure.Gas, callData)
for {
prevStep = step
@@ -596,8 +606,6 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
self.Printf(" => %x", caller)
case CALLVALUE:
- value := closure.exe.value
-
stack.Push(value)
self.Printf(" => %v", value)
@@ -605,27 +613,27 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
var (
offset = stack.Pop()
data = make([]byte, 32)
- lenData = big.NewInt(int64(len(closure.Args)))
+ lenData = big.NewInt(int64(len(callData)))
)
if lenData.Cmp(offset) >= 0 {
length := new(big.Int).Add(offset, ethutil.Big32)
length = ethutil.BigMin(length, lenData)
- copy(data, closure.Args[offset.Int64():length.Int64()])
+ copy(data, callData[offset.Int64():length.Int64()])
}
self.Printf(" => 0x%x", data)
stack.Push(ethutil.BigD(data))
case CALLDATASIZE:
- l := int64(len(closure.Args))
+ l := int64(len(callData))
stack.Push(big.NewInt(l))
self.Printf(" => %d", l)
case CALLDATACOPY:
var (
- size = int64(len(closure.Args))
+ size = int64(len(callData))
mOff = stack.Pop().Int64()
cOff = stack.Pop().Int64()
l = stack.Pop().Int64()
@@ -638,7 +646,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
l = 0
}
- code := closure.Args[cOff : cOff+l]
+ code := callData[cOff : cOff+l]
mem.Set(mOff, l, code)
@@ -847,17 +855,14 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
closure.UseGas(closure.Gas)
- msg := NewExecution(self, addr, input, gas, closure.Price, value)
- ret, err := msg.Create(closure)
+ ret, err, ref := self.env.Create(closure, addr, input, gas, price, value)
if err != nil {
stack.Push(ethutil.BigFalse)
- // Revert the state as it was before.
- //self.env.State().Set(snapshot)
-
self.Printf("CREATE err %v", err)
} else {
- msg.object.Code = ret
+ ref.SetCode(ret)
+ msg.Output = ret
stack.Push(ethutil.BigD(addr))
}
@@ -889,14 +894,14 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
executeAddr = addr.Bytes()
}
- msg := NewExecution(self, executeAddr, args, gas, closure.Price, value)
- ret, err := msg.Exec(addr.Bytes(), closure)
+ ret, err := self.env.Call(closure, executeAddr, args, gas, price, value)
if err != nil {
stack.Push(ethutil.BigFalse)
vmlogger.Debugln(err)
} else {
stack.Push(ethutil.BigTrue)
+ msg.Output = ret
mem.Set(retOffset.Int64(), retSize.Int64(), ret)
}