forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge c37c82e259 into a2333bcbb4

Browse source
This commit is contained in:
Jeffrey Wilcke 2015-07-07 18:03:24 +00:00
commit 7c8b1cc65c
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/state_transition.go
View file

@ -255,10 +255,18 @@ func (self *StateTransition) refundGas() {
uhalf := remaining.Div(self.gasUsed(), common.Big2) uhalf := remaining.Div(self.gasUsed(), common.Big2)
refund := common.BigMin(uhalf, self.state.Refunds()) refund := common.BigMin(uhalf, self.state.Refunds())
self.gas.Add(self.gas, refund)
self.state.AddBalance(sender.Address(), refund.Mul(refund, self.gasPrice))
coinbase.AddGas(self.gas, self.gasPrice) gas := new(big.Int).Set(self.gas)
gas.Add(gas, refund)
self.state.AddBalance(sender.Address(), refund.Mul(refund, self.gasPrice))
coinbase.AddGas(gas, self.gasPrice)
// XXX !!HARD FORK!! XXX
// Above 830.000 receipts should no longer have have reduced gas used
// from refunds. This prevents clever tricks to add 2x more used gas in
// a block.
if self.env.BlockNumber().Cmp(big.NewInt(830000)) < 0 {
self.gas.Set(gas)
}
} }
func (self *StateTransition) gasUsed() *big.Int { func (self *StateTransition) gasUsed() *big.Int {