diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-20 19:07:08 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-20 19:07:08 +0800 |
| commit | f292e93e0e0cb979d1199608977d144e0231fd58 (patch) | |
| tree | 7f06d895c4c64a4c048b76ee8610a6867c5b2578 | |
| parent | 378815ee62b21cec60aceeafc7bc8a2a479290b5 (diff) | |
| parent | 38b4dc2cdf23380532a25240760273dd07b9dff6 (diff) | |
| download | go-tangerine-f292e93e0e0cb979d1199608977d144e0231fd58.tar.gz go-tangerine-f292e93e0e0cb979d1199608977d144e0231fd58.tar.zst go-tangerine-f292e93e0e0cb979d1199608977d144e0231fd58.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Conflicts:
ethchain/transaction.go
| -rw-r--r-- | ethchain/transaction.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ethchain/transaction.go b/ethchain/transaction.go index bd7a0e424..a36286e86 100644 --- a/ethchain/transaction.go +++ b/ethchain/transaction.go @@ -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} |