Skip to content

G
Geth-Modification
Commit 99853ac3 authored by obscuren's avatar obscuren
Browse files
Options

Moved execution from vm to chain. 

This moves call and create to the specified environments. Vms are no
longer re-used. Vm uses environment's Call(Code) and Create in order to
execute new contracts or transfer value between accounts.

State transition now uses the same mechanism described above.
parent 82405501
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 994 deletions
vm/execution.go → chain/execution.go
View file @ 99853ac3
package vm
package chain
import (
"fmt"
......@@ -6,17 +6,18 @@ import (
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/vm"
)
type Execution struct {
vm VirtualMachine
vm 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 {
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}
}
......@@ -24,34 +25,26 @@ func (self *Execution) Addr() []byte {
return self.address
}
func (self *Execution) Exec(codeAddr []byte, caller ClosureRef) ([]byte, error) {
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 ClosureRef) (ret []byte, err error) {
func (self *Execution) exec(code, caddr []byte, caller vm.ClosureRef) (ret []byte, err error) {
env := self.vm.Env()
vmlogger.Debugf("pre state %x\n", env.State().Root())
chainlogger.Debugf("pre state %x\n", env.State().Root())
snapshot := env.State().Copy()
defer func() {
if IsDepthErr(err) || IsOOGErr(err) {
if vm.IsDepthErr(err) || vm.IsOOGErr(err) {
env.State().Set(snapshot)
}
vmlogger.Debugf("post state %x\n", env.State().Root())
chainlogger.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)
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)
......@@ -65,32 +58,23 @@ func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte,
self.object = to
// Pre-compiled contracts (address.go) 1, 2 & 3.
naddr := ethutil.BigD(caddr).Uint64()
if p := Precompiled[naddr]; p != nil {
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 {
// 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
ret, err = self.vm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
}
}
return
}
func (self *Execution) Create(caller ClosureRef) (ret []byte, err error) {
return self.exec(self.input, nil, caller)
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
}
chain/state_transition.go
View file @ 99853ac3
......@@ -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
}
......
chain/vm_env.go
View file @ 99853ac3
......@@ -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)
}
state/state_object.go
View file @ 99853ac3
......@@ -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
//
......
tests/helper/vm.go
View file @ 99853ac3
......@@ -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
}
tests/vm/gh_test.go
View file @ 99853ac3
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
vm/closure.go
View file @ 99853ac3
......@@ -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
}
vm/environment.go
View file @ 99853ac3
......@@ -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
}
vm/virtual_machine.go
View file @ 99853ac3
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
......
vm/vm.go
View file @ 99853ac3
This diff is collapsed.
vm/vm_debug.go
View file @ 99853ac3
......@@ -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)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment