Reset Context on invalid gaslimit (#260)

ben-chain · maurelian · commit c788737ba069 · 2021-03-02T15:09:12.000-05:00
* add reset

* add to constructor
diff --git a/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol b/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
@@ -87,6 +87,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         ovmSafetyCache = iOVM_SafetyCache(resolve("OVM_SafetyCache"));
         gasMeterConfig = _gasMeterConfig;
         globalContext = _globalContext;
+        _resetContext();
     }
 
 
@@ -185,6 +186,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         // Make sure the transaction's gas limit is valid. We don't revert here because we reserve
         // reverts for INVALID_STATE_ACCESS.
         if (_isValidGasLimit(_transaction.gasLimit, _transaction.l1QueueOrigin) == false) {
+            _resetContext();
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {`
`87`	`87`	`ovmSafetyCache = iOVM_SafetyCache(resolve("OVM_SafetyCache"));`
`88`	`88`	`gasMeterConfig = _gasMeterConfig;`
`89`	`89`	`globalContext = _globalContext;`
	`90`	`+ _resetContext();`
`90`	`91`	`}`
`91`	`92`
`92`	`93`
`@@ -185,6 +186,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {`
`185`	`186`	`// Make sure the transaction's gas limit is valid. We don't revert here because we reserve`
`186`	`187`	`// reverts for INVALID_STATE_ACCESS.`
`187`	`188`	`if (_isValidGasLimit(_transaction.gasLimit, _transaction.l1QueueOrigin) == false) {`
	`189`	`+ _resetContext();`
`188`	`190`	`return;`
`189`	`191`	`}`
`190`	`192`