diff options
author | obscuren <geffobscura@gmail.com> | 2014-05-20 19:06:47 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-05-20 19:06:47 +0800 |
commit | 378815ee62b21cec60aceeafc7bc8a2a479290b5 (patch) | |
tree | b655540bd3fed4f083190e7d90c9dd16ce151cf4 | |
parent | fafdd21e4fb18c9714c4f784d443e9592ec3ff69 (diff) | |
download | go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.tar go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.tar.gz go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.tar.bz2 go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.tar.lz go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.tar.xz go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.tar.zst go-tangerine-378815ee62b21cec60aceeafc7bc8a2a479290b5.zip |
Rearranged according to YP
-rw-r--r-- | ethchain/transaction.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ethchain/transaction.go b/ethchain/transaction.go index 8ea4704cb..bd7a0e424 100644 --- a/ethchain/transaction.go +++ b/ethchain/transaction.go @@ -109,10 +109,8 @@ func (tx *Transaction) Sign(privk []byte) error { return nil } -// [ NONCE, VALUE, GASPRICE, GAS, TO, DATA, V, R, S ] -// [ NONCE, VALUE, GASPRICE, GAS, 0, CODE, INIT, V, R, S ] func (tx *Transaction) RlpData() interface{} { - data := []interface{}{tx.Nonce, tx.Value, tx.GasPrice, tx.Gas, tx.Recipient, tx.Data} + data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data} if tx.contractCreation { data = append(data, tx.Init) @@ -135,10 +133,10 @@ func (tx *Transaction) RlpDecode(data []byte) { func (tx *Transaction) RlpValueDecode(decoder *ethutil.Value) { tx.Nonce = decoder.Get(0).Uint() - tx.Value = decoder.Get(1).BigInt() - tx.GasPrice = decoder.Get(2).BigInt() - tx.Gas = decoder.Get(3).BigInt() - tx.Recipient = decoder.Get(4).Bytes() + tx.GasPrice = decoder.Get(1).BigInt() + tx.Gas = decoder.Get(2).BigInt() + tx.Recipient = decoder.Get(3).Bytes() + tx.Value = decoder.Get(4).BigInt() tx.Data = decoder.Get(5).Bytes() // If the list is of length 10 it's a contract creation tx |