aboutsummaryrefslogtreecommitdiffstats
path: root/ethpipe/pipe.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-02 23:03:15 +0800
committerobscuren <geffobscura@gmail.com>2014-10-02 23:03:15 +0800
commit82be3054961864dfd5bbeaec2ab961f593203dbf (patch)
treeefde516d8219f253f2bc87f26ad6d4169c2dc587 /ethpipe/pipe.go
parenta34a971b508e1bc1fbeb3c2d02cbb8686d2491d8 (diff)
downloadgo-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.tar
go-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.tar.gz
go-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.tar.bz2
go-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.tar.lz
go-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.tar.xz
go-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.tar.zst
go-tangerine-82be3054961864dfd5bbeaec2ab961f593203dbf.zip
Fixed inconsistencies
Diffstat (limited to 'ethpipe/pipe.go')
-rw-r--r--ethpipe/pipe.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/ethpipe/pipe.go b/ethpipe/pipe.go
index 7c3f491d3..f57b56ea0 100644
--- a/ethpipe/pipe.go
+++ b/ethpipe/pipe.go
@@ -143,9 +143,10 @@ func (self *Pipe) Transact(key *ethcrypto.KeyPair, rec []byte, value, gas, price
self.obj.TxPool().QueueTransaction(tx)
if contractCreation {
- logger.Infof("Contract addr %x", tx.CreationAddress())
+ addr := tx.CreationAddress(self.World().State())
+ logger.Infof("Contract addr %x\n", addr)
- return tx.CreationAddress(), nil
+ return addr, nil
}
return tx.Hash(), nil
@@ -154,8 +155,9 @@ func (self *Pipe) Transact(key *ethcrypto.KeyPair, rec []byte, value, gas, price
func (self *Pipe) PushTx(tx *ethchain.Transaction) ([]byte, error) {
self.obj.TxPool().QueueTransaction(tx)
if tx.Recipient == nil {
- logger.Infof("Contract addr %x", tx.CreationAddress())
- return tx.CreationAddress(), nil
+ addr := tx.CreationAddress(self.World().State())
+ logger.Infof("Contract addr %x\n", addr)
+ return addr, nil
}
return tx.Hash(), nil
}