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);