Added fix for error in StateTransitioner (#13)

* Added fix for error in StateTransitioner

* Added tests for some precompiles (#14)

* Added tests for some precompiles

* Cleanup build process (#15)

* Cleaned build and added typechain

* Linted files

packages/contracts/buidler.config.ts

@@ -7,6 +7,7 @@ import {
 
 usePlugin('@nomiclabs/buidler-ethers')
 usePlugin('@nomiclabs/buidler-waffle')
+usePlugin('buidler-typechain')
 
 import '@eth-optimism/smock/build/src/buidler-plugins/compiler-storage-layout'
 
@@ -24,6 +25,10 @@ const config: BuidlerConfig = {
     version: '0.7.0',
     optimizer: { enabled: true, runs: 200 },
   },
+  typechain: {
+    outDir: 'build/types',
+    target: 'ethers-v5',
+  },
 }
 
 export default config

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/OVM_L1CrossDomainMessenger.sol

@@ -143,6 +143,7 @@ contract OVM_L1CrossDomainMessenger is iOVM_L1CrossDomainMessenger, OVM_BaseCros
         L2MessageInclusionProof memory _proof
     )
         internal
+        view
         returns (
             bool
         )
@@ -162,6 +163,7 @@ contract OVM_L1CrossDomainMessenger is iOVM_L1CrossDomainMessenger, OVM_BaseCros
         L2MessageInclusionProof memory _proof
     )
         internal
+        view
         returns (
             bool
         )
@@ -187,6 +189,7 @@ contract OVM_L1CrossDomainMessenger is iOVM_L1CrossDomainMessenger, OVM_BaseCros
         L2MessageInclusionProof memory _proof
     )
         internal
+        pure
         returns (
             bool
         )

packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol

@@ -204,7 +204,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
             "Must append more than zero transactions."
         );
 
-        (uint40 totalElements, uint32 nextQueueIndex) = _getLatestBatchContext();
+        (, uint32 nextQueueIndex) = _getLatestBatchContext();
 
         bytes32[] memory leaves = new bytes32[](_numQueuedTransactions);
         for (uint i = 0; i < _numQueuedTransactions; i++) {
@@ -424,7 +424,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
         uint32 _nextQueueIndex
     )
         internal
-        view
+        pure
         returns (
             bytes28 _context
         )
@@ -512,6 +512,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
         uint32 _nextQueueIndex
     )
         internal
+        view
     {
         if (queue.getLength() == 0) {
             return;

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol

@@ -1319,6 +1319,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         bytes memory _data
     )
         internal
+        view
         returns (
             bytes memory _revertdata
         )
@@ -1362,6 +1363,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         bytes memory _revertdata
     )
         internal
+        pure
         returns (
             RevertFlag _flag,
             uint256 _nuisanceGasLeft,

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_SafetyChecker.sol

@@ -22,7 +22,7 @@ contract OVM_SafetyChecker is iOVM_SafetyChecker {
     )
         override
         external
-        view
+        pure
         returns (bool)
     {
         // autogenerated by gen_safety_checker_constants.py

packages/contracts/contracts/optimistic-ethereum/OVM/precompiles/OVM_L1MessageSender.sol

@@ -20,6 +20,7 @@ contract OVM_L1MessageSender is iOVM_L1MessageSender {
     function getL1MessageSender()
         override
         public
+        view
         returns (
             address _l1MessageSender
         )

packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol

@@ -332,12 +332,10 @@ contract OVM_StateTransitioner is iOVM_StateTransitioner, Lib_AddressResolver {
     /**
      * Allows a user to commit the final state of a contract.
      * @param _ovmContractAddress Address of the contract on the OVM.
-     * @param _account Claimed account state.
      * @param _stateTrieWitness Proof of the account state.
      */
     function commitContractState(
         address _ovmContractAddress,
-        Lib_OVMCodec.EVMAccount memory _account,
         bytes memory _stateTrieWitness
     )
         override
@@ -349,9 +347,13 @@ contract OVM_StateTransitioner is iOVM_StateTransitioner, Lib_AddressResolver {
             "Account was not changed or has already been committed."
         );
 
+        Lib_OVMCodec.Account memory account = ovmStateManager.getAccount(_ovmContractAddress);
+
         postStateRoot = Lib_SecureMerkleTrie.update(
             abi.encodePacked(_ovmContractAddress),
-            Lib_OVMCodec.encodeEVMAccount(_account),
+            Lib_OVMCodec.encodeEVMAccount(
+                Lib_OVMCodec.toEVMAccount(account)
+            ),
             _stateTrieWitness,
             postStateRoot
         );
@@ -361,14 +363,12 @@ contract OVM_StateTransitioner is iOVM_StateTransitioner, Lib_AddressResolver {
      * Allows a user to commit the final state of a contract storage slot.
      * @param _ovmContractAddress Address of the contract on the OVM.
      * @param _key Claimed account slot key.
-     * @param _value Claimed account slot value.
      * @param _stateTrieWitness Proof of the account state.
      * @param _storageTrieWitness Proof of the storage slot.
      */
     function commitStorageSlot(
         address _ovmContractAddress,
         bytes32 _key,
-        bytes32 _value,
         bytes memory _stateTrieWitness,
         bytes memory _storageTrieWitness
     )
@@ -381,23 +381,26 @@ contract OVM_StateTransitioner is iOVM_StateTransitioner, Lib_AddressResolver {
             "Storage slot was not changed or has already been committed."
         );
 
-        Lib_OVMCodec.EVMAccount memory account = Lib_OVMCodec.toEVMAccount(
-            ovmStateManager.getAccount(_ovmContractAddress)
-        );
+        Lib_OVMCodec.Account memory account = ovmStateManager.getAccount(_ovmContractAddress);
+        bytes32 value = ovmStateManager.getContractStorage(_ovmContractAddress, _key);
 
         account.storageRoot = Lib_SecureMerkleTrie.update(
             abi.encodePacked(_key),
-            abi.encodePacked(_value),
+            abi.encodePacked(value),
             _storageTrieWitness,
             account.storageRoot
         );
 
         postStateRoot = Lib_SecureMerkleTrie.update(
             abi.encodePacked(_ovmContractAddress),
-            Lib_OVMCodec.encodeEVMAccount(account),
+            Lib_OVMCodec.encodeEVMAccount(
+                Lib_OVMCodec.toEVMAccount(account)
+            ),
             _stateTrieWitness,
             postStateRoot
         );
+
+        ovmStateManager.putAccount(_ovmContractAddress, account);
     }
 
 

packages/contracts/contracts/optimistic-ethereum/iOVM/verification/iOVM_StateTransitioner.sol

@@ -58,14 +58,12 @@ interface iOVM_StateTransitioner {
 
     function commitContractState(
         address _ovmContractAddress,
-        Lib_OVMCodec.EVMAccount calldata _account,
         bytes calldata _stateTrieWitness
     ) external;
 
     function commitStorageSlot(
         address _ovmContractAddress,
         bytes32 _key,
-        bytes32 _value,
         bytes calldata _stateTrieWitness,
         bytes calldata _storageTrieWitness
     ) external;

packages/contracts/contracts/optimistic-ethereum/libraries/resolver/Lib_AddressResolver.sol

@@ -25,9 +25,7 @@ contract Lib_AddressResolver {
      */
     constructor(
         address _libAddressManager
-    )
-        public
-    {
+    ) {
         libAddressManager = Lib_AddressManager(_libAddressManager);
     }
 

packages/contracts/contracts/optimistic-ethereum/libraries/resolver/Lib_Ownable.sol

@@ -28,9 +28,7 @@ abstract contract Ownable {
      * Constructor *
      ***************/
 
-    constructor()
-        internal
-    {
+    constructor() {
         owner = msg.sender;
         emit OwnershipTransferred(address(0), owner);
     }

packages/contracts/contracts/optimistic-ethereum/libraries/rlp/Lib_RLPReader.sol

@@ -79,7 +79,7 @@ library Lib_RLPReader {
     {
         (
             uint256 listOffset,
-            uint256 listLength,
+            ,
             RLPItemType itemType
         ) = _decodeLength(_in);
 

packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_MerkleTrie.sol

@@ -77,7 +77,7 @@ library Lib_MerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bool _verified
         )
@@ -108,7 +108,7 @@ library Lib_MerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bool _verified
         )
@@ -138,7 +138,7 @@ library Lib_MerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bytes32 _updatedRoot
         )
@@ -171,7 +171,7 @@ library Lib_MerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bool _exists,
             bytes memory _value
@@ -206,7 +206,7 @@ library Lib_MerkleTrie {
         bytes memory _value
     )
         internal
-        view
+        pure
         returns (
             bytes32 _updatedRoot
         )
@@ -237,7 +237,7 @@ library Lib_MerkleTrie {
         bytes32 _root
     )
         private
-        view
+        pure
         returns (
             uint256 _pathLength,
             bytes memory _keyRemainder,
@@ -358,7 +358,7 @@ library Lib_MerkleTrie {
         bytes memory _value
     )
         private
-        view
+        pure
         returns (
             TrieNode[] memory _newPath
         )
@@ -484,7 +484,7 @@ library Lib_MerkleTrie {
         bytes memory _key
     )
         private
-        view
+        pure
         returns (
             bytes32 _updatedRoot
         )
@@ -547,7 +547,7 @@ library Lib_MerkleTrie {
         bytes memory _proof
     )
         private
-        view
+        pure
         returns (
             TrieNode[] memory _parsed
         )
@@ -577,7 +577,7 @@ library Lib_MerkleTrie {
         Lib_RLPReader.RLPItem memory _node
     )
         private
-        view
+        pure
         returns (
             bytes32 _nodeID
         )
@@ -604,7 +604,7 @@ library Lib_MerkleTrie {
         TrieNode memory _node
     )
         private
-        view
+        pure
         returns (
             bytes memory _path
         )
@@ -622,7 +622,7 @@ library Lib_MerkleTrie {
         TrieNode memory _node
     )
         private
-        view
+        pure
         returns (
             bytes memory _key
         )
@@ -639,7 +639,7 @@ library Lib_MerkleTrie {
         TrieNode memory _node
     )
         private
-        view
+        pure
         returns (
             bytes memory _value
         )
@@ -678,7 +678,7 @@ library Lib_MerkleTrie {
         TrieNode memory _node
     )
         private
-        view
+        pure
         returns (
             NodeType _type
         )
@@ -711,7 +711,7 @@ library Lib_MerkleTrie {
         bytes memory _b
     )
         private
-        view
+        pure
         returns (
             uint256 _shared
         )
@@ -732,7 +732,7 @@ library Lib_MerkleTrie {
         bytes[] memory _raw
     )
         private
-        view
+        pure
         returns (
             TrieNode memory _node
         )
@@ -754,7 +754,7 @@ library Lib_MerkleTrie {
         Lib_RLPReader.RLPItem[] memory _items
     )
         private
-        view
+        pure
         returns (
             TrieNode memory _node
         )
@@ -777,7 +777,7 @@ library Lib_MerkleTrie {
         bytes memory _value
     )
         private
-        view
+        pure
         returns (
             TrieNode memory _node
         )
@@ -803,7 +803,7 @@ library Lib_MerkleTrie {
         bytes memory _value
     )
         private
-        view
+        pure
         returns (
             TrieNode memory _node
         )
@@ -821,7 +821,7 @@ library Lib_MerkleTrie {
      */
     function _makeEmptyBranchNode()
         private
-        view
+        pure
         returns (
             TrieNode memory _node
         )
@@ -844,7 +844,7 @@ library Lib_MerkleTrie {
         bytes memory _value
     )
         private
-        view
+        pure
         returns (
             TrieNode memory _updatedNode
         )
@@ -867,7 +867,7 @@ library Lib_MerkleTrie {
         bytes memory _value
     )
         private
-        view
+        pure
         returns (
             TrieNode memory _updatedNode
         )
@@ -888,7 +888,7 @@ library Lib_MerkleTrie {
         bool _isLeaf
     )
         private
-        view
+        pure
         returns (
             bytes memory _prefixedKey
         )
@@ -909,7 +909,7 @@ library Lib_MerkleTrie {
         bytes memory _path
     )
         private
-        view
+        pure
         returns (
             bytes memory _unprefixedKey
         )

packages/contracts/contracts/optimistic-ethereum/libraries/trie/Lib_SecureMerkleTrie.sol

@@ -33,7 +33,7 @@ library Lib_SecureMerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bool _verified
         )
@@ -58,7 +58,7 @@ library Lib_SecureMerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bool _verified
         )
@@ -85,7 +85,7 @@ library Lib_SecureMerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bytes32 _updatedRoot
         )
@@ -108,7 +108,7 @@ library Lib_SecureMerkleTrie {
         bytes32 _root
     )
         internal
-        view
+        pure
         returns (
             bool _exists,
             bytes memory _value
@@ -129,7 +129,7 @@ library Lib_SecureMerkleTrie {
         bytes memory _value
     )
         internal
-        view
+        pure
         returns (
             bytes32 _updatedRoot
         )

packages/contracts/contracts/optimistic-ethereum/libraries/utils/Lib_EthUtils.sol

@@ -145,7 +145,7 @@ library Lib_EthUtils {
         uint256 _nonce
     )
         internal
-        view
+        pure
         returns (
             address _address
         )
@@ -171,7 +171,7 @@ library Lib_EthUtils {
         bytes32 _salt
     )
         internal
-        view
+        pure
         returns (address _address)
     {
         bytes32 hashedData = keccak256(abi.encodePacked(

packages/contracts/contracts/optimistic-ethereum/libraries/utils/Lib_MerkleRoot.sol

+// SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.7.0;
 
 // author: cobaltedge

packages/contracts/contracts/optimistic-ethereum/libraries/utils/Lib_MerkleUtils.sol

@@ -10,7 +10,7 @@ library Lib_MerkleUtils {
         bytes32[] memory _hashes
     )
         internal
-        view
+        pure
         returns (
             bytes32 _root
         )

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

+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.7.0;
+
+import { Helper_SimpleProxy } from "./Helper_SimpleProxy.sol";
+
+contract Helper_PrecompileCaller is Helper_SimpleProxy {
+    function callPrecompile(
+        address _precompile,
+        bytes memory _data
+    )
+        public
+    {
+        if (msg.sender == owner) {
+            makeExternalCall(_precompile, _data);
+        } else {
+            makeExternalCall(target, msg.data);
+        }
+    }
+
+    function getL1MessageSender(
+        address _precompile,
+        bytes memory _data
+    )
+        public
+        returns (
+            address
+        )
+    {
+        callPrecompile(_precompile, _data);
+    }
+}

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

 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.7.0;
 
+import { console } from "@nomiclabs/buidler/console.sol";
+
 contract Helper_SimpleProxy {
-    address private owner;
-    address private target;
+    address internal owner;
+    address internal target;
 
     constructor() {
         owner = msg.sender;
@@ -31,7 +33,7 @@ contract Helper_SimpleProxy {
         address _target,
         bytes memory _calldata
     )
-        private
+        internal
     {
         (bool success, bytes memory returndata) = _target.call(_calldata);
 

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

@@ -137,6 +137,7 @@ contract Helper_TestRunner {
         bytes memory _revertdata
     )
         internal
+        pure
         returns (
             uint256 _flag,
             uint256 _nuisanceGasLeft,

packages/contracts/contracts/test-libraries/rlp/TestLib_RLPReader.sol

@@ -14,7 +14,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             bytes[] memory
         )
@@ -31,7 +31,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             string memory
         )
@@ -43,7 +43,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             bytes memory
         )
@@ -55,7 +55,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             bytes32
         )
@@ -67,7 +67,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             uint256
         )
@@ -79,7 +79,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             bool
         )
@@ -91,7 +91,7 @@ contract TestLib_RLPReader {
         bytes memory _in
     )
         public
-        view
+        pure
         returns (
             address
         )

packages/contracts/contracts/test-libraries/trie/TestLib_MerkleTrie.sol

@@ -16,7 +16,7 @@ contract TestLib_MerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bool
         )
@@ -35,7 +35,7 @@ contract TestLib_MerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bool
         )
@@ -54,7 +54,7 @@ contract TestLib_MerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bytes32
         )
@@ -73,7 +73,7 @@ contract TestLib_MerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bool,
             bytes memory
@@ -91,7 +91,7 @@ contract TestLib_MerkleTrie {
         bytes memory _value
     )
         public
-        view
+        pure
         returns (
             bytes32
         )

packages/contracts/contracts/test-libraries/trie/TestLib_SecureMerkleTrie.sol

@@ -17,7 +17,7 @@ contract TestLib_SecureMerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bool
         )
@@ -36,7 +36,7 @@ contract TestLib_SecureMerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bool
         )
@@ -55,7 +55,7 @@ contract TestLib_SecureMerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bytes32
         )
@@ -74,7 +74,7 @@ contract TestLib_SecureMerkleTrie {
         bytes32 _root
     )
         public
-        view
+        pure
         returns (
             bool,
             bytes memory
@@ -92,7 +92,7 @@ contract TestLib_SecureMerkleTrie {
         bytes memory _value
     )
         public
-        view
+        pure
         returns (
             bytes32
         )

packages/contracts/contracts/test-libraries/utils/TestLib_EthUtils.sol

@@ -88,7 +88,7 @@ contract TestLib_EthUtils {
         uint256 _nonce
     )
         public
-        view
+        pure
         returns (
             address _address
         )
@@ -105,7 +105,7 @@ contract TestLib_EthUtils {
         bytes32 _salt
     )
         public
-        view
+        pure
         returns (address _address)
     {
         return Lib_EthUtils.getAddressForCREATE2(

packages/contracts/contracts/test-libraries/utils/TestLib_TimeboundRingBuffer.sol

@@ -17,9 +17,7 @@ contract TestLib_TimeboundRingBuffer {
         uint32 _startingSize,
         uint32 _maxSizeIncrementAmount,
         uint _timeout
-    )
-        public
-    {
+    ) {
         list.init(_startingSize, _maxSizeIncrementAmount, _timeout);
     }
 

packages/contracts/package.json

@@ -10,11 +10,12 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "yarn run build:contracts && yarn run build:typescript && yarn run build:copy && yarn run build:dump",
-    "build:typescript": "tsc -p .",
+    "build": "yarn run build:contracts && yarn run build:typescript && yarn run build:copy && yarn run build:dump && yarn run build:typechain",
+    "build:typescript": "tsc -p tsconfig.prod.json",
     "build:contracts": "buidler compile",
     "build:dump": "ts-node \"bin/take-dump.ts\"",
     "build:copy": "copyfiles -u 2 \"contracts/optimistic-ethereum/**/*.sol\" \"build/contracts\"",
+    "build:typechain": "buidler typechain",
     "test": "yarn run test:contracts",
     "test:contracts": "buidler test --show-stack-traces",
     "lint": "yarn run lint:typescript",
@@ -31,12 +32,14 @@
     "@nomiclabs/buidler": "^1.4.4",
     "@nomiclabs/buidler-ethers": "^2.0.0",
     "@nomiclabs/buidler-waffle": "^2.0.0",
+    "@typechain/ethers-v5": "1.0.0",
     "@types/chai": "^4.2.12",
     "@types/lodash": "^4.14.161",
     "@types/mocha": "^8.0.3",
     "@types/node": "^14.6.0",
     "assert": "^2.0.0",
     "buffer-xor": "^2.0.2",
+    "buidler-typechain": "^0.2.1",
     "chai": "^4.2.0",
     "copyfiles": "^2.3.0",
     "ethereum-waffle": "3.0.0",
@@ -50,11 +53,13 @@
     "random-bytes-seed": "^1.0.3",
     "rlp": "^2.2.6",
     "seedrandom": "^3.0.5",
+    "ts-generator": "0.0.8",
     "ts-node": "^9.0.0",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "tslint-no-focused-test": "^0.5.0",
     "tslint-plugin-prettier": "^2.3.0",
+    "typechain": "2.0.0",
     "typescript": "^4.0.2"
   }
 }

packages/contracts/src/contract-dumps.ts

@@ -6,7 +6,7 @@ import { keccak256 } from 'ethers/lib/utils'
 
 /* Internal Imports */
 import { deploy, RollupDeployConfig } from './contract-deployment'
-import { fromHexString, toHexString, remove0x } from '../test/helpers/utils'
+import { fromHexString, toHexString, remove0x } from './utils'
 import { getContractDefinition } from './contract-defs'
 
 interface StorageDump {

packages/contracts/src/utils/index.ts

+export * from './buffer-utils'
+export * from './byte-utils'

packages/contracts/test/contracts/OVM/precompiles/OVM_L1MessageSender.spec.ts

+import { expect } from '../../../setup'
+
+/* External Imports */
+import { ethers } from '@nomiclabs/buidler'
+import { ContractFactory, Contract } from 'ethers'
+import { MockContract, smockit } from '@eth-optimism/smock'
+import { NON_ZERO_ADDRESS } from '../../../helpers/constants'
+
+const callPrecompileStatic = async (
+  Helper_PrecompileCaller: Contract,
+  precompile: Contract,
+  functionName: string,
+  functionParams?: any[]
+): Promise<any> => {
+  return Helper_PrecompileCaller.callStatic[functionName](
+    precompile.address,
+    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  )
+}
+
+describe('OVM_L1MessageSender', () => {
+  let Mock__OVM_ExecutionManager: MockContract
+  before(async () => {
+    Mock__OVM_ExecutionManager = smockit(
+      await ethers.getContractFactory('OVM_ExecutionManager')
+    )
+  })
+
+  let Helper_PrecompileCaller: Contract
+  before(async () => {
+    Helper_PrecompileCaller = await (
+      await ethers.getContractFactory('Helper_PrecompileCaller')
+    ).deploy()
+
+    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+  })
+
+  let Factory__OVM_L1MessageSender: ContractFactory
+  before(async () => {
+    Factory__OVM_L1MessageSender = await ethers.getContractFactory(
+      'OVM_L1MessageSender'
+    )
+  })
+
+  let OVM_L1MessageSender: Contract
+  beforeEach(async () => {
+    OVM_L1MessageSender = await Factory__OVM_L1MessageSender.deploy()
+  })
+
+  describe('getL1MessageSender', () => {
+    before(async () => {
+      Mock__OVM_ExecutionManager.smocked.ovmL1TXORIGIN.will.return.with(
+        NON_ZERO_ADDRESS
+      )
+    })
+
+    it('should return the L1 message sender', async () => {
+      expect(
+        await callPrecompileStatic(
+          Helper_PrecompileCaller,
+          OVM_L1MessageSender,
+          'getL1MessageSender'
+        )
+      ).to.equal(NON_ZERO_ADDRESS)
+    })
+  })
+})

packages/contracts/test/contracts/OVM/precompiles/OVM_L2ToL1MessagePasser.spec.ts

+import { expect } from '../../../setup'
+
+/* External Imports */
+import { ethers } from '@nomiclabs/buidler'
+import { ContractFactory, Contract } from 'ethers'
+import { MockContract, smockit } from '@eth-optimism/smock'
+import { NON_ZERO_ADDRESS } from '../../../helpers/constants'
+
+const ELEMENT_TEST_SIZES = [1, 2, 4, 8, 16]
+
+const callPrecompile = async (
+  Helper_PrecompileCaller: Contract,
+  precompile: Contract,
+  functionName: string,
+  functionParams?: any[]
+): Promise<any> => {
+  return Helper_PrecompileCaller.callPrecompile(
+    precompile.address,
+    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  )
+}
+
+describe('OVM_L2ToL1MessagePasser', () => {
+  let Mock__OVM_ExecutionManager: MockContract
+  before(async () => {
+    Mock__OVM_ExecutionManager = smockit(
+      await ethers.getContractFactory('OVM_ExecutionManager')
+    )
+  })
+
+  let Helper_PrecompileCaller: Contract
+  before(async () => {
+    Helper_PrecompileCaller = await (
+      await ethers.getContractFactory('Helper_PrecompileCaller')
+    ).deploy()
+
+    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+  })
+
+  let Factory__OVM_L2ToL1MessagePasser: ContractFactory
+  before(async () => {
+    Factory__OVM_L2ToL1MessagePasser = await ethers.getContractFactory(
+      'OVM_L2ToL1MessagePasser'
+    )
+  })
+
+  let OVM_L2ToL1MessagePasser: Contract
+  beforeEach(async () => {
+    OVM_L2ToL1MessagePasser = await Factory__OVM_L2ToL1MessagePasser.deploy()
+  })
+
+  describe('passMessageToL1', () => {
+    before(async () => {
+      Mock__OVM_ExecutionManager.smocked.ovmCALLER.will.return.with(
+        NON_ZERO_ADDRESS
+      )
+    })
+
+    for (const size of ELEMENT_TEST_SIZES) {
+      it(`should be able to pass ${size} messages`, async () => {
+        for (let i = 0; i < size; i++) {
+          const message = '0x' + '12' + '34'.repeat(i)
+
+          await expect(
+            callPrecompile(
+              Helper_PrecompileCaller,
+              OVM_L2ToL1MessagePasser,
+              'passMessageToL1',
+              [message]
+            )
+          )
+            .to.emit(OVM_L2ToL1MessagePasser, 'L2ToL1Message')
+            .withArgs(i, NON_ZERO_ADDRESS, message)
+        }
+      })
+    }
+  })
+})

packages/contracts/test/contracts/OVM/verification/OVM_StateTransitioner.spec.ts

@@ -303,13 +303,16 @@ describe('OVM_StateTransitioner', () => {
     let ovmContractAddress = NON_ZERO_ADDRESS
     let account: any
     beforeEach(() => {
-      Mock__OVM_StateManager.smocked.hasAccount.will.return.with(false)
       account = {
         nonce: 0,
         balance: 0,
         storageRoot: NULL_BYTES32,
         codeHash: NULL_BYTES32,
+        ethAddress: ZERO_ADDRESS,
+        isFresh: false,
       }
+      Mock__OVM_StateManager.smocked.hasAccount.will.return.with(false)
+      Mock__OVM_StateManager.smocked.getAccount.will.return.with(account)
     })
 
     describe('when the account was not changed or has already been committed', () => {
@@ -319,11 +322,7 @@ describe('OVM_StateTransitioner', () => {
 
       it('should revert', async () => {
         await expect(
-          OVM_StateTransitioner.commitContractState(
-            ovmContractAddress,
-            account,
-            '0x'
-          )
+          OVM_StateTransitioner.commitContractState(ovmContractAddress, '0x')
         ).to.be.revertedWith(
           'Account was not changed or has already been committed.'
         )
@@ -365,11 +364,7 @@ describe('OVM_StateTransitioner', () => {
 
         it('should update the post state root', async () => {
           await expect(
-            OVM_StateTransitioner.commitContractState(
-              ovmContractAddress,
-              account,
-              proof
-            )
+            OVM_StateTransitioner.commitContractState(ovmContractAddress, proof)
           ).to.not.be.reverted
 
           expect(await OVM_StateTransitioner.getPostStateRoot()).to.equal(
@@ -405,6 +400,8 @@ describe('OVM_StateTransitioner', () => {
         ethAddress: ZERO_ADDRESS,
         isFresh: false,
       })
+
+      Mock__OVM_StateManager.smocked.getContractStorage.will.return.with(val)
     })
 
     describe('when the slot was not changed or was already committed', () => {
@@ -419,7 +416,6 @@ describe('OVM_StateTransitioner', () => {
           OVM_StateTransitioner.commitStorageSlot(
             ovmContractAddress,
             key,
-            val,
             '0x',
             '0x'
           )
@@ -497,7 +493,6 @@ describe('OVM_StateTransitioner', () => {
             OVM_StateTransitioner.commitStorageSlot(
               ovmContractAddress,
               key,
-              newVal,
               accountTrieProof,
               storageTrieProof
             )

packages/contracts/test/helpers/utils/index.ts

-export * from './buffer-utils'
-export * from './byte-utils'
+export * from '../../../src/utils'
 export * from './eth-time'

packages/contracts/tsconfig.json

@@ -20,11 +20,13 @@
       "node_modules/@types"
     ]
   },
-  "include": ["src/**/*.ts", "artifacts/*.json"],
-  "files": [
+  "include": [
+    "src/**/*.ts",
+    "artifacts/*.json",
     "./buidler.config.ts",
     "./buidler-env.d.ts",
     "./node_modules/@nomiclabs/buidler-ethers/src/type-extensions.d.ts",
-    "./node_modules/@nomiclabs/buidler-waffle/src/type-extensions.d.ts"
+    "./node_modules/@nomiclabs/buidler-waffle/src/type-extensions.d.ts",
+    "./node_modules/buidler-typechain/src/type-extensions.d.ts"
   ]
 }
\ No newline at end of file

packages/contracts/tsconfig.prod.json

+{
+  "extends": "./tsconfig",
+  "exclude": [
+    "./buidler.config.ts",
+    "./buidler-env.d.ts",
+    "./node_modules/@nomiclabs/buidler-ethers/src/type-extensions.d.ts",
+    "./node_modules/@nomiclabs/buidler-waffle/src/type-extensions.d.ts",
+    "./node_modules/buidler-typechain/src/type-extensions.d.ts"
+  ]
+}