diff options
Diffstat (limited to 'xeth/pipe.go')
| -rw-r--r-- | xeth/pipe.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xeth/pipe.go b/xeth/pipe.go index 6e2f325c5..9cc163a81 100644 --- a/xeth/pipe.go +++ b/xeth/pipe.go @@ -8,6 +8,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/chain/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" @@ -71,7 +72,7 @@ func (self *XEth) ExecuteObject(object *Object, data []byte, value, gas, price * return ret, err } -func (self *XEth) Block(hash []byte) *chain.Block { +func (self *XEth) Block(hash []byte) *types.Block { return self.blockChain.GetBlock(hash) } @@ -122,7 +123,7 @@ func (self *XEth) Transact(key *crypto.KeyPair, to []byte, value, gas, price *et } } - var tx *chain.Transaction + var tx *types.Transaction if contractCreation { tx = chain.NewContractCreationTx(value.BigInt(), gas.BigInt(), price.BigInt(), data) } else { @@ -156,13 +157,12 @@ func (self *XEth) Transact(key *crypto.KeyPair, to []byte, value, gas, price *et } -func (self *XEth) PushTx(tx *chain.Transaction) ([]byte, error) { +func (self *XEth) PushTx(tx *types.Transaction) ([]byte, error) { err := self.obj.TxPool().Add(tx) if err != nil { return nil, err } - //self.obj.TxPool().QueueTransaction(tx) if tx.Recipient == nil { addr := tx.CreationAddress(self.World().State()) pipelogger.Infof("Contract addr %x\n", addr) |