poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop 

Conflicts:
	ethchain/transaction.go
This commit is contained in:
obscuren 2014-05-20 13:07:08 +02:00
parent 378815ee62 38b4dc2cdf
commit f292e93e0e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethchain/transaction.go
View File

@ -109,6 +109,11 @@ 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}