Merge pull request #2314 from ethereum/fix_gas_refund

fix eth_estimateGas

Author: yann300

libs/remix-simulator/src/methods/transactions.ts

@@ -133,19 +133,22 @@ export class Transactions {
 
     payload.params[0].gas = 10000000 * 10
 
-    processTx(this.txRunnerInstance, payload, true, (error, result) => {
+    processTx(this.txRunnerInstance, payload, true, (error, { result }) => {
       if (error) return cb(error)
-      if (result.result.status === '0x0') {
+      if (result.status === '0x0') {
         try {
-          const msg = result.result.execResult.returnValue
+          const msg = result.execResult.returnValue
           const abiCoder = new ethers.utils.AbiCoder()
           const reason = abiCoder.decode(['string'], msg.slice(4))[0]
           return cb('revert ' + reason)
         } catch (e) {
           return cb(e.message)
-        }        
+        }
+      }
+      let gasUsed = result.execResult.gasUsed.toNumber()
+      if (result.execResult.gasRefund) {
+        gasUsed += result.execResult.gasRefund.toNumber()
       }
-      const gasUsed = result.result.execResult.gasUsed.toNumber()
       cb(null, Math.ceil(gasUsed + (15 * gasUsed) / 100))
     })
   }