Merge pull request #2724 from pirapira/fix_reset_fees

vm: Replace some SstoreClearGas with SstoreResetGas

core/vm/jit.go

@@ -421,7 +421,7 @@ func jitCalculateGasAndSize(env Environment, contract *Contract, instr instructi
 
 			g = params.SstoreClearGas
 		} else {
-			g = params.SstoreClearGas
+			g = params.SstoreResetGas
 		}
 		gas.Set(g)
 	case SUICIDE:

core/vm/vm.go

@@ -306,7 +306,7 @@ func calculateGasAndSize(env Environment, contract *Contract, caller ContractRef
 			g = params.SstoreClearGas
 		} else {
 			// non 0 => non 0 (or 0 => 0)
-			g = params.SstoreClearGas
+			g = params.SstoreResetGas
 		}
 		gas.Set(g)
 	case SUICIDE: