aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-31 21:30:08 +0800
committerobscuren <geffobscura@gmail.com>2014-10-31 21:30:08 +0800
commit0ed1a8b50a9b9726cd57a2731d0405f6949c6188 (patch)
tree9f877ecdc89b784cd2820db8ca3f1de6e9c4d3e9 /xeth
parent8826e9694c3a8d4f480f0a021d8c02f7f61612c6 (diff)
downloadgo-tangerine-0ed1a8b50a9b9726cd57a2731d0405f6949c6188.tar.gz
go-tangerine-0ed1a8b50a9b9726cd57a2731d0405f6949c6188.tar.zst
go-tangerine-0ed1a8b50a9b9726cd57a2731d0405f6949c6188.zip
ethpipe => xeth (eXtended ETHereum)
Diffstat (limited to 'xeth')
-rw-r--r--xeth/config.go33
-rw-r--r--xeth/hexface.go264
-rw-r--r--xeth/js_types.go229
-rw-r--r--xeth/object.go26
-rw-r--r--xeth/pipe.go175
-rw-r--r--xeth/vm_env.go40
-rw-r--r--xeth/world.go64
7 files changed, 831 insertions, 0 deletions
diff --git a/xeth/config.go b/xeth/config.go
new file mode 100644
index 000000000..34aa9e32d
--- /dev/null
+++ b/xeth/config.go
@@ -0,0 +1,33 @@
+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)}
+ 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
+}
diff --git a/xeth/hexface.go b/xeth/hexface.go
new file mode 100644
index 000000000..829f530f4
--- /dev/null
+++ b/xeth/hexface.go
@@ -0,0 +1,264 @@
+package xeth
+
+import (
+ "bytes"
+ "encoding/json"
+ "sync/atomic"
+
+ "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethutil"
+)
+
+type JSXEth struct {
+ *XEth
+}
+
+func NewJSXEth(eth chain.EthManager) *JSXEth {
+ return &JSXEth{New(eth)}
+}
+
+func (self *JSXEth) BlockByHash(strHash string) *JSBlock {
+ hash := ethutil.Hex2Bytes(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) StateObject(addr string) *JSObject {
+ object := &Object{self.World().safeGet(ethutil.Hex2Bytes(addr))}
+
+ return NewJSObject(object)
+}
+
+func (self *JSXEth) PeerCount() int {
+ return self.obj.PeerCount()
+}
+
+func (self *JSXEth) Peers() []JSPeer {
+ var peers []JSPeer
+ for peer := self.obj.Peers().Front(); peer != nil; peer = peer.Next() {
+ p := peer.Value.(chain.Peer)
+ // we only want connected peers
+ if atomic.LoadInt32(p.Connected()) != 0 {
+ peers = append(peers, *NewJSPeer(p))
+ }
+ }
+
+ 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 ethutil.Bytes2Hex(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(ethutil.Hex2Bytes(addr)).Storage(ethutil.Hex2Bytes(storageAddr))
+
+ return ethutil.Bytes2Hex(storage.Bytes())
+}
+
+func (self *JSXEth) BalanceAt(addr string) string {
+ return self.World().SafeGet(ethutil.Hex2Bytes(addr)).Balance().String()
+}
+
+func (self *JSXEth) TxCountAt(address string) int {
+ return int(self.World().SafeGet(ethutil.Hex2Bytes(address)).Nonce)
+}
+
+func (self *JSXEth) CodeAt(address string) string {
+ return ethutil.Bytes2Hex(self.World().SafeGet(ethutil.Hex2Bytes(address)).Code)
+}
+
+func (self *JSXEth) IsContract(address string) bool {
+ return len(self.World().SafeGet(ethutil.Hex2Bytes(address)).Code) > 0
+}
+
+func (self *JSXEth) SecretToAddress(key string) string {
+ pair, err := crypto.NewKeyPairFromSec(ethutil.Hex2Bytes(key))
+ if err != nil {
+ return ""
+ }
+
+ return ethutil.Bytes2Hex(pair.Address())
+}
+
+func (self *JSXEth) Execute(addr, value, gas, price, data string) (string, error) {
+ ret, err := self.ExecuteObject(&Object{
+ self.World().safeGet(ethutil.Hex2Bytes(addr))},
+ ethutil.Hex2Bytes(data),
+ ethutil.NewValue(value),
+ ethutil.NewValue(gas),
+ ethutil.NewValue(price),
+ )
+
+ return ethutil.Bytes2Hex(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(ethutil.Hex2Bytes(addr))
+ object.EachStorage(func(name string, value *ethutil.Value) {
+ value.Decode()
+ values = append(values, KeyVal{ethutil.Bytes2Hex([]byte(name)), ethutil.Bytes2Hex(value.Bytes())})
+ })
+
+ 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" + ethutil.Bytes2Hex(padded)
+}
+
+func (self *JSXEth) FromAscii(str string) string {
+ if ethutil.IsHex(str) {
+ str = str[2:]
+ }
+
+ return string(bytes.Trim(ethutil.Hex2Bytes(str), "\x00"))
+}
+
+func (self *JSXEth) FromNumber(str string) string {
+ if ethutil.IsHex(str) {
+ str = str[2:]
+ }
+
+ return ethutil.BigD(ethutil.Hex2Bytes(str)).String()
+}
+
+func (self *JSXEth) Transact(key, toStr, valueStr, gasStr, gasPriceStr, codeStr string) (*JSReceipt, error) {
+ var hash []byte
+ var contractCreation bool
+ if len(toStr) == 0 {
+ contractCreation = true
+ } else {
+ // Check if an address is stored by this address
+ addr := self.World().Config().Get("NameReg").StorageString(toStr).Bytes()
+ if len(addr) > 0 {
+ hash = addr
+ } else {
+ hash = ethutil.Hex2Bytes(toStr)
+ }
+ }
+
+ var keyPair *crypto.KeyPair
+ var err error
+ if ethutil.IsHex(key) {
+ keyPair, err = crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(key[2:])))
+ } else {
+ keyPair, err = crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(key)))
+ }
+
+ if err != nil {
+ return nil, err
+ }
+
+ var (
+ value = ethutil.Big(valueStr)
+ gas = ethutil.Big(gasStr)
+ gasPrice = ethutil.Big(gasPriceStr)
+ data []byte
+ tx *chain.Transaction
+ )
+
+ if ethutil.IsHex(codeStr) {
+ data = ethutil.Hex2Bytes(codeStr[2:])
+ } else {
+ data = ethutil.Hex2Bytes(codeStr)
+ }
+
+ if contractCreation {
+ tx = chain.NewContractCreationTx(value, gas, gasPrice, data)
+ } else {
+ tx = chain.NewTransactionMessage(hash, value, gas, gasPrice, data)
+ }
+
+ acc := self.obj.StateManager().TransState().GetOrNewStateObject(keyPair.Address())
+ tx.Nonce = acc.Nonce
+ acc.Nonce += 1
+ self.obj.StateManager().TransState().UpdateStateObject(acc)
+
+ tx.Sign(keyPair.PrivateKey)
+ self.obj.TxPool().QueueTransaction(tx)
+
+ if contractCreation {
+ pipelogger.Infof("Contract addr %x", tx.CreationAddress(self.World().State()))
+ }
+
+ return NewJSReciept(contractCreation, tx.CreationAddress(self.World().State()), tx.Hash(), keyPair.Address()), nil
+}
+
+func (self *JSXEth) PushTx(txStr string) (*JSReceipt, error) {
+ tx := chain.NewTransactionFromBytes(ethutil.Hex2Bytes(txStr))
+ self.obj.TxPool().QueueTransaction(tx)
+ return NewJSReciept(tx.CreatesContract(), tx.CreationAddress(self.World().State()), tx.Hash(), tx.Sender()), nil
+}
+
+func (self *JSXEth) CompileMutan(code string) string {
+ data, err := self.XEth.CompileMutan(code)
+ if err != nil {
+ return err.Error()
+ }
+
+ return ethutil.Bytes2Hex(data)
+}
+
+func ToJSMessages(messages ethstate.Messages) *ethutil.List {
+ var msgs []JSMessage
+ for _, m := range messages {
+ msgs = append(msgs, NewJSMessage(m))
+ }
+
+ return ethutil.NewList(msgs)
+}
diff --git a/xeth/js_types.go b/xeth/js_types.go
new file mode 100644
index 000000000..058bfe0dd
--- /dev/null
+++ b/xeth/js_types.go
@@ -0,0 +1,229 @@
+package xeth
+
+import (
+ "fmt"
+ "strconv"
+ "strings"
+
+ "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethutil"
+)
+
+// Block interface exposed to QML
+type JSBlock struct {
+ //Transactions string `json:"transactions"`
+ ref *chain.Block
+ Size string `json:"size"`
+ Number int `json:"number"`
+ Hash string `json:"hash"`
+ Transactions *ethutil.List `json:"transactions"`
+ Uncles *ethutil.List `json:"uncles"`
+ Time int64 `json:"time"`
+ Coinbase string `json:"coinbase"`
+ Name string `json:"name"`
+ GasLimit string `json:"gasLimit"`
+ GasUsed string `json:"gasUsed"`
+ PrevHash string `json:"prevHash"`
+}
+
+// Creates a new QML Block from a chain block
+func NewJSBlock(block *chain.Block) *JSBlock {
+ if block == nil {
+ return &JSBlock{}
+ }
+
+ ptxs := make([]*JSTransaction, len(block.Transactions()))
+ for i, tx := range block.Transactions() {
+ ptxs[i] = NewJSTx(tx, block.State())
+ }
+ txlist := ethutil.NewList(ptxs)
+
+ puncles := make([]*JSBlock, len(block.Uncles))
+ for i, uncle := range block.Uncles {
+ puncles[i] = NewJSBlock(uncle)
+ }
+ ulist := ethutil.NewList(puncles)
+
+ return &JSBlock{
+ ref: block, Size: block.Size().String(),
+ Number: int(block.Number.Uint64()), GasUsed: block.GasUsed.String(),
+ GasLimit: block.GasLimit.String(), Hash: ethutil.Bytes2Hex(block.Hash()),
+ Transactions: txlist, Uncles: ulist,
+ Time: block.Time,
+ Coinbase: ethutil.Bytes2Hex(block.Coinbase),
+ PrevHash: ethutil.Bytes2Hex(block.PrevHash),
+ }
+}
+
+func (self *JSBlock) ToString() string {
+ if self.ref != nil {
+ return self.ref.String()
+ }
+
+ return ""
+}
+
+func (self *JSBlock) GetTransaction(hash string) *JSTransaction {
+ tx := self.ref.GetTransaction(ethutil.Hex2Bytes(hash))
+ if tx == nil {
+ return nil
+ }
+
+ return NewJSTx(tx, self.ref.State())
+}
+
+type JSTransaction struct {
+ ref *chain.Transaction
+
+ Value string `json:"value"`
+ Gas string `json:"gas"`
+ GasPrice string `json:"gasPrice"`
+ Hash string `json:"hash"`
+ Address string `json:"address"`
+ Sender string `json:"sender"`
+ RawData string `json:"rawData"`
+ Data string `json:"data"`
+ Contract bool `json:"isContract"`
+ CreatesContract bool `json:"createsContract"`
+ Confirmations int `json:"confirmations"`
+}
+
+func NewJSTx(tx *chain.Transaction, state *ethstate.State) *JSTransaction {
+ hash := ethutil.Bytes2Hex(tx.Hash())
+ receiver := ethutil.Bytes2Hex(tx.Recipient)
+ if receiver == "0000000000000000000000000000000000000000" {
+ receiver = ethutil.Bytes2Hex(tx.CreationAddress(state))
+ }
+ sender := ethutil.Bytes2Hex(tx.Sender())
+ createsContract := tx.CreatesContract()
+
+ var data string
+ if tx.CreatesContract() {
+ data = strings.Join(chain.Disassemble(tx.Data), "\n")
+ } else {
+ data = ethutil.Bytes2Hex(tx.Data)
+ }
+
+ return &JSTransaction{ref: tx, Hash: hash, Value: ethutil.CurrencyToString(tx.Value), Address: receiver, Contract: tx.CreatesContract(), Gas: tx.Gas.String(), GasPrice: tx.GasPrice.String(), Data: data, Sender: sender, CreatesContract: createsContract, RawData: ethutil.Bytes2Hex(tx.Data)}
+}
+
+func (self *JSTransaction) ToString() string {
+ return self.ref.String()
+}
+
+type JSKey struct {
+ Address string `json:"address"`
+ PrivateKey string `json:"privateKey"`
+ PublicKey string `json:"publicKey"`
+}
+
+func NewJSKey(key *crypto.KeyPair) *JSKey {
+ return &JSKey{ethutil.Bytes2Hex(key.Address()), ethutil.Bytes2Hex(key.PrivateKey), ethutil.Bytes2Hex(key.PublicKey)}
+}
+
+type JSObject struct {
+ *Object
+}
+
+func NewJSObject(object *Object) *JSObject {
+ return &JSObject{object}
+}
+
+type PReceipt struct {
+ CreatedContract bool `json:"createdContract"`
+ Address string `json:"address"`
+ Hash string `json:"hash"`
+ Sender string `json:"sender"`
+}
+
+func NewPReciept(contractCreation bool, creationAddress, hash, address []byte) *PReceipt {
+ return &PReceipt{
+ contractCreation,
+ ethutil.Bytes2Hex(creationAddress),
+ ethutil.Bytes2Hex(hash),
+ ethutil.Bytes2Hex(address),
+ }
+}
+
+// Peer interface exposed to QML
+
+type JSPeer struct {
+ ref *chain.Peer
+ Inbound bool `json:"isInbound"`
+ LastSend int64 `json:"lastSend"`
+ LastPong int64 `json:"lastPong"`
+ Ip string `json:"ip"`
+ Port int `json:"port"`
+ Version string `json:"version"`
+ LastResponse string `json:"lastResponse"`
+ Latency string `json:"latency"`
+ Caps string `json:"caps"`
+}
+
+func NewJSPeer(peer chain.Peer) *JSPeer {
+ if peer == nil {
+ return nil
+ }
+
+ var ip []string
+ for _, i := range peer.Host() {
+ ip = append(ip, strconv.Itoa(int(i)))
+ }
+ ipAddress := strings.Join(ip, ".")
+
+ var caps []string
+ capsIt := peer.Caps().NewIterator()
+ for capsIt.Next() {
+ caps = append(caps, capsIt.Value().Str())
+ }
+
+ return &JSPeer{ref: &peer, Inbound: peer.Inbound(), LastSend: peer.LastSend().Unix(), LastPong: peer.LastPong(), Version: peer.Version(), Ip: ipAddress, Port: int(peer.Port()), Latency: peer.PingTime(), Caps: fmt.Sprintf("%v", caps)}
+}
+
+type JSReceipt struct {
+ CreatedContract bool `json:"createdContract"`
+ Address string `json:"address"`
+ Hash string `json:"hash"`
+ Sender string `json:"sender"`
+}
+
+func NewJSReciept(contractCreation bool, creationAddress, hash, address []byte) *JSReceipt {
+ return &JSReceipt{
+ contractCreation,
+ ethutil.Bytes2Hex(creationAddress),
+ ethutil.Bytes2Hex(hash),
+ ethutil.Bytes2Hex(address),
+ }
+}
+
+type JSMessage struct {
+ To string `json:"to"`
+ From string `json:"from"`
+ Input string `json:"input"`
+ Output string `json:"output"`
+ Path int32 `json:"path"`
+ Origin string `json:"origin"`
+ Timestamp int32 `json:"timestamp"`
+ Coinbase string `json:"coinbase"`
+ Block string `json:"block"`
+ Number int32 `json:"number"`
+ Value string `json:"value"`
+}
+
+func NewJSMessage(message *ethstate.Message) JSMessage {
+ return JSMessage{
+ To: ethutil.Bytes2Hex(message.To),
+ From: ethutil.Bytes2Hex(message.From),
+ Input: ethutil.Bytes2Hex(message.Input),
+ Output: ethutil.Bytes2Hex(message.Output),
+ Path: int32(message.Path),
+ Origin: ethutil.Bytes2Hex(message.Origin),
+ Timestamp: int32(message.Timestamp),
+ Coinbase: ethutil.Bytes2Hex(message.Origin),
+ Block: ethutil.Bytes2Hex(message.Block),
+ Number: int32(message.Number.Int64()),
+ Value: message.Value.String(),
+ }
+}
diff --git a/xeth/object.go b/xeth/object.go
new file mode 100644
index 000000000..fe4e84a4a
--- /dev/null
+++ b/xeth/object.go
@@ -0,0 +1,26 @@
+package xeth
+
+import (
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethutil"
+)
+
+type Object struct {
+ *ethstate.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))
+}
diff --git a/xeth/pipe.go b/xeth/pipe.go
new file mode 100644
index 000000000..f2759d660
--- /dev/null
+++ b/xeth/pipe.go
@@ -0,0 +1,175 @@
+package xeth
+
+/*
+ * eXtended ETHereum
+ */
+
+import (
+ "fmt"
+ "strings"
+
+ "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/vm"
+)
+
+var pipelogger = logger.NewLogger("XETH")
+
+type VmVars struct {
+ State *ethstate.State
+}
+
+type XEth struct {
+ obj chain.EthManager
+ stateManager *chain.StateManager
+ blockChain *chain.ChainManager
+ world *World
+
+ Vm VmVars
+}
+
+func New(obj chain.EthManager) *XEth {
+ pipe := &XEth{
+ obj: obj,
+ stateManager: obj.StateManager(),
+ blockChain: obj.ChainManager(),
+ }
+ pipe.world = NewWorld(pipe)
+
+ return pipe
+}
+
+func (self *XEth) Balance(addr []byte) *ethutil.Value {
+ return ethutil.NewValue(self.World().safeGet(addr).Balance)
+}
+
+func (self *XEth) Nonce(addr []byte) uint64 {
+ return self.World().safeGet(addr).Nonce
+}
+
+func (self *XEth) Execute(addr []byte, data []byte, value, gas, price *ethutil.Value) ([]byte, error) {
+ return self.ExecuteObject(&Object{self.World().safeGet(addr)}, data, value, gas, price)
+}
+
+func (self *XEth) ExecuteObject(object *Object, data []byte, value, gas, price *ethutil.Value) ([]byte, error) {
+ var (
+ initiator = ethstate.NewStateObject(self.obj.KeyManager().KeyPair().Address())
+ block = self.blockChain.CurrentBlock
+ )
+
+ self.Vm.State = self.World().State().Copy()
+
+ evm := vm.New(NewEnv(self.Vm.State, block, value.BigInt(), initiator.Address()), vm.Type(ethutil.Config.VmType))
+
+ msg := vm.NewExecution(evm, object.Address(), data, gas.BigInt(), price.BigInt(), value.BigInt())
+ ret, err := msg.Exec(object.Address(), initiator)
+
+ fmt.Println("returned from call", ret, err)
+
+ return ret, err
+}
+
+func (self *XEth) Block(hash []byte) *chain.Block {
+ return self.blockChain.GetBlock(hash)
+}
+
+func (self *XEth) Storage(addr, storageAddr []byte) *ethutil.Value {
+ return self.World().safeGet(addr).GetStorage(ethutil.BigD(storageAddr))
+}
+
+func (self *XEth) ToAddress(priv []byte) []byte {
+ pair, err := crypto.NewKeyPairFromSec(priv)
+ if err != nil {
+ return nil
+ }
+
+ return pair.Address()
+}
+
+func (self *XEth) Exists(addr []byte) bool {
+ return self.World().Get(addr) != nil
+}
+
+func (self *XEth) TransactString(key *crypto.KeyPair, rec string, value, gas, price *ethutil.Value, data []byte) ([]byte, error) {
+ // Check if an address is stored by this address
+ var hash []byte
+ addr := self.World().Config().Get("NameReg").StorageString(rec).Bytes()
+ if len(addr) > 0 {
+ hash = addr
+ } else if ethutil.IsHex(rec) {
+ hash = ethutil.Hex2Bytes(rec[2:])
+ } else {
+ hash = ethutil.Hex2Bytes(rec)
+ }
+
+ return self.Transact(key, hash, value, gas, price, data)
+}
+
+func (self *XEth) Transact(key *crypto.KeyPair, rec []byte, value, gas, price *ethutil.Value, data []byte) ([]byte, error) {
+ var hash []byte
+ var contractCreation bool
+ if rec == nil {
+ contractCreation = true
+ }
+
+ var tx *chain.Transaction
+ // Compile and assemble the given data
+ if contractCreation {
+ script, err := ethutil.Compile(string(data), false)
+ if err != nil {
+ return nil, err
+ }
+
+ tx = chain.NewContractCreationTx(value.BigInt(), gas.BigInt(), price.BigInt(), script)
+ } else {
+ data := ethutil.StringToByteFunc(string(data), func(s string) (ret []byte) {
+ slice := strings.Split(s, "\n")
+ for _, dataItem := range slice {
+ d := ethutil.FormatData(dataItem)
+ ret = append(ret, d...)
+ }
+ return
+ })
+
+ tx = chain.NewTransactionMessage(hash, value.BigInt(), gas.BigInt(), price.BigInt(), data)
+ }
+
+ acc := self.stateManager.TransState().GetOrNewStateObject(key.Address())
+ tx.Nonce = acc.Nonce
+ acc.Nonce += 1
+ self.stateManager.TransState().UpdateStateObject(acc)
+
+ tx.Sign(key.PrivateKey)
+ self.obj.TxPool().QueueTransaction(tx)
+
+ if contractCreation {
+ addr := tx.CreationAddress(self.World().State())
+ pipelogger.Infof("Contract addr %x\n", addr)
+
+ return addr, nil
+ }
+
+ return tx.Hash(), nil
+}
+
+func (self *XEth) PushTx(tx *chain.Transaction) ([]byte, error) {
+ self.obj.TxPool().QueueTransaction(tx)
+ if tx.Recipient == nil {
+ addr := tx.CreationAddress(self.World().State())
+ pipelogger.Infof("Contract addr %x\n", addr)
+ return addr, nil
+ }
+ return tx.Hash(), nil
+}
+
+func (self *XEth) CompileMutan(code string) ([]byte, error) {
+ data, err := ethutil.Compile(code, false)
+ if err != nil {
+ return nil, err
+ }
+
+ return data, nil
+}
diff --git a/xeth/vm_env.go b/xeth/vm_env.go
new file mode 100644
index 000000000..952101f68
--- /dev/null
+++ b/xeth/vm_env.go
@@ -0,0 +1,40 @@
+package xeth
+
+import (
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/vm"
+)
+
+type VMEnv struct {
+ state *ethstate.State
+ block *chain.Block
+ value *big.Int
+ sender []byte
+}
+
+func NewEnv(state *ethstate.State, block *chain.Block, value *big.Int, sender []byte) *VMEnv {
+ return &VMEnv{
+ state: state,
+ block: block,
+ value: value,
+ sender: sender,
+ }
+}
+
+func (self *VMEnv) Origin() []byte { return self.sender }
+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) BlockHash() []byte { return self.block.Hash() }
+func (self *VMEnv) Value() *big.Int { return self.value }
+func (self *VMEnv) State() *ethstate.State { return self.state }
+func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit }
+func (self *VMEnv) AddLog(ethstate.Log) {}
+func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
+ return vm.Transfer(from, to, amount)
+}
diff --git a/xeth/world.go b/xeth/world.go
new file mode 100644
index 000000000..daeb59e1c
--- /dev/null
+++ b/xeth/world.go
@@ -0,0 +1,64 @@
+package xeth
+
+import (
+ "container/list"
+
+ "github.com/ethereum/go-ethereum/ethstate"
+)
+
+type World struct {
+ pipe *XEth
+ cfg *Config
+}
+
+func NewWorld(pipe *XEth) *World {
+ world := &World{pipe, nil}
+ world.cfg = &Config{pipe}
+
+ return world
+}
+
+func (self *XEth) World() *World {
+ return self.world
+}
+
+func (self *World) State() *ethstate.State {
+ return self.pipe.stateManager.CurrentState()
+}
+
+func (self *World) Get(addr []byte) *Object {
+ return &Object{self.State().GetStateObject(addr)}
+}
+
+func (self *World) SafeGet(addr []byte) *Object {
+ return &Object{self.safeGet(addr)}
+}
+
+func (self *World) safeGet(addr []byte) *ethstate.StateObject {
+ object := self.State().GetStateObject(addr)
+ if object == nil {
+ object = ethstate.NewStateObject(addr)
+ }
+
+ return object
+}
+
+func (self *World) Coinbase() *ethstate.StateObject {
+ return nil
+}
+
+func (self *World) IsMining() bool {
+ return self.pipe.obj.IsMining()
+}
+
+func (self *World) IsListening() bool {
+ return self.pipe.obj.IsListening()
+}
+
+func (self *World) Peers() *list.List {
+ return self.pipe.obj.Peers()
+}
+
+func (self *World) Config() *Config {
+ return self.cfg
+}