roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

...

Browse Source
This commit is contained in:
obscuren 2014-05-20 13:09:44 +02:00
parent f292e93e0e
commit 45b810450f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethchain/transaction.go
View File

@ -109,11 +109,6 @@ func (tx *Transaction) Sign(privk []byte) error {
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{} {
data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data}