diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-24 20:48:47 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-24 20:48:47 +0800 |
| commit | 5490437942967638bcc6198035315f6811febaa8 (patch) | |
| tree | ec4fbee454bacbf2b80b5a7ff402fb48dd2c10cf /eth/gasprice.go | |
| parent | e5532154a50114d5ffb1ffd850b746cab00cb899 (diff) | |
| parent | b0fb48c389460193d9fc0a5118d79ff6dec48ce0 (diff) | |
| download | go-tangerine-1.3.2.tar go-tangerine-1.3.2.tar.gz go-tangerine-1.3.2.tar.bz2 go-tangerine-1.3.2.tar.lz go-tangerine-1.3.2.tar.xz go-tangerine-1.3.2.tar.zst go-tangerine-1.3.2.zip | |
Merge branch 'develop' into release/1.3.2v1.3.2
Conflicts:
VERSION
cmd/geth/main.go
Diffstat (limited to 'eth/gasprice.go')
| -rw-r--r-- | eth/gasprice.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/gasprice.go b/eth/gasprice.go index b752c22dd..e0de89e62 100644 --- a/eth/gasprice.go +++ b/eth/gasprice.go @@ -166,7 +166,7 @@ func (self *GasPriceOracle) processBlock(block *types.Block) { func (self *GasPriceOracle) lowestPrice(block *types.Block) *big.Int { gasUsed := big.NewInt(0) - receipts := self.eth.BlockProcessor().GetBlockReceipts(block.Hash()) + receipts := core.GetBlockReceipts(self.eth.ChainDb(), block.Hash()) if len(receipts) > 0 { if cgu := receipts[len(receipts)-1].CumulativeGasUsed; cgu != nil { gasUsed = receipts[len(receipts)-1].CumulativeGasUsed |