diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-20 19:09:44 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-20 19:09:44 +0800 |
| commit | 45b810450fc75ef47964b1b53197114d1bf6db3d (patch) | |
| tree | b655540bd3fed4f083190e7d90c9dd16ce151cf4 /ethchain | |
| parent | f292e93e0e0cb979d1199608977d144e0231fd58 (diff) | |
| download | go-tangerine-45b810450fc75ef47964b1b53197114d1bf6db3d.tar.gz go-tangerine-45b810450fc75ef47964b1b53197114d1bf6db3d.tar.zst go-tangerine-45b810450fc75ef47964b1b53197114d1bf6db3d.zip | |
...
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/transaction.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ethchain/transaction.go b/ethchain/transaction.go index a36286e86..bd7a0e424 100644 --- a/ethchain/transaction.go +++ b/ethchain/transaction.go @@ -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} |