Minor updates on gas and removed/refactored old code.

1 files changed, 10 insertions, 11 deletions

diff --git a/core/state_transition.go b/core/state_transition.go
index a60f31e3e..7b7026c29 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -186,13 +186,13 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) {
 	vmenv := self.VmEnv()
 	var ref vm.ClosureRef
 	if MessageCreatesContract(msg) {
-		self.rec = MakeContract(msg, self.state)
-
-		ret, err, ref = vmenv.Create(sender, self.rec.Address(), self.msg.Data(), self.gas, self.gasPrice, self.value)
+		contract := MakeContract(msg, self.state)
+		ret, err, ref = vmenv.Create(sender, contract.Address(), self.msg.Data(), self.gas, self.gasPrice, self.value)
 		if err == nil {
 			dataGas := big.NewInt(int64(len(ret)))
 			dataGas.Mul(dataGas, vm.GasCreateByte)
 			if err = self.UseGas(dataGas); err == nil {
+				//self.state.SetCode(ref.Address(), ret)
 				ref.SetCode(ret)
 			}
 		}
@@ -218,20 +218,19 @@ func MakeContract(msg Message, state *state.StateDB) *state.StateObject {
 }
 
 func (self *StateTransition) RefundGas() {
-	coinbaseSub := new(big.Int).Set(self.gas)
+	coinbase, sender := self.Coinbase(), self.From()
+	// Return remaining gas
+	remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice())
+	sender.AddAmount(remaining)
+
 	uhalf := new(big.Int).Div(self.GasUsed(), ethutil.Big2)
 	for addr, ref := range self.state.Refunds() {
 		refund := ethutil.BigMin(uhalf, ref)
-		coinbaseSub.Add(self.gas, refund)
+		self.gas.Add(self.gas, refund)
 		self.state.AddBalance([]byte(addr), refund.Mul(refund, self.msg.GasPrice()))
 	}
 
-	coinbase, sender := self.Coinbase(), self.From()
-	coinbase.RefundGas(coinbaseSub, self.msg.GasPrice())
-
-	// Return remaining gas
-	remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice())
-	sender.AddAmount(remaining)
+	coinbase.RefundGas(self.gas, self.msg.GasPrice())
 }
 
 func (self *StateTransition) GasUsed() *big.Int {