Skip to content

G
Geth-Modification
Commit 45b81045 authored by obscuren's avatar obscuren
Browse files
Options

...

parent f292e93e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
ethchain/transaction.go
View file @ 45b81045
...@@ -109,11 +109,6 @@ func (tx *Transaction) Sign(privk []byte) error { ...@@ -109,11 +109,6 @@ func (tx *Transaction) Sign(privk []byte) error {
return nil return nil
} }
<<<<<<< HEAD
=======
// [ NONCE, GASPRICE, GAS, TO, VALUE, DATA, V, R, S ]
// [ NONCE, GASPRICE, GAS, 0, VALUE, CODE, INIT, V, R, S ]
>>>>>>> 38b4dc2cdf23380532a25240760273dd07b9dff6
func (tx *Transaction) RlpData() interface{} { func (tx *Transaction) RlpData() interface{} {
data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data} data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment