diff options
author | obscuren <geffobscura@gmail.com> | 2014-12-18 22:18:13 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-12-18 22:18:13 +0800 |
commit | db494170dc819b1eb0d267b6e1ab36c6cfb63569 (patch) | |
tree | 8e2b374519a0ae5e20a9db0c2a4a86bf3375329e /xeth/js_types.go | |
parent | 9e286e1c337319f47b2b04e9e1022ac05470a296 (diff) | |
download | go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.gz go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.bz2 go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.lz go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.xz go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.zst go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.zip |
Created generic message (easy for testing)
Diffstat (limited to 'xeth/js_types.go')
-rw-r--r-- | xeth/js_types.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xeth/js_types.go b/xeth/js_types.go index da26439cf..2d6ee91bc 100644 --- a/xeth/js_types.go +++ b/xeth/js_types.go @@ -97,21 +97,21 @@ type JSTransaction struct { func NewJSTx(tx *types.Transaction, state *state.StateDB) *JSTransaction { hash := ethutil.Bytes2Hex(tx.Hash()) - receiver := ethutil.Bytes2Hex(tx.Recipient) + receiver := ethutil.Bytes2Hex(tx.To()) if receiver == "0000000000000000000000000000000000000000" { - receiver = ethutil.Bytes2Hex(tx.CreationAddress(state)) + receiver = ethutil.Bytes2Hex(core.AddressFromMessage(tx)) } sender := ethutil.Bytes2Hex(tx.Sender()) createsContract := tx.CreatesContract() var data string if tx.CreatesContract() { - data = strings.Join(core.Disassemble(tx.Data), "\n") + data = strings.Join(core.Disassemble(tx.Data()), "\n") } else { - data = ethutil.Bytes2Hex(tx.Data) + 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)} + 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 { |