various logical tweaks

Author: smartcontracts

packages/contracts-bedrock/snapshots/semver-lock.json

@@ -20,11 +20,11 @@
     "sourceCodeHash": "0x2d21506cc51ebe0b60bcf89883aff5e9b1269567ce44ee779de3d3940e23fb65"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0x94c880ae1974be774ec956ed2d9f8d71c19ba500d47abe28856ea8a019dc9c3f",
-    "sourceCodeHash": "0x99ab9155cd18ee2bbab440431923f944a89535670546bfaa01e637eadb0342b8"
+    "initCodeHash": "0xb906cca6c1d2ef7d783f94d502bbf8704f39488bcbe4b1633f21d5a25f39d750",
+    "sourceCodeHash": "0x2fa2648a82059eb6fc052254678d3bd2bf7952be83ab53c545c9302df3b9d1a0"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x529e192525bc0f28b4402439af1defcf5407016b44a3eda2da5a6260b31779e2",
+    "initCodeHash": "0x92e46899517ecb927a6fea35995ebf6cc534443351d1f5806a7d34c5696c0648",
     "sourceCodeHash": "0xc04a7f9c14a13ec3587f5cc351c8e9f27fbbe9f1291a1aba07de29edbeef418a"
   },
   "src/L1/ProtocolVersions.sol": {
@@ -152,8 +152,8 @@
     "sourceCodeHash": "0xb7b0a06cd971c4647247dc19ce997d0c64a73e87c81d30731da9cf9efa1b952a"
   },
   "src/dispute/AnchorStateRegistry.sol": {
-    "initCodeHash": "0x8d04e8c4185388170beabec3de6380628d5f41869e96655322685e33c3541dd9",
-    "sourceCodeHash": "0x27100c19acf49ffa999baf8f5e5dd1e8f8455e65a51c27d2e949220d0a07ac3b"
+    "initCodeHash": "0xf7b9422d4c0b175aed8fad9ac4e03054625a667cff837a9a13612ec3bb2ee936",
+    "sourceCodeHash": "0xe355003779215d2c9d8c55e84c3e8b984a2c284da6b222de0874722bc71fe598"
   },
   "src/dispute/DelayedWETH.sol": {
     "initCodeHash": "0xb1f04c9ee86984a157b92a18754c84104e9d4df7a3838633301ca7f557d0220a",

packages/contracts-bedrock/src/L1/OptimismPortal2.sol

@@ -308,6 +308,18 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
         // The game type of the dispute game must be the respected game type.
         if (gameType.raw() != respectedGameType.raw()) revert InvalidGameType();
 
+        // The game type of the DisputeGame must have been the respected game type at creation.
+        if (!gameProxy.wasRespectedGameTypeWhenCreated()) revert InvalidGameType();
+
+        // Creation time must be greater than or equal to the respected game type updated time.
+        // Games created before this timestamp are not valid and cannot be used to finalize a
+        // withdrawal, so for user convenience we also prevent them from being used to prove a
+        // withdrawal.
+        require(
+            gameProxy.createdAt().raw() >= respectedGameTypeUpdatedAt,
+            "OptimismPortal: dispute game created before respected game type was updated"
+        );
+
         // Verify that the output root can be generated with the elements in the proof.
         if (outputRoot.raw() != Hashing.hashOutputRootProof(_outputRootProof)) revert InvalidProof();
 

packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol

@@ -172,13 +172,12 @@ contract AnchorStateRegistry is Initializable, ISemver {
     ///         invalidation conditions. The root claim of a proper game IS NOT guaranteed to be
     ///         valid. The root claim of a proper game CAN BE incorrect and still be a proper game.
     ///         DO NOT USE THIS FUNCTION ALONE TO DETERMINE IF A ROOT CLAIM IS VALID.
-    /// @dev Note that it is possible for games to be created when their game type is not the
-    ///      respected game type. We do not consider these games to be Proper Games. isGameProper()
-    ///      can currently guarantee this because the OptimismPortal contract will always set the
-    ///      retirement timestamp whenever the respected game type is updated such that any games
-    ///      created before any update of the respected game type are automatically retired. If
-    ///      this coupling is broken, then we must instead check that the game type *was* the
-    ///      respected game type at the time of the game's creation.
+    /// @dev Note that isGameProper previously checked that the game type was equal to the
+    ///      respected game type. However, it should be noted that it is possible for a game other
+    ///      than the respected game type to resolve without being invalidated. Since isGameProper
+    ///      exists to determine if a game has (or has not) been invalidated, we now allow any game
+    ///      type to be considered a proper game. We enforce checks on the game type in
+    ///      isGameClaimValid().
     /// @param _game The game to check.
     /// @return Whether the game is a proper game.
     function isGameProper(IDisputeGame _game) public view returns (bool) {
@@ -187,11 +186,6 @@ contract AnchorStateRegistry is Initializable, ISemver {
             return false;
         }
 
-        // Must be respected game type.
-        if (!isGameRespected(_game)) {
-            return false;
-        }
-
         // Must not be blacklisted.
         if (isGameBlacklisted(_game)) {
             return false;
@@ -232,6 +226,12 @@ contract AnchorStateRegistry is Initializable, ISemver {
             return false;
         }
 
+        // Must be respected.
+        bool respected = isGameRespected(_game);
+        if (!respected) {
+            return false;
+        }
+
         // Game must be finalized.
         bool finalized = isGameFinalized(_game);
         if (!finalized) {

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol

@@ -236,9 +236,7 @@ contract AnchorStateRegistry_IsGameRetired_Test is AnchorStateRegistry_Init {
 contract AnchorStateRegistry_IsGameProper_Test is AnchorStateRegistry_Init {
     /// @notice Tests that isGameProper will return true if the game meets all conditions.
     function test_isGameProper_meetsAllConditions_succeeds() public {
-        // Mock that the game was respected.
-        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.wasRespectedGameTypeWhenCreated, ()), abi.encode(true));
-
+        // Game will meet all conditions by default.
         assertTrue(anchorStateRegistry.isGameProper(gameProxy));
     }
 
@@ -258,7 +256,7 @@ contract AnchorStateRegistry_IsGameProper_Test is AnchorStateRegistry_Init {
 
     /// @notice Tests that isGameProper will return false if the game is not the respected game type.
     /// @param _gameType The game type to use for the test.
-    function testFuzz_isGameProper_isNotRespected_succeeds(GameType _gameType) public {
+    function testFuzz_isGameProper_anyGameType_succeeds(GameType _gameType) public {
         if (_gameType.raw() == gameProxy.gameType().raw()) {
             _gameType = GameType.wrap(_gameType.raw() + 1);
         }
@@ -268,7 +266,8 @@ contract AnchorStateRegistry_IsGameProper_Test is AnchorStateRegistry_Init {
             address(gameProxy), abi.encodeCall(gameProxy.wasRespectedGameTypeWhenCreated, ()), abi.encode(false)
         );
 
-        assertFalse(anchorStateRegistry.isGameProper(gameProxy));
+        // Still a proper game.
+        assertTrue(anchorStateRegistry.isGameProper(gameProxy));
     }
 
     /// @notice Tests that isGameProper will return false if the game is blacklisted.