Clean up tests and add a few new ones

packages/contracts/contracts/optimistic-ethereum/ovm/PartialStateManager.sol

@@ -1,3 +1,4 @@
+pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Contract Imports */
@@ -31,20 +32,20 @@ contract PartialStateManager is ContractResolver {
 
     StateTransitioner private stateTransitioner;
 
-    mapping(address => mapping(bytes32 => bytes32)) private ovmContractStorage;
-    mapping(address => uint) private ovmContractNonces;
-    mapping(address => address) private ovmAddressToCodeContractAddress;
+    mapping(address => mapping(bytes32 => bytes32)) public ovmContractStorage;
+    mapping(address => uint) public ovmContractNonces;
+    mapping(address => address) public ovmAddressToCodeContractAddress;
 
     bool public existsInvalidStateAccessFlag;
 
     mapping(address => mapping(bytes32 => bool)) public isVerifiedStorage;
     mapping(address => bool) public isVerifiedContract;
-    mapping(uint => bytes32) private updatedStorageSlotContract;
-    mapping(uint => bytes32) private updatedStorageSlotKey;
-    mapping(address => mapping(bytes32 => bool)) private storageSlotTouched;
+    mapping(uint => bytes32) public updatedStorageSlotContract;
+    mapping(uint => bytes32) public updatedStorageSlotKey;
+    mapping(address => mapping(bytes32 => bool)) public storageSlotTouched;
     uint public updatedStorageSlotCounter;
-    mapping(uint => address) private updatedContracts;
-    mapping(address => bool) private contractTouched;
+    mapping(uint => address) public updatedContracts;
+    mapping(address => bool) public contractTouched;
     uint public updatedContractsCounter;
 
 

packages/contracts/contracts/optimistic-ethereum/ovm/StateTransitioner.sol

@@ -332,11 +332,11 @@ contract StateTransitioner is IStateTransitioner, ContractResolver {
     {
         require(
             stateManager.updatedStorageSlotCounter() == 0,
-            "There's still updated storage to account for!"
+            "All storage updates must be proven to complete the transition."
         );
         require(
-            stateManager.updatedStorageSlotCounter() == 0,
-            "There's still updated contracts to account for!"
+            stateManager.updatedContractsCounter() == 0,
+            "All contract updates must be proven to complete the transition."
         );
 
         currentTransitionPhase = TransitionPhases.Complete;

packages/contracts/contracts/test-helpers/ContextContract.sol

@@ -40,6 +40,33 @@ contract ContextContract {
         }
     }
 
+    function staticCallThroughExecutionManager() public {
+        // bitwise right shift 28 * 8 bits so the 4 method ID bytes are in the right-most bytes
+        bytes32 methodId = keccak256("ovmSTATICCALL()") >> 224;
+        address addr = executionManagerAddress;
+
+        assembly {
+            let callBytes := mload(0x40)
+            calldatacopy(callBytes, 0, calldatasize)
+
+            // replace the first 4 bytes with the right methodID
+            mstore8(callBytes, shr(24, methodId))
+            mstore8(add(callBytes, 1), shr(16, methodId))
+            mstore8(add(callBytes, 2), shr(8, methodId))
+            mstore8(add(callBytes, 3), methodId)
+
+            // overwrite call params
+            let result := mload(0x40)
+            let success := call(gas, addr, 0, callBytes, calldatasize, result, 32)
+
+            if eq(success, 0) {
+                revert(0, 0)
+            }
+
+            return(result, returndatasize)
+        }
+    }
+
     function getCALLER() public {
         // bitwise right shift 28 * 8 bits so the 4 method ID bytes are in the right-most bytes
         bytes32 methodId = keccak256("ovmCALLER()") >> 224;
@@ -228,4 +255,85 @@ contract ContextContract {
             return(result, returndatasize)
         }
     }
+
+    function ovmBlockGasLimit() public {
+        // bitwise right shift 28 * 8 bits so the 4 method ID bytes are in the right-most bytes
+        bytes32 methodId = keccak256("ovmBlockGasLimit()") >> 224;
+        address addr = executionManagerAddress;
+
+        assembly {
+            let callBytes := mload(0x40)
+            calldatacopy(callBytes, 0, calldatasize)
+
+            // replace the first 4 bytes with the right methodID
+            mstore8(callBytes, shr(24, methodId))
+            mstore8(add(callBytes, 1), shr(16, methodId))
+            mstore8(add(callBytes, 2), shr(8, methodId))
+            mstore8(add(callBytes, 3), methodId)
+
+            // overwrite call params
+            let result := mload(0x40)
+            let success := call(gas, addr, 0, callBytes, calldatasize, result, 32)
+
+            if eq(success, 0) {
+                revert(0, 0)
+            }
+
+            return(result, returndatasize)
+        }
+    }
+
+    function isStaticContext() public {
+        // bitwise right shift 28 * 8 bits so the 4 method ID bytes are in the right-most bytes
+        bytes32 methodId = keccak256("isStaticContext()") >> 224;
+        address addr = executionManagerAddress;
+
+        assembly {
+            let callBytes := mload(0x40)
+            calldatacopy(callBytes, 0, calldatasize)
+
+            // replace the first 4 bytes with the right methodID
+            mstore8(callBytes, shr(24, methodId))
+            mstore8(add(callBytes, 1), shr(16, methodId))
+            mstore8(add(callBytes, 2), shr(8, methodId))
+            mstore8(add(callBytes, 3), methodId)
+
+            // overwrite call params
+            let result := mload(0x40)
+            let success := call(gas, addr, 0, callBytes, calldatasize, result, 32)
+
+            if eq(success, 0) {
+                revert(0, 0)
+            }
+
+            return(result, returndatasize)
+        }
+    }
+
+    function ovmORIGIN() public {
+        // bitwise right shift 28 * 8 bits so the 4 method ID bytes are in the right-most bytes
+        bytes32 methodId = keccak256("ovmORIGIN()") >> 224;
+        address addr = executionManagerAddress;
+
+        assembly {
+            let callBytes := mload(0x40)
+            calldatacopy(callBytes, 0, calldatasize)
+
+            // replace the first 4 bytes with the right methodID
+            mstore8(callBytes, shr(24, methodId))
+            mstore8(add(callBytes, 1), shr(16, methodId))
+            mstore8(add(callBytes, 2), shr(8, methodId))
+            mstore8(add(callBytes, 3), methodId)
+
+            // overwrite call params
+            let result := mload(0x40)
+            let success := call(gas, addr, 0, callBytes, calldatasize, result, 32)
+
+            if eq(success, 0) {
+                revert(0, 0)
+            }
+
+            return(result, returndatasize)
+        }
+    }
 }

packages/contracts/contracts/test-helpers/FraudTester.sol

@@ -3,6 +3,10 @@ pragma solidity ^0.5.0;
 contract BaseFraudTester {
     mapping (bytes32 => bytes32) public builtInStorage;
 
+    function doRevert() public {
+        revert("Performing a revert for testing.");
+    }
+
     function setStorage(bytes32 key, bytes32 value) public {
         builtInStorage[key] = value;
     }

packages/contracts/package.json

@@ -38,6 +38,7 @@
   "dependencies": {
     "@eth-optimism/core-db": "^0.0.1-alpha.25",
     "@eth-optimism/core-utils": "^0.0.1-alpha.25",
+    "@eth-optimism/rollup-core": "^0.0.1-alpha.28",
     "@eth-optimism/solc-transpiler": "^0.0.1-alpha.27",
     "@nomiclabs/buidler": "^1.3.8",
     "@nomiclabs/buidler-ethers": "^2.0.0",

packages/contracts/src/deployment/index.ts

@@ -1 +1,2 @@
 export * from './contract-deploy'
+export { AddressResolverMapping, RollupDeployConfig } from './types'