Use execution result's MaxGasConsumed for gas estimation

Author: m-Peter

models/events_test.go

@@ -578,7 +578,7 @@ func newTransaction(nonce uint64, txIndex uint16) (Transaction, *types.Result, f
 		TxType:                  tx.Type(),
 		GasConsumed:             1,
 		CumulativeGasUsed:       1,
-		GasRefund:               0,
+		MaxGasConsumed:          1,
 		DeployedContractAddress: &types.Address{0x5, 0x6, 0x7},
 		ReturnedData:            []byte{0x55},
 		Logs: []*gethTypes.Log{{

services/requester/requester.go

@@ -376,9 +376,9 @@ func (e *EVM) EstimateGas(
 	failingGasLimit = result.GasConsumed - 1
 
 	// There's a fairly high chance for the transaction to execute successfully
-	// with gasLimit set to the first execution's GasConsumed + GasRefund.
+	// with gasLimit set to the first execution's MaxGasConsumed + CallStipend.
 	// Explicitly check that gas amount and use as a limit for the binary search.
-	optimisticGasLimit := (result.GasConsumed + result.GasRefund + gethParams.CallStipend) * 64 / 63
+	optimisticGasLimit := (result.MaxGasConsumed + gethParams.CallStipend) * 64 / 63
 	if optimisticGasLimit < passingGasLimit {
 		result, err := dryRun(optimisticGasLimit)
 		if err != nil {