Reset Context on invalid gaslimit (#260)

ben-chain · web-flow · commit 2d9e4131ef1f · 2021-03-01T17:17:11.000-08: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
@@ -85,6 +85,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         ovmSafetyChecker = iOVM_SafetyChecker(resolve("OVM_SafetyChecker"));
         gasMeterConfig = _gasMeterConfig;
         globalContext = _globalContext;
+        _resetContext();
     }
 
 
@@ -183,6 +184,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
`@@ -85,6 +85,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {`
`85`	`85`	`ovmSafetyChecker = iOVM_SafetyChecker(resolve("OVM_SafetyChecker"));`
`86`	`86`	`gasMeterConfig = _gasMeterConfig;`
`87`	`87`	`globalContext = _globalContext;`
	`88`	`+ _resetContext();`
`88`	`89`	`}`
`89`	`90`
`90`	`91`
`@@ -183,6 +184,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {`
`183`	`184`	`// Make sure the transaction's gas limit is valid. We don't revert here because we reserve`
`184`	`185`	`// reverts for INVALID_STATE_ACCESS.`
`185`	`186`	`if (_isValidGasLimit(_transaction.gasLimit, _transaction.l1QueueOrigin) == false) {`
	`187`	`+ _resetContext();`
`186`	`188`	`return;`
`187`	`189`	`}`
`188`	`190`