forked from cerc-io/plugeth
Merge branch 'hotfix/0.8.5-2' into develop
This commit is contained in:
commit
3a7c8d7ae4
@ -37,7 +37,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
ClientIdentifier = "Ethereum(G)"
|
ClientIdentifier = "Ethereum(G)"
|
||||||
Version = "0.8.5"
|
Version = "0.8.6"
|
||||||
)
|
)
|
||||||
|
|
||||||
var clilogger = logger.NewLogger("CLI")
|
var clilogger = logger.NewLogger("CLI")
|
||||||
|
@ -964,7 +964,7 @@ ApplicationWindow {
|
|||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 30
|
anchors.topMargin: 30
|
||||||
font.pointSize: 12
|
font.pointSize: 12
|
||||||
text: "<h2>Mist (0.8.5)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
|
text: "<h2>Mist (0.8.6)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
ClientIdentifier = "Mist"
|
ClientIdentifier = "Mist"
|
||||||
Version = "0.8.5"
|
Version = "0.8.6"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ethereum *eth.Ethereum
|
var ethereum *eth.Ethereum
|
||||||
|
@ -251,16 +251,13 @@ func (self *StateTransition) RefundGas() {
|
|||||||
coinbase, sender := self.Coinbase(), self.From()
|
coinbase, sender := self.Coinbase(), self.From()
|
||||||
// Return remaining gas
|
// Return remaining gas
|
||||||
remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice())
|
remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice())
|
||||||
fmt.Println("REFUND:", remaining)
|
|
||||||
sender.AddBalance(remaining)
|
sender.AddBalance(remaining)
|
||||||
|
|
||||||
uhalf := new(big.Int).Div(self.GasUsed(), ethutil.Big2)
|
uhalf := new(big.Int).Div(self.GasUsed(), ethutil.Big2)
|
||||||
for addr, ref := range self.state.Refunds() {
|
for addr, ref := range self.state.Refunds() {
|
||||||
refund := ethutil.BigMin(uhalf, ref)
|
refund := ethutil.BigMin(uhalf, ref)
|
||||||
self.gas.Add(self.gas, refund)
|
self.gas.Add(self.gas, refund)
|
||||||
addToIt := refund.Mul(refund, self.msg.GasPrice())
|
self.state.AddBalance([]byte(addr), refund.Mul(refund, self.msg.GasPrice()))
|
||||||
fmt.Println("ADD TO IT", addToIt)
|
|
||||||
self.state.AddBalance([]byte(addr), addToIt)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
coinbase.RefundGas(self.gas, self.msg.GasPrice())
|
coinbase.RefundGas(self.gas, self.msg.GasPrice())
|
||||||
|
Loading…
Reference in New Issue
Block a user