Treat SM address as context (#366)

f77c0bec · Maurelian · GitHub · 12485546 · f77c0bec
Commit f77c0bec authored Apr 06, 2021 by Maurelian Committed by GitHub Apr 06, 2021
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

OVM_ExecutionManager.sol ...ptimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol +8 -8

No files found.
--- a/packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
+++ b/packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
@@ -206,9 +206,6 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {

        // Wipe the execution context.
        _resetContext();
-
-        // Reset the ovmStateManager.
-        ovmStateManager = iOVM_StateManager(address(0));
    }


@@ -1813,6 +1810,9 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
        messageContext.isStatic = false;

        messageRecord.nuisanceGasLeft = 0;
+
+        // Reset the ovmStateManager.
+        ovmStateManager = iOVM_StateManager(address(0));
    }

    /*****************************