diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-19 07:02:55 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-19 07:02:55 +0800 |
| commit | 22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b (patch) | |
| tree | a64a8336516fd28de2c019e8c787c90950267331 /xeth/hexface.go | |
| parent | 0dc566124aee24cf3f01b4e586bde7752da89824 (diff) | |
| parent | a7f4ade7114ee962110cb7c140e7ce7bd3f6664f (diff) | |
| download | dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.gz dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.bz2 dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.lz dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.xz dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.zst dexon-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.zip | |
merge
Diffstat (limited to 'xeth/hexface.go')
| -rw-r--r-- | xeth/hexface.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xeth/hexface.go b/xeth/hexface.go index dfb0a9fd8..6c084f947 100644 --- a/xeth/hexface.go +++ b/xeth/hexface.go @@ -211,7 +211,7 @@ func (self *JSXEth) Transact(key, toStr, valueStr, gasStr, gasPriceStr, codeStr return "", err } if types.IsContractAddr(to) { - return ethutil.Bytes2Hex(tx.CreationAddress(nil)), nil + return ethutil.Bytes2Hex(core.AddressFromMessage(tx)), nil } return ethutil.Bytes2Hex(tx.Hash()), nil @@ -224,7 +224,7 @@ func (self *JSXEth) PushTx(txStr string) (*JSReceipt, error) { return nil, err } - return NewJSReciept(tx.CreatesContract(), tx.CreationAddress(self.World().State()), tx.Hash(), tx.Sender()), nil + return NewJSReciept(core.MessageCreatesContract(tx), core.AddressFromMessage(tx), tx.Hash(), tx.From()), nil } func (self *JSXEth) CompileMutan(code string) string { |