mirror of https://github.com/ethereum/go-ethereum
Taylor Gerring
10 years ago
commit
21fd31dad8
@ -1,31 +1,371 @@ |
||||
// +build evmjit
|
||||
|
||||
package vm |
||||
|
||||
import "math/big" |
||||
/* |
||||
|
||||
void* evmjit_create(); |
||||
int evmjit_run(void* _jit, void* _data, void* _env); |
||||
void evmjit_destroy(void* _jit); |
||||
|
||||
// Shared library evmjit (e.g. libevmjit.so) is expected to be installed in /usr/local/lib
|
||||
// More: https://github.com/ethereum/evmjit
|
||||
#cgo LDFLAGS: -levmjit |
||||
*/ |
||||
import "C" |
||||
|
||||
import ( |
||||
"bytes" |
||||
"errors" |
||||
"fmt" |
||||
"github.com/ethereum/go-ethereum/crypto" |
||||
"github.com/ethereum/go-ethereum/state" |
||||
"math/big" |
||||
"unsafe" |
||||
) |
||||
|
||||
type JitVm struct { |
||||
env Environment |
||||
backup *Vm |
||||
env Environment |
||||
me ContextRef |
||||
callerAddr []byte |
||||
price *big.Int |
||||
data RuntimeData |
||||
} |
||||
|
||||
type i256 [32]byte |
||||
|
||||
type RuntimeData struct { |
||||
gas int64 |
||||
gasPrice int64 |
||||
callData *byte |
||||
callDataSize uint64 |
||||
address i256 |
||||
caller i256 |
||||
origin i256 |
||||
callValue i256 |
||||
coinBase i256 |
||||
difficulty i256 |
||||
gasLimit i256 |
||||
number uint64 |
||||
timestamp int64 |
||||
code *byte |
||||
codeSize uint64 |
||||
} |
||||
|
||||
func hash2llvm(h []byte) i256 { |
||||
var m i256 |
||||
copy(m[len(m)-len(h):], h) // right aligned copy
|
||||
return m |
||||
} |
||||
|
||||
func llvm2hash(m *i256) []byte { |
||||
return C.GoBytes(unsafe.Pointer(m), C.int(len(m))) |
||||
} |
||||
|
||||
func llvm2hashRef(m *i256) []byte { |
||||
return (*[1 << 30]byte)(unsafe.Pointer(m))[:len(m):len(m)] |
||||
} |
||||
|
||||
func address2llvm(addr []byte) i256 { |
||||
n := hash2llvm(addr) |
||||
bswap(&n) |
||||
return n |
||||
} |
||||
|
||||
// bswap swap bytes of the 256-bit integer on LLVM side
|
||||
// TODO: Do not change memory on LLVM side, that can conflict with memory access optimizations
|
||||
func bswap(m *i256) *i256 { |
||||
for i, l := 0, len(m); i < l/2; i++ { |
||||
m[i], m[l-i-1] = m[l-i-1], m[i] |
||||
} |
||||
return m |
||||
} |
||||
|
||||
func trim(m []byte) []byte { |
||||
skip := 0 |
||||
for i := 0; i < len(m); i++ { |
||||
if m[i] == 0 { |
||||
skip++ |
||||
} else { |
||||
break |
||||
} |
||||
} |
||||
return m[skip:] |
||||
} |
||||
|
||||
func getDataPtr(m []byte) *byte { |
||||
var p *byte |
||||
if len(m) > 0 { |
||||
p = &m[0] |
||||
} |
||||
return p |
||||
} |
||||
|
||||
func big2llvm(n *big.Int) i256 { |
||||
m := hash2llvm(n.Bytes()) |
||||
bswap(&m) |
||||
return m |
||||
} |
||||
|
||||
func llvm2big(m *i256) *big.Int { |
||||
n := big.NewInt(0) |
||||
for i := 0; i < len(m); i++ { |
||||
b := big.NewInt(int64(m[i])) |
||||
b.Lsh(b, uint(i)*8) |
||||
n.Add(n, b) |
||||
} |
||||
return n |
||||
} |
||||
|
||||
// llvm2bytesRef creates a []byte slice that references byte buffer on LLVM side (as of that not controller by GC)
|
||||
// User must asure that referenced memory is available to Go until the data is copied or not needed any more
|
||||
func llvm2bytesRef(data *byte, length uint64) []byte { |
||||
if length == 0 { |
||||
return nil |
||||
} |
||||
if data == nil { |
||||
panic("Unexpected nil data pointer") |
||||
} |
||||
return (*[1 << 30]byte)(unsafe.Pointer(data))[:length:length] |
||||
} |
||||
|
||||
func untested(condition bool, message string) { |
||||
if condition { |
||||
panic("Condition `" + message + "` tested. Remove assert.") |
||||
} |
||||
} |
||||
|
||||
func assert(condition bool, message string) { |
||||
if !condition { |
||||
panic("Assert `" + message + "` failed!") |
||||
} |
||||
} |
||||
|
||||
func NewJitVm(env Environment) *JitVm { |
||||
backupVm := New(env) |
||||
return &JitVm{env: env, backup: backupVm} |
||||
return &JitVm{env: env} |
||||
} |
||||
|
||||
func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) { |
||||
return self.backup.Run(me, caller, code, value, gas, price, callData) |
||||
// TODO: depth is increased but never checked by VM. VM should not know about it at all.
|
||||
self.env.SetDepth(self.env.Depth() + 1) |
||||
|
||||
// TODO: Move it to Env.Call() or sth
|
||||
if Precompiled[string(me.Address())] != nil { |
||||
// if it's address of precopiled contract
|
||||
// fallback to standard VM
|
||||
stdVm := New(self.env) |
||||
return stdVm.Run(me, caller, code, value, gas, price, callData) |
||||
} |
||||
|
||||
if self.me != nil { |
||||
panic("JitVm.Run() can be called only once per JitVm instance") |
||||
} |
||||
|
||||
self.me = me |
||||
self.callerAddr = caller.Address() |
||||
self.price = price |
||||
|
||||
self.data.gas = gas.Int64() |
||||
self.data.gasPrice = price.Int64() |
||||
self.data.callData = getDataPtr(callData) |
||||
self.data.callDataSize = uint64(len(callData)) |
||||
self.data.address = address2llvm(self.me.Address()) |
||||
self.data.caller = address2llvm(caller.Address()) |
||||
self.data.origin = address2llvm(self.env.Origin()) |
||||
self.data.callValue = big2llvm(value) |
||||
self.data.coinBase = address2llvm(self.env.Coinbase()) |
||||
self.data.difficulty = big2llvm(self.env.Difficulty()) |
||||
self.data.gasLimit = big2llvm(self.env.GasLimit()) |
||||
self.data.number = self.env.BlockNumber().Uint64() |
||||
self.data.timestamp = self.env.Time() |
||||
self.data.code = getDataPtr(code) |
||||
self.data.codeSize = uint64(len(code)) |
||||
|
||||
jit := C.evmjit_create() |
||||
retCode := C.evmjit_run(jit, unsafe.Pointer(&self.data), unsafe.Pointer(self)) |
||||
|
||||
if retCode < 0 { |
||||
err = errors.New("OOG from JIT") |
||||
gas.SetInt64(0) // Set gas to 0, JIT does not bother
|
||||
} else { |
||||
gas.SetInt64(self.data.gas) |
||||
if retCode == 1 { // RETURN
|
||||
ret = C.GoBytes(unsafe.Pointer(self.data.callData), C.int(self.data.callDataSize)) |
||||
} else if retCode == 2 { // SUICIDE
|
||||
// TODO: Suicide support logic should be moved to Env to be shared by VM implementations
|
||||
state := self.Env().State() |
||||
receiverAddr := llvm2hashRef(bswap(&self.data.address)) |
||||
receiver := state.GetOrNewStateObject(receiverAddr) |
||||
balance := state.GetBalance(me.Address()) |
||||
receiver.AddAmount(balance) |
||||
state.Delete(me.Address()) |
||||
} |
||||
} |
||||
|
||||
C.evmjit_destroy(jit); |
||||
return |
||||
} |
||||
|
||||
func (self *JitVm) Printf(format string, v ...interface{}) VirtualMachine { |
||||
return self.backup.Printf(format, v) |
||||
return self |
||||
} |
||||
|
||||
func (self *JitVm) Endl() VirtualMachine { |
||||
return self.backup.Endl() |
||||
return self |
||||
} |
||||
|
||||
func (self *JitVm) Env() Environment { |
||||
return self.env |
||||
} |
||||
|
||||
//go is nice
|
||||
//export env_sha3
|
||||
func env_sha3(dataPtr *byte, length uint64, resultPtr unsafe.Pointer) { |
||||
data := llvm2bytesRef(dataPtr, length) |
||||
hash := crypto.Sha3(data) |
||||
result := (*i256)(resultPtr) |
||||
*result = hash2llvm(hash) |
||||
} |
||||
|
||||
//export env_sstore
|
||||
func env_sstore(vmPtr unsafe.Pointer, indexPtr unsafe.Pointer, valuePtr unsafe.Pointer) { |
||||
vm := (*JitVm)(vmPtr) |
||||
index := llvm2hash(bswap((*i256)(indexPtr))) |
||||
value := llvm2hash(bswap((*i256)(valuePtr))) |
||||
value = trim(value) |
||||
if len(value) == 0 { |
||||
prevValue := vm.env.State().GetState(vm.me.Address(), index) |
||||
if len(prevValue) != 0 { |
||||
vm.Env().State().Refund(vm.callerAddr, GasSStoreRefund) |
||||
} |
||||
} |
||||
|
||||
vm.env.State().SetState(vm.me.Address(), index, value) |
||||
} |
||||
|
||||
//export env_sload
|
||||
func env_sload(vmPtr unsafe.Pointer, indexPtr unsafe.Pointer, resultPtr unsafe.Pointer) { |
||||
vm := (*JitVm)(vmPtr) |
||||
index := llvm2hash(bswap((*i256)(indexPtr))) |
||||
value := vm.env.State().GetState(vm.me.Address(), index) |
||||
result := (*i256)(resultPtr) |
||||
*result = hash2llvm(value) |
||||
bswap(result) |
||||
} |
||||
|
||||
//export env_balance
|
||||
func env_balance(_vm unsafe.Pointer, _addr unsafe.Pointer, _result unsafe.Pointer) { |
||||
vm := (*JitVm)(_vm) |
||||
addr := llvm2hash((*i256)(_addr)) |
||||
balance := vm.Env().State().GetBalance(addr) |
||||
result := (*i256)(_result) |
||||
*result = big2llvm(balance) |
||||
} |
||||
|
||||
//export env_blockhash
|
||||
func env_blockhash(_vm unsafe.Pointer, _number unsafe.Pointer, _result unsafe.Pointer) { |
||||
vm := (*JitVm)(_vm) |
||||
number := llvm2big((*i256)(_number)) |
||||
result := (*i256)(_result) |
||||
|
||||
currNumber := vm.Env().BlockNumber() |
||||
limit := big.NewInt(0).Sub(currNumber, big.NewInt(256)) |
||||
if number.Cmp(limit) >= 0 && number.Cmp(currNumber) < 0 { |
||||
hash := vm.Env().GetHash(uint64(number.Int64())) |
||||
*result = hash2llvm(hash) |
||||
} else { |
||||
*result = i256{} |
||||
} |
||||
} |
||||
|
||||
//export env_call
|
||||
func env_call(_vm unsafe.Pointer, _gas unsafe.Pointer, _receiveAddr unsafe.Pointer, _value unsafe.Pointer, inDataPtr unsafe.Pointer, inDataLen uint64, outDataPtr *byte, outDataLen uint64, _codeAddr unsafe.Pointer) bool { |
||||
vm := (*JitVm)(_vm) |
||||
|
||||
//fmt.Printf("env_call (depth %d)\n", vm.Env().Depth())
|
||||
|
||||
defer func() { |
||||
if r := recover(); r != nil { |
||||
fmt.Printf("Recovered in env_call (depth %d, out %p %d): %s\n", vm.Env().Depth(), outDataPtr, outDataLen, r) |
||||
} |
||||
}() |
||||
|
||||
balance := vm.Env().State().GetBalance(vm.me.Address()) |
||||
value := llvm2big((*i256)(_value)) |
||||
|
||||
if balance.Cmp(value) >= 0 { |
||||
receiveAddr := llvm2hash((*i256)(_receiveAddr)) |
||||
inData := C.GoBytes(inDataPtr, C.int(inDataLen)) |
||||
outData := llvm2bytesRef(outDataPtr, outDataLen) |
||||
codeAddr := llvm2hash((*i256)(_codeAddr)) |
||||
llvmGas := (*i256)(_gas) |
||||
gas := llvm2big(llvmGas) |
||||
var out []byte |
||||
var err error |
||||
if bytes.Equal(codeAddr, receiveAddr) { |
||||
out, err = vm.env.Call(vm.me, codeAddr, inData, gas, vm.price, value) |
||||
} else { |
||||
out, err = vm.env.CallCode(vm.me, codeAddr, inData, gas, vm.price, value) |
||||
} |
||||
*llvmGas = big2llvm(gas) |
||||
if err == nil { |
||||
copy(outData, out) |
||||
return true |
||||
} |
||||
} |
||||
|
||||
return false |
||||
} |
||||
|
||||
//export env_create
|
||||
func env_create(_vm unsafe.Pointer, _gas unsafe.Pointer, _value unsafe.Pointer, initDataPtr unsafe.Pointer, initDataLen uint64, _result unsafe.Pointer) { |
||||
vm := (*JitVm)(_vm) |
||||
|
||||
value := llvm2big((*i256)(_value)) |
||||
initData := C.GoBytes(initDataPtr, C.int(initDataLen)) // TODO: Unnecessary if low balance
|
||||
result := (*i256)(_result) |
||||
*result = i256{} |
||||
|
||||
llvmGas := (*i256)(_gas) |
||||
gas := llvm2big(llvmGas) |
||||
|
||||
ret, suberr, ref := vm.env.Create(vm.me, nil, initData, gas, vm.price, value) |
||||
if suberr == nil { |
||||
dataGas := big.NewInt(int64(len(ret))) // TODO: Nto the best design. env.Create can do it, it has the reference to gas counter
|
||||
dataGas.Mul(dataGas, GasCreateByte) |
||||
gas.Sub(gas, dataGas) |
||||
*result = hash2llvm(ref.Address()) |
||||
} |
||||
*llvmGas = big2llvm(gas) |
||||
} |
||||
|
||||
//export env_log
|
||||
func env_log(_vm unsafe.Pointer, dataPtr unsafe.Pointer, dataLen uint64, _topic1 unsafe.Pointer, _topic2 unsafe.Pointer, _topic3 unsafe.Pointer, _topic4 unsafe.Pointer) { |
||||
vm := (*JitVm)(_vm) |
||||
|
||||
data := C.GoBytes(dataPtr, C.int(dataLen)) |
||||
|
||||
topics := make([][]byte, 0, 4) |
||||
if _topic1 != nil { |
||||
topics = append(topics, llvm2hash((*i256)(_topic1))) |
||||
} |
||||
if _topic2 != nil { |
||||
topics = append(topics, llvm2hash((*i256)(_topic2))) |
||||
} |
||||
if _topic3 != nil { |
||||
topics = append(topics, llvm2hash((*i256)(_topic3))) |
||||
} |
||||
if _topic4 != nil { |
||||
topics = append(topics, llvm2hash((*i256)(_topic4))) |
||||
} |
||||
|
||||
vm.Env().AddLog(state.NewLog(vm.me.Address(), topics, data)) |
||||
} |
||||
|
||||
//export env_extcode
|
||||
func env_extcode(_vm unsafe.Pointer, _addr unsafe.Pointer, o_size *uint64) *byte { |
||||
vm := (*JitVm)(_vm) |
||||
addr := llvm2hash((*i256)(_addr)) |
||||
code := vm.Env().State().GetCode(addr) |
||||
*o_size = uint64(len(code)) |
||||
return getDataPtr(code) |
||||
} |
||||
|
||||
@ -0,0 +1,10 @@ |
||||
// +build !evmjit
|
||||
|
||||
package vm |
||||
|
||||
import "fmt" |
||||
|
||||
func NewJitVm(env Environment) VirtualMachine { |
||||
fmt.Printf("Warning! EVM JIT not enabled.\n") |
||||
return New(env) |
||||
} |
||||
@ -1,35 +0,0 @@ |
||||
package xeth |
||||
|
||||
import "github.com/ethereum/go-ethereum/ethutil" |
||||
|
||||
var cnfCtr = ethutil.Hex2Bytes("661005d2720d855f1d9976f88bb10c1a3398c77f") |
||||
|
||||
type Config struct { |
||||
pipe *XEth |
||||
} |
||||
|
||||
func (self *Config) Get(name string) *Object { |
||||
configCtrl := self.pipe.World().safeGet(cnfCtr) |
||||
var addr []byte |
||||
|
||||
switch name { |
||||
case "NameReg": |
||||
addr = []byte{0} |
||||
case "DnsReg": |
||||
objectAddr := configCtrl.GetStorage(ethutil.BigD([]byte{0})) |
||||
domainAddr := (&Object{self.pipe.World().safeGet(objectAddr.Bytes())}).StorageString("DnsReg").Bytes() |
||||
return &Object{self.pipe.World().safeGet(domainAddr)} |
||||
case "MergeMining": |
||||
addr = []byte{4} |
||||
default: |
||||
addr = ethutil.RightPadBytes([]byte(name), 32) |
||||
} |
||||
|
||||
objectAddr := configCtrl.GetStorage(ethutil.BigD(addr)) |
||||
|
||||
return &Object{self.pipe.World().safeGet(objectAddr.Bytes())} |
||||
} |
||||
|
||||
func (self *Config) Exist() bool { |
||||
return self.pipe.World().Get(cnfCtr) != nil |
||||
} |
||||
@ -1,239 +0,0 @@ |
||||
package xeth |
||||
|
||||
import ( |
||||
"bytes" |
||||
"encoding/json" |
||||
|
||||
"github.com/ethereum/go-ethereum/core" |
||||
"github.com/ethereum/go-ethereum/core/types" |
||||
"github.com/ethereum/go-ethereum/crypto" |
||||
"github.com/ethereum/go-ethereum/ethutil" |
||||
"github.com/ethereum/go-ethereum/state" |
||||
) |
||||
|
||||
type JSXEth struct { |
||||
*XEth |
||||
} |
||||
|
||||
func NewJSXEth(eth core.EthManager) *JSXEth { |
||||
return &JSXEth{New(eth)} |
||||
} |
||||
|
||||
func (self *JSXEth) BlockByHash(strHash string) *JSBlock { |
||||
hash := fromHex(strHash) |
||||
block := self.obj.ChainManager().GetBlock(hash) |
||||
|
||||
return NewJSBlock(block) |
||||
} |
||||
|
||||
func (self *JSXEth) BlockByNumber(num int32) *JSBlock { |
||||
if num == -1 { |
||||
return NewJSBlock(self.obj.ChainManager().CurrentBlock()) |
||||
} |
||||
|
||||
return NewJSBlock(self.obj.ChainManager().GetBlockByNumber(uint64(num))) |
||||
} |
||||
|
||||
func (self *JSXEth) Block(v interface{}) *JSBlock { |
||||
if n, ok := v.(int32); ok { |
||||
return self.BlockByNumber(n) |
||||
} else if str, ok := v.(string); ok { |
||||
return self.BlockByHash(str) |
||||
} else if f, ok := v.(float64); ok { // Don't ask ...
|
||||
return self.BlockByNumber(int32(f)) |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
|
||||
func (self *JSXEth) Key() *JSKey { |
||||
return NewJSKey(self.obj.KeyManager().KeyPair()) |
||||
} |
||||
|
||||
func (self *JSXEth) Accounts() []string { |
||||
return []string{toHex(self.obj.KeyManager().Address())} |
||||
} |
||||
|
||||
func (self *JSXEth) StateObject(addr string) *JSObject { |
||||
object := &Object{self.World().safeGet(fromHex(addr))} |
||||
|
||||
return NewJSObject(object) |
||||
} |
||||
|
||||
func (self *JSXEth) PeerCount() int { |
||||
return self.obj.PeerCount() |
||||
} |
||||
|
||||
func (self *JSXEth) Peers() []JSPeer { |
||||
var peers []JSPeer |
||||
for _, peer := range self.obj.Peers() { |
||||
peers = append(peers, *NewJSPeer(peer)) |
||||
} |
||||
|
||||
return peers |
||||
} |
||||
|
||||
func (self *JSXEth) IsMining() bool { |
||||
return self.obj.IsMining() |
||||
} |
||||
|
||||
func (self *JSXEth) IsListening() bool { |
||||
return self.obj.IsListening() |
||||
} |
||||
|
||||
func (self *JSXEth) CoinBase() string { |
||||
return toHex(self.obj.KeyManager().Address()) |
||||
} |
||||
|
||||
func (self *JSXEth) NumberToHuman(balance string) string { |
||||
b := ethutil.Big(balance) |
||||
|
||||
return ethutil.CurrencyToString(b) |
||||
} |
||||
|
||||
func (self *JSXEth) StorageAt(addr, storageAddr string) string { |
||||
storage := self.World().SafeGet(fromHex(addr)).Storage(fromHex(storageAddr)) |
||||
|
||||
return toHex(storage.Bytes()) |
||||
} |
||||
|
||||
func (self *JSXEth) BalanceAt(addr string) string { |
||||
return self.World().SafeGet(fromHex(addr)).Balance().String() |
||||
} |
||||
|
||||
func (self *JSXEth) TxCountAt(address string) int { |
||||
return int(self.World().SafeGet(fromHex(address)).Nonce) |
||||
} |
||||
|
||||
func (self *JSXEth) CodeAt(address string) string { |
||||
return toHex(self.World().SafeGet(fromHex(address)).Code) |
||||
} |
||||
|
||||
func (self *JSXEth) IsContract(address string) bool { |
||||
return len(self.World().SafeGet(fromHex(address)).Code) > 0 |
||||
} |
||||
|
||||
func (self *JSXEth) SecretToAddress(key string) string { |
||||
pair, err := crypto.NewKeyPairFromSec(fromHex(key)) |
||||
if err != nil { |
||||
return "" |
||||
} |
||||
|
||||
return toHex(pair.Address()) |
||||
} |
||||
|
||||
func (self *JSXEth) Execute(addr, value, gas, price, data string) (string, error) { |
||||
ret, err := self.ExecuteObject(&Object{ |
||||
self.World().safeGet(fromHex(addr))}, |
||||
fromHex(data), |
||||
ethutil.NewValue(value), |
||||
ethutil.NewValue(gas), |
||||
ethutil.NewValue(price), |
||||
) |
||||
|
||||
return toHex(ret), err |
||||
} |
||||
|
||||
type KeyVal struct { |
||||
Key string `json:"key"` |
||||
Value string `json:"value"` |
||||
} |
||||
|
||||
func (self *JSXEth) EachStorage(addr string) string { |
||||
var values []KeyVal |
||||
object := self.World().SafeGet(fromHex(addr)) |
||||
it := object.Trie().Iterator() |
||||
for it.Next() { |
||||
values = append(values, KeyVal{toHex(it.Key), toHex(it.Value)}) |
||||
} |
||||
|
||||
valuesJson, err := json.Marshal(values) |
||||
if err != nil { |
||||
return "" |
||||
} |
||||
|
||||
return string(valuesJson) |
||||
} |
||||
|
||||
func (self *JSXEth) ToAscii(str string) string { |
||||
padded := ethutil.RightPadBytes([]byte(str), 32) |
||||
|
||||
return "0x" + toHex(padded) |
||||
} |
||||
|
||||
func (self *JSXEth) FromAscii(str string) string { |
||||
if ethutil.IsHex(str) { |
||||
str = str[2:] |
||||
} |
||||
|
||||
return string(bytes.Trim(fromHex(str), "\x00")) |
||||
} |
||||
|
||||
func (self *JSXEth) FromNumber(str string) string { |
||||
if ethutil.IsHex(str) { |
||||
str = str[2:] |
||||
} |
||||
|
||||
return ethutil.BigD(fromHex(str)).String() |
||||
} |
||||
|
||||
func (self *JSXEth) Transact(key, toStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) { |
||||
var ( |
||||
to []byte |
||||
value = ethutil.NewValue(valueStr) |
||||
gas = ethutil.NewValue(gasStr) |
||||
gasPrice = ethutil.NewValue(gasPriceStr) |
||||
data []byte |
||||
) |
||||
|
||||
data = fromHex(codeStr) |
||||
|
||||
to = fromHex(toStr) |
||||
|
||||
keyPair, err := crypto.NewKeyPairFromSec([]byte(fromHex(key))) |
||||
if err != nil { |
||||
return "", err |
||||
} |
||||
|
||||
tx, err := self.XEth.Transact(keyPair, to, value, gas, gasPrice, data) |
||||
if err != nil { |
||||
return "", err |
||||
} |
||||
if types.IsContractAddr(to) { |
||||
return toHex(core.AddressFromMessage(tx)), nil |
||||
} |
||||
|
||||
return toHex(tx.Hash()), nil |
||||
} |
||||
|
||||
func (self *JSXEth) PushTx(txStr string) (*JSReceipt, error) { |
||||
tx := types.NewTransactionFromBytes(fromHex(txStr)) |
||||
err := self.obj.TxPool().Add(tx) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
return NewJSReciept(core.MessageCreatesContract(tx), core.AddressFromMessage(tx), tx.Hash(), tx.From()), nil |
||||
} |
||||
|
||||
func (self *JSXEth) CompileMutan(code string) string { |
||||
data, err := self.XEth.CompileMutan(code) |
||||
if err != nil { |
||||
return err.Error() |
||||
} |
||||
|
||||
return toHex(data) |
||||
} |
||||
|
||||
func (self *JSXEth) FindInConfig(str string) string { |
||||
return toHex(self.World().Config().Get(str).Address()) |
||||
} |
||||
|
||||
func ToJSMessages(messages state.Messages) *ethutil.List { |
||||
var msgs []JSMessage |
||||
for _, m := range messages { |
||||
msgs = append(msgs, NewJSMessage(m)) |
||||
} |
||||
|
||||
return ethutil.NewList(msgs) |
||||
} |
||||
@ -1,26 +0,0 @@ |
||||
package xeth |
||||
|
||||
import ( |
||||
"github.com/ethereum/go-ethereum/ethutil" |
||||
"github.com/ethereum/go-ethereum/state" |
||||
) |
||||
|
||||
type Object struct { |
||||
*state.StateObject |
||||
} |
||||
|
||||
func (self *Object) StorageString(str string) *ethutil.Value { |
||||
if ethutil.IsHex(str) { |
||||
return self.Storage(ethutil.Hex2Bytes(str[2:])) |
||||
} else { |
||||
return self.Storage(ethutil.RightPadBytes([]byte(str), 32)) |
||||
} |
||||
} |
||||
|
||||
func (self *Object) StorageValue(addr *ethutil.Value) *ethutil.Value { |
||||
return self.Storage(addr.Bytes()) |
||||
} |
||||
|
||||
func (self *Object) Storage(addr []byte) *ethutil.Value { |
||||
return self.StateObject.GetStorage(ethutil.BigD(addr)) |
||||
} |
||||
Loading…
Reference in new issue