aboutsummaryrefslogtreecommitdiffstats
path: root/eth/gasprice.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-07-07 21:12:56 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-07-07 21:12:56 +0800
commit193c62fdba3bb5c40daad6652c18d81d43518235 (patch)
tree4b77244b1ce72160a1434036977c7a473781665c /eth/gasprice.go
parenta2ce7b99501b3273b4cee65cd6784c7d1c4645f7 (diff)
parentd673c34c8d4ae83a3765ed44ae9d0fb7ce1aa3c9 (diff)
downloadgo-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.tar
go-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.tar.gz
go-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.tar.bz2
go-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.tar.lz
go-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.tar.xz
go-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.tar.zst
go-tangerine-193c62fdba3bb5c40daad6652c18d81d43518235.zip
Merge branch 'release/0.9.36'
Diffstat (limited to 'eth/gasprice.go')
-rw-r--r--eth/gasprice.go27
1 files changed, 21 insertions, 6 deletions
diff --git a/eth/gasprice.go b/eth/gasprice.go
index ddf1c8c09..fbb7fec3f 100644
--- a/eth/gasprice.go
+++ b/eth/gasprice.go
@@ -1,3 +1,19 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
package eth
import (
@@ -131,13 +147,12 @@ func (self *GasPriceOracle) processBlock(block *types.Block) {
// returns the lowers possible price with which a tx was or could have been included
func (self *GasPriceOracle) lowestPrice(block *types.Block) *big.Int {
gasUsed := new(big.Int)
- recepits, err := self.eth.BlockProcessor().GetBlockReceipts(block.Hash())
- if err != nil {
- return self.eth.GpoMinGasPrice
- }
- if len(recepits) > 0 {
- gasUsed = recepits[len(recepits)-1].CumulativeGasUsed
+ receipts := self.eth.BlockProcessor().GetBlockReceipts(block.Hash())
+ if len(receipts) > 0 {
+ if cgu := receipts[len(receipts)-1].CumulativeGasUsed; cgu != nil {
+ gasUsed = receipts[len(receipts)-1].CumulativeGasUsed
+ }
}
if new(big.Int).Mul(gasUsed, big.NewInt(100)).Cmp(new(big.Int).Mul(block.GasLimit(),