cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21 from nicksavers/patch-1

Browse Source 
Rearrange transaction RLP encoding...
This commit is contained in:
Jeffrey Wilcke 2014-05-20 13:06:27 +02:00
commit 38b4dc2cdf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethchain/transaction.go
View File

@ -109,10 +109,10 @@ func (tx *Transaction) Sign(privk []byte) error {
return nil return nil
} }
// [ NONCE, VALUE, GASPRICE, GAS, TO, DATA, V, R, S ] // [ NONCE, GASPRICE, GAS, TO, VALUE, DATA, V, R, S ]
// [ NONCE, VALUE, GASPRICE, GAS, 0, CODE, INIT, V, R, S ] // [ NONCE, GASPRICE, GAS, 0, VALUE, CODE, INIT, V, R, S ]
func (tx *Transaction) RlpData() interface{} { 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 { if tx.contractCreation {
data = append(data, tx.Init) data = append(data, tx.Init)
@ -135,10 +135,10 @@ func (tx *Transaction) RlpDecode(data []byte) {
func (tx *Transaction) RlpValueDecode(decoder *ethutil.Value) { func (tx *Transaction) RlpValueDecode(decoder *ethutil.Value) {
tx.Nonce = decoder.Get(0).Uint() tx.Nonce = decoder.Get(0).Uint()
tx.Value = decoder.Get(1).BigInt() tx.GasPrice = decoder.Get(1).BigInt()
tx.GasPrice = decoder.Get(2).BigInt() tx.Gas = decoder.Get(2).BigInt()
tx.Gas = decoder.Get(3).BigInt() tx.Recipient = decoder.Get(3).Bytes()
tx.Recipient = decoder.Get(4).Bytes() tx.Value = decoder.Get(4).BigInt()
tx.Data = decoder.Get(5).Bytes() tx.Data = decoder.Get(5).Bytes()
// If the list is of length 10 it's a contract creation tx // If the list is of length 10 it's a contract creation tx