diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-07 20:00:36 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-07 20:00:36 +0800 |
| commit | d7580f21f65beaf896bfc004cf13d28ed87f2ae3 (patch) | |
| tree | eeb9391f0b828099319612445337ef2a9069819a /rpc | |
| parent | b1fac4270d639d0a80871784edd80cf16c9f8540 (diff) | |
| parent | 132df860d90c163a8be55260bdd219892f9e1bef (diff) | |
| download | dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.gz dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.bz2 dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.lz dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.xz dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.zst dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.zip | |
Merge pull request #1595 from obscuren/extra-data
cmd/geth, eth: added canonical extra data
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api/miner.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/rpc/api/miner.go b/rpc/api/miner.go index 3c3d1ee0b..5325a660a 100644 --- a/rpc/api/miner.go +++ b/rpc/api/miner.go @@ -17,12 +17,9 @@ package api import ( - "fmt" - "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/shared" ) @@ -126,11 +123,10 @@ func (self *minerApi) SetExtra(req *shared.Request) (interface{}, error) { return nil, err } - if uint64(len(args.Data)) > params.MaximumExtraDataSize.Uint64()*2 { - return false, fmt.Errorf("extra datasize can be no longer than %v bytes", params.MaximumExtraDataSize) + if err := self.ethereum.Miner().SetExtra([]byte(args.Data)); err != nil { + return false, err } - self.ethereum.Miner().SetExtra([]byte(args.Data)) return true, nil } |