diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-19 23:06:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-19 23:07:40 +0800 |
| commit | 8f3a7e41deff4084b166aca1337258077bd2a3e6 (patch) | |
| tree | ddc62daeec7a44c2baacb986f8c9d76df25a5976 /core | |
| parent | 4683f9c0a71fd42e749da46ac56c6ba76f379931 (diff) | |
| parent | 7180699d401e64b52447ccb2cfb33004b7deb672 (diff) | |
| download | go-tangerine-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.gz go-tangerine-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.zst go-tangerine-8f3a7e41deff4084b166aca1337258077bd2a3e6.zip | |
Merge branch 'rlp-size-validation' of https://github.com/fjl/go-ethereum into fjl-rlp-size-validation
Conflicts:
eth/protocol.go
Diffstat (limited to 'core')
| -rw-r--r-- | core/types/transaction.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/types/transaction.go b/core/types/transaction.go index 6646bdf29..d8dcd7424 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -22,7 +22,7 @@ type Transaction struct { AccountNonce uint64 Price *big.Int GasLimit *big.Int - Recipient *common.Address // nil means contract creation + Recipient *common.Address `rlp:"nil"` // nil means contract creation Amount *big.Int Payload []byte V byte |