Version Optimism bridge contracts

Author: krebernisak

contracts/v0.7/bridge/optimism/OVM_EOACodeHashSet.sol

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >0.6.0 <0.8.0;
 
+/* Interface Imports */
+import { ITypeAndVersion } from "../../../v0.6/ITypeAndVersion.sol";
+
 /* Library Imports */
 import { EnumerableSet } from "../../../../vendor/OpenZeppelin/openzeppelin-contracts/contracts/utils/EnumerableSet.sol";
 
@@ -19,7 +22,7 @@ import { OwnableUpgradeable } from "../../../../vendor/OpenZeppelin/openzeppelin
  * As the OVM_ProxyEOA.sol contract source could potentially change in the future (i.e., due to a fork),
  * here we actually track a set of possible EOA proxy contracts.
  */
-abstract contract OVM_EOACodeHashSet is /* Initializable, */ OwnableUpgradeable {
+abstract contract OVM_EOACodeHashSet is ITypeAndVersion, /* Initializable, */ OwnableUpgradeable {
   // Add the EnumerableSet library
   using EnumerableSet for EnumerableSet.Bytes32Set;
 
@@ -34,13 +37,30 @@ abstract contract OVM_EOACodeHashSet is /* Initializable, */ OwnableUpgradeable
   // Optimism v0.3.0-rc
   bytes32 constant OVM_EOA_CODE_HASH_V4 = 0xef2ab076db773ffc554c9f287134123439a5228e92f5b3194a28fec0a0afafe3;
 
+  /**
+   * @notice versions:
+   *
+   * - OVM_EOACodeHashSet 0.0.1: initial release
+   *
+   * @inheritdoc ITypeAndVersion
+   */
+  function typeAndVersion()
+    external
+    pure
+    override
+    virtual
+    returns (string memory)
+  {
+    return "OVM_EOACodeHashSet 0.0.1";
+  }
+
   function __OVM_EOACodeHashSet_init()
     internal
     initializer()
   {
-      __Context_init_unchained();
-      __Ownable_init_unchained();
-      __OVM_EOACodeHashSet_init_unchained();
+    __Context_init_unchained();
+    __Ownable_init_unchained();
+    __OVM_EOACodeHashSet_init_unchained();
   }
 
   /// @notice Adds genesis OVM_ProxyEOA.sol EXTCODEHASH to the default set.

contracts/v0.7/bridge/optimism/OVM_L1ERC20Gateway.sol

@@ -4,6 +4,7 @@ pragma solidity >0.6.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Interface Imports */
+import { ITypeAndVersion } from "../../../v0.6/ITypeAndVersion.sol";
 import { IERC20 } from "../../../../vendor/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import { IERC677Receiver } from "../../../v0.6/token/IERC677Receiver.sol";
 
@@ -28,7 +29,7 @@ import { Abs_L1TokenGateway } from "../../../../vendor/ethereum-optimism/optimis
  * Compiler used: solc
  * Runtime target: EVM
  */
-contract OVM_L1ERC20Gateway is IERC677Receiver, Initializable, Abs_L1TokenGateway {
+contract OVM_L1ERC20Gateway is ITypeAndVersion, IERC677Receiver, Initializable, Abs_L1TokenGateway {
   // L1 token we are bridging to L2
   IERC20 public s_l1ERC20;
 
@@ -41,6 +42,23 @@ contract OVM_L1ERC20Gateway is IERC677Receiver, Initializable, Abs_L1TokenGatewa
     public
   {}
 
+  /**
+   * @notice versions:
+   *
+   * - OVM_L1ERC20Gateway 0.0.1: initial release
+   *
+   * @inheritdoc ITypeAndVersion
+   */
+  function typeAndVersion()
+    external
+    pure
+    override
+    virtual
+    returns (string memory)
+  {
+    return "OVM_L1ERC20Gateway 0.0.1";
+  }
+
   /**
    * @param l2ERC20Gateway L2 Gateway address on the chain being deposited into
    * @param l1Messenger Cross-domain messenger used by this contract.

contracts/v0.7/bridge/optimism/OVM_L2ERC20Gateway.sol

@@ -3,6 +3,7 @@ pragma solidity >0.6.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Interface Imports */
+import { ITypeAndVersion } from "../../../v0.6/ITypeAndVersion.sol";
 import { IERC20Child } from "../token/IERC20Child.sol";
 import { IERC677Receiver } from "../../../v0.6/token/IERC677Receiver.sol";
 
@@ -24,7 +25,7 @@ import { OVM_EOACodeHashSet } from "./OVM_EOACodeHashSet.sol";
  * Compiler used: optimistic-solc
  * Runtime target: OVM
  */
-contract OVM_L2ERC20Gateway is IERC677Receiver, /* Initializable, */ OVM_EOACodeHashSet, Abs_L2DepositedToken {
+contract OVM_L2ERC20Gateway is ITypeAndVersion, IERC677Receiver, /* Initializable, */ OVM_EOACodeHashSet, Abs_L2DepositedToken {
   // Bridged L2 token
   IERC20Child public s_l2ERC20;
 
@@ -36,6 +37,23 @@ contract OVM_L2ERC20Gateway is IERC677Receiver, /* Initializable, */ OVM_EOACode
     public
   {}
 
+  /**
+   * @notice versions:
+   *
+   * - OVM_L2ERC20Gateway 0.0.1: initial release
+   *
+   * @inheritdoc ITypeAndVersion
+   */
+  function typeAndVersion()
+    external
+    pure
+    override(ITypeAndVersion, OVM_EOACodeHashSet)
+    virtual
+    returns (string memory)
+  {
+    return "OVM_L2ERC20Gateway 0.0.1";
+  }
+
   /**
    * @param l1ERC20Gateway L1 Gateway address on the chain being withdrawn into
    * @param l2Messenger Cross-domain messenger used by this contract.