forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Pass price to Call/Create

Browse source
This commit is contained in:
Paweł Bylica 2015-01-20 17:28:41 +01:00
parent 0f06b54a91
commit 8e7afcc25d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vm/vm_jit.go
View file

@ -20,8 +20,9 @@ import (
) )
type JitVm struct { type JitVm struct {
env Environment env Environment
me ContextRef me ContextRef
price *big.Int
} }
type i256 [32]byte type i256 [32]byte
@ -133,6 +134,7 @@ func NewJitVm(env Environment) *JitVm {
func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) { func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
self.me = me // FIXME: Make sure Run() is not used more than once self.me = me // FIXME: Make sure Run() is not used more than once
self.price = price
var data RuntimeData var data RuntimeData
data.elems[Gas] = big2llvm(gas) data.elems[Gas] = big2llvm(gas)
@ -257,8 +259,7 @@ func env_call(_vm unsafe.Pointer, _gas unsafe.Pointer, _receiveAddr unsafe.Point
//codeAddr := llvm2hash((*i256)(_codeAddr)) //TODO: Handle CallCode //codeAddr := llvm2hash((*i256)(_codeAddr)) //TODO: Handle CallCode
llvmGas := (*i256)(_gas) llvmGas := (*i256)(_gas)
gas := llvm2big(llvmGas) gas := llvm2big(llvmGas)
price := big.NewInt(0) // TODO out, err := vm.env.Call(vm.me, receiveAddr, inData, gas, vm.price, value)
out, err := vm.env.Call(vm.me, receiveAddr, inData, gas, price, value)
*llvmGas = big2llvm(gas) *llvmGas = big2llvm(gas)
if err == nil { if err == nil {
copy(outData, out) copy(outData, out)
@ -282,8 +283,7 @@ func env_create(_vm unsafe.Pointer, _gas unsafe.Pointer, _value unsafe.Pointer,
initData := llvm2bytes(initDataPtr, initDataLen) initData := llvm2bytes(initDataPtr, initDataLen)
llvmGas := (*i256)(_gas) llvmGas := (*i256)(_gas)
gas := llvm2big(llvmGas) gas := llvm2big(llvmGas)
price := big.NewInt(0) // TODO addr, _, _ := vm.Env().Create(vm.me, vm.me.Address(), initData, gas, vm.price, value)
addr, _, _ := vm.Env().Create(vm.me, vm.me.Address(), initData, gas, price, value)
*llvmGas = big2llvm(gas) *llvmGas = big2llvm(gas)
*result = hash2llvm(addr) *result = hash2llvm(addr)
} else { } else {