Merge pull request ethereum-optimism#5541 from ethereum-optimism/refa…

…ctor/rm-redundant-ierc165

packages/contracts-bedrock/.gas-snapshot

@@ -136,12 +136,12 @@ L2ERC721Bridge_Test:test_bridgeERC721_remoteTokenZeroAddress_reverts() (gas: 196
 L2ERC721Bridge_Test:test_bridgeERC721_succeeds() (gas: 144958)
 L2ERC721Bridge_Test:test_bridgeERC721_wrongOwner_reverts() (gas: 29258)
 L2ERC721Bridge_Test:test_constructor_succeeds() (gas: 10110)
-L2ERC721Bridge_Test:test_finalizeBridgeERC721_alreadyExists_reverts() (gas: 29128)
+L2ERC721Bridge_Test:test_finalizeBridgeERC721_alreadyExists_reverts() (gas: 29218)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_interfaceNotCompliant_reverts() (gas: 236327)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (gas: 19874)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_notViaLocalMessenger_reverts() (gas: 16104)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_selfToken_reverts() (gas: 17659)
-L2ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 169285)
+L2ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 169375)
 L2OutputOracleTest:test_computeL2Timestamp_succeeds() (gas: 37298)
 L2OutputOracleTest:test_constructor_badTimestamp_reverts() (gas: 70991)
 L2OutputOracleTest:test_constructor_l2BlockTimeZero_reverts() (gas: 45954)
@@ -244,14 +244,15 @@ OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63566)
 OptimismMintableERC20_Test:test_remoteToken_succeeds() (gas: 7689)
 OptimismMintableERC20_Test:test_semver_succeeds() (gas: 8812)
 OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 8285)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2336687)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2321842)
 OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418)
 OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136966)
 OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118832)
-OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 28279)
-OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11098)
+OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 29003)
+OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11143)
 OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140524)
-OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163442)
+OptimismMintableERC721_Test:test_supportsInterfaces_succeeds() (gas: 9027)
+OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163441)
 OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2523203)

packages/contracts-bedrock/contracts/test/OptimismMintableERC721.t.sol

@@ -1,11 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import { ERC721, IERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import {
+    IERC721Enumerable
+} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { ERC721Bridge_Initializer } from "./CommonTest.t.sol";
-import { OptimismMintableERC721 } from "../universal/OptimismMintableERC721.sol";
+import {
+    OptimismMintableERC721,
+    IOptimismMintableERC721
+} from "../universal/OptimismMintableERC721.sol";
 
 contract OptimismMintableERC721_Test is ERC721Bridge_Initializer {
     ERC721 internal L1Token;
@@ -44,7 +50,21 @@ contract OptimismMintableERC721_Test is ERC721Bridge_Initializer {
         assertEq(L2Token.REMOTE_TOKEN(), address(L1Token));
         assertEq(L2Token.BRIDGE(), address(L2Bridge));
         assertEq(L2Token.REMOTE_CHAIN_ID(), 1);
-        assertEq(L2Token.version(), "1.0.0");
+        assertEq(L2Token.version(), "1.1.0");
+    }
+
+    /**
+     * @notice Ensure that the contract supports the expected interfaces.
+     */
+    function test_supportsInterfaces_succeeds() external {
+        // Checks if the contract supports the IOptimismMintableERC721 interface.
+        assertTrue(L2Token.supportsInterface(type(IOptimismMintableERC721).interfaceId));
+        // Checks if the contract supports the IERC721Enumerable interface.
+        assertTrue(L2Token.supportsInterface(type(IERC721Enumerable).interfaceId));
+        // Checks if the contract supports the IERC721 interface.
+        assertTrue(L2Token.supportsInterface(type(IERC721).interfaceId));
+        // Checks if the contract supports the IERC165 interface.
+        assertTrue(L2Token.supportsInterface(type(IERC165).interfaceId));
     }
 
     function test_safeMint_succeeds() external {

packages/contracts-bedrock/contracts/universal/OptimismMintableERC721.sol

@@ -46,7 +46,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
     }
 
     /**
-     * @custom:semver 1.0.0
+     * @custom:semver 1.1.0
      *
      * @param _bridge        Address of the bridge on this network.
      * @param _remoteChainId Chain ID where the remote token is deployed.
@@ -60,7 +60,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
         address _remoteToken,
         string memory _name,
         string memory _symbol
-    ) ERC721(_name, _symbol) Semver(1, 0, 0) {
+    ) ERC721(_name, _symbol) Semver(1, 1, 0) {
         require(_bridge != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
         require(_remoteChainId != 0, "OptimismMintableERC721: remote chain id cannot be zero");
         require(
@@ -137,12 +137,8 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
         override(ERC721Enumerable, IERC165)
         returns (bool)
     {
-        bytes4 iface1 = type(IERC165).interfaceId;
-        bytes4 iface2 = type(IOptimismMintableERC721).interfaceId;
-        return
-            _interfaceId == iface1 ||
-            _interfaceId == iface2 ||
-            super.supportsInterface(_interfaceId);
+        bytes4 iface = type(IOptimismMintableERC721).interfaceId;
+        return _interfaceId == iface || super.supportsInterface(_interfaceId);
     }
 
     /**

packages/contracts-bedrock/contracts/universal/OptimismMintableERC721Factory.sol

@@ -38,15 +38,15 @@ contract OptimismMintableERC721Factory is Semver {
     );
 
     /**
-     * @custom:semver 1.1.0
+     * @custom:semver 1.2.0
      * @notice The semver MUST be bumped any time that there is a change in
      *         the OptimismMintableERC721 token contract since this contract
      *         is responsible for deploying OptimismMintableERC721 contracts.
      *
      * @param _bridge Address of the ERC721 bridge on this network.
      * @param _remoteChainId Chain ID for the remote network.
      */
-    constructor(address _bridge, uint256 _remoteChainId) Semver(1, 1, 0) {
+    constructor(address _bridge, uint256 _remoteChainId) Semver(1, 2, 0) {
         BRIDGE = _bridge;
         REMOTE_CHAIN_ID = _remoteChainId;
     }

packages/contracts-bedrock/tasks/check-l2.ts

@@ -557,7 +557,7 @@ const check = {
     await assertSemver(
       OptimismMintableERC721Factory,
       'OptimismMintableERC721Factory',
-      '1.1.0'
+      '1.2.0'
     )
 
     const BRIDGE = await OptimismMintableERC721Factory.BRIDGE()