diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-27 03:26:49 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-27 03:26:49 +0800 |
| commit | 0fd6a22a867ab89cd23e9692e6f3544ce3383dca (patch) | |
| tree | 0c635cb4987c727d4861956666ede1628e4fa09e | |
| parent | fa7deb10f636d89f668249b78792f8cc48146ee8 (diff) | |
| parent | 3ab05ddd25aa805510ac304c1fd8f7c5c620dff4 (diff) | |
| download | dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.tar dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.tar.gz dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.tar.bz2 dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.tar.lz dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.tar.xz dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.tar.zst dexon-0fd6a22a867ab89cd23e9692e6f3544ce3383dca.zip | |
Merge branch 'hotfix/0.8.5-2'
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 2 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 | ||||
| -rw-r--r-- | core/state_transition.go | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 9c840de58..45e6f7b93 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -37,7 +37,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.8.5" + Version = "0.8.6" ) var clilogger = logger.NewLogger("CLI") diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index e80bd87e0..a909916b7 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -964,7 +964,7 @@ ApplicationWindow { anchors.top: parent.top anchors.topMargin: 30 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" } } diff --git a/cmd/mist/main.go b/cmd/mist/main.go index ad6eb5bec..3abe16767 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -36,7 +36,7 @@ import ( const ( ClientIdentifier = "Mist" - Version = "0.8.5" + Version = "0.8.6" ) var ethereum *eth.Ethereum diff --git a/core/state_transition.go b/core/state_transition.go index a065c4f6b..7331fdd4a 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -251,16 +251,13 @@ func (self *StateTransition) RefundGas() { coinbase, sender := self.Coinbase(), self.From() // Return remaining gas remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice()) - fmt.Println("REFUND:", remaining) sender.AddBalance(remaining) uhalf := new(big.Int).Div(self.GasUsed(), ethutil.Big2) for addr, ref := range self.state.Refunds() { refund := ethutil.BigMin(uhalf, ref) self.gas.Add(self.gas, refund) - addToIt := refund.Mul(refund, self.msg.GasPrice()) - fmt.Println("ADD TO IT", addToIt) - self.state.AddBalance([]byte(addr), addToIt) + self.state.AddBalance([]byte(addr), refund.Mul(refund, self.msg.GasPrice())) } coinbase.RefundGas(self.gas, self.msg.GasPrice()) |