misc fixes

Author: smartcontracts

mise.toml

@@ -31,9 +31,9 @@ just = "1.37.0"
 # Foundry dependencies
 # Foundry is a special case because it supplies multiple binaries at the same
 # GitHub release, so we need to use the aliasing trick to get mise to not error
-forge = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
-cast = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
-anvil = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
+forge = "nightly-017c59d6806ce11f1dc131f8607178efad79d84a"
+cast = "nightly-017c59d6806ce11f1dc131f8607178efad79d84a"
+anvil = "nightly-017c59d6806ce11f1dc131f8607178efad79d84a"
 
 # Fake dependencies
 # Put things here if you need to track versions of tools or projects that can't

packages/contracts-bedrock/foundry.toml

@@ -11,7 +11,15 @@ build_info_path = 'artifacts/build-info'
 snapshots = 'notarealpath' # workaround for foundry#9477
 
 optimizer = true
-optimizer_runs = 5000
+optimizer_runs = 999999
+
+additional_compiler_profiles = [
+  { name = "dispute", optimizer_runs = 5000 },
+]
+compilation_restrictions = [
+  { paths = "src/dispute/FaultDisputeGame.sol", optimizer_runs = 5000 },
+  { paths = "src/dispute/PermissionedDisputeGame.sol", optimizer_runs = 5000 },
+]
 
 extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
 bytecode_hash = 'none'

packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol

@@ -75,7 +75,7 @@ interface IFaultDisputeGame is IDisputeGame {
     error UnexpectedString();
     error ValidStep();
     error InvalidBondDistributionMode();
-    error GameNotFinalized(string reason);
+    error GameNotFinalized();
     error GameNotResolved();
     error ReservedGameType();
 

packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol

@@ -64,7 +64,7 @@ interface IPermissionedDisputeGame is IDisputeGame {
     error UnexpectedString();
     error ValidStep();
     error InvalidBondDistributionMode();
-    error GameNotFinalized(string reason);
+    error GameNotFinalized();
     error GameNotResolved();
     error ReservedGameType();
 

packages/contracts-bedrock/snapshots/abi/AnchorStateRegistry.json

@@ -164,11 +164,6 @@
         "internalType": "bool",
         "name": "",
         "type": "bool"
-      },
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
       }
     ],
     "stateMutability": "view",
@@ -188,11 +183,6 @@
         "internalType": "bool",
         "name": "",
         "type": "bool"
-      },
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
       }
     ],
     "stateMutability": "view",
@@ -397,11 +387,6 @@
     "name": "Initialized",
     "type": "event"
   },
-  {
-    "inputs": [],
-    "name": "AnchorStateRegistry_ImproperAnchorGame",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "AnchorStateRegistry_InvalidAnchorGame",
@@ -412,4 +397,4 @@
     "name": "AnchorStateRegistry_Unauthorized",
     "type": "error"
   }
-]
+]

packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json

@@ -1045,13 +1045,7 @@
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "reason",
-        "type": "string"
-      }
-    ],
+    "inputs": [],
     "name": "GameNotFinalized",
     "type": "error"
   },

packages/contracts-bedrock/snapshots/abi/PermissionedDisputeGame.json

@@ -1086,13 +1086,7 @@
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "reason",
-        "type": "string"
-      }
-    ],
+    "inputs": [],
     "name": "GameNotFinalized",
     "type": "error"
   },

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

@@ -20,12 +20,12 @@
     "sourceCodeHash": "0x2d21506cc51ebe0b60bcf89883aff5e9b1269567ce44ee779de3d3940e23fb65"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0x52ddbe70f60a6f4e5c929fed417c92d99d82a85c05de8e1f0c8dfd0d634ad648",
-    "sourceCodeHash": "0xc4a66e8adacd58b961938f473b22614a520fa0bdae70381b8f56210bc34f1f32"
+    "initCodeHash": "0x32eceffc74182357cb79f7218851e02a76200b1e57db7629c2b97b9401d71a25",
+    "sourceCodeHash": "0x95f68f577529c158070e3a23fd2da1c63581113471e1303716e387a07f3070d9"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x6b05d7130c019d3c46dca39dfdae3797861088a9fb7b5baa84fd4e5cb87c5883",
-    "sourceCodeHash": "0xae2fbe02c0f8685692babeed0252ae8a624dc6d3bfb082fc3807d7b84869004b"
+    "initCodeHash": "0x271c17198970e361cb43aff3ae788d4f726d8d1a188eeea7d0a5f0c477380a76",
+    "sourceCodeHash": "0xbb6acc3e88af9594ffcb8a2f30860511b76e09024330e70052316668fe55fd1f"
   },
   "src/L1/ProtocolVersions.sol": {
     "initCodeHash": "0x0000ec89712d8b4609873f1ba76afffd4205bf9110818995c90134dbec12e91e",
@@ -152,8 +152,8 @@
     "sourceCodeHash": "0xb7b0a06cd971c4647247dc19ce997d0c64a73e87c81d30731da9cf9efa1b952a"
   },
   "src/dispute/AnchorStateRegistry.sol": {
-    "initCodeHash": "0x6e94c2f4129209d2b36d6a54adaaf99b91b3df322c8c75043d29f6b0a9143738",
-    "sourceCodeHash": "0xb81181263522e939195a70b6e281fb038de2312c9682f9123723c6ae1babf559"
+    "initCodeHash": "0x751e32c8d44c5ef9b1acae2d94e07f6e91f7f59663c24e12d21298638458b272",
+    "sourceCodeHash": "0xb09dccd5bf662c42ab10afd19a2b51114df9fd3bc6e20d4d86e4ba7529036bbc"
   },
   "src/dispute/DelayedWETH.sol": {
     "initCodeHash": "0xb1f04c9ee86984a157b92a18754c84104e9d4df7a3838633301ca7f557d0220a",
@@ -164,8 +164,8 @@
     "sourceCodeHash": "0x155c0334f63616ed245aadf9a94f419ef7d5e2237b3b32172484fd19890a61dc"
   },
   "src/dispute/FaultDisputeGame.sol": {
-    "initCodeHash": "0x734c4bce3822851f8925d3a8668630e4c503ee5a042e1234e448f4e9ea86582c",
-    "sourceCodeHash": "0x8888b471b484c3f0662dca39317aa75fbb380deea4e12f6a8ccd5dde1202e5c7"
+    "initCodeHash": "0xd59ffa7f487db9b0761b1fa3994c59e0d78e4546c76379a14a31dec1080b3f20",
+    "sourceCodeHash": "0xd59fd93e7332bad50714ec1abe06cebd6378d32cc4ad18434f09156ac3c97982"
   },
   "src/legacy/DeployerWhitelist.sol": {
     "initCodeHash": "0x53099379ed48b87f027d55712dbdd1da7d7099925426eb0531da9c0012e02c29",
@@ -219,4 +219,4 @@
     "initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
     "sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
   }
-}
+}

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

@@ -338,48 +338,6 @@ contract AnchorStateRegistry_SetAnchorState_TestFail is AnchorStateRegistry_Init
         assertEq(updatedL2BlockNumber, l2BlockNumber);
         assertEq(updatedRoot.raw(), root.raw());
     }
-}
-
-contract AnchorStateRegistry_SetAnchorState_TestFail is AnchorStateRegistry_Init {
-    /// @notice Tests that setAnchorState will revert if the sender is not the guardian.
-    /// @param _sender The address of the sender.
-    /// @param _l2BlockNumber The L2 block number to use for the game.
-    function testFuzz_setAnchorState_notGuardian_fails(address _sender, uint256 _l2BlockNumber) public {
-        // Grab block number of the existing anchor root.
-        (Hash root, uint256 l2BlockNumber) = anchorStateRegistry.getAnchorRoot();
-
-        // Mock the l2BlockNumber call.
-        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.l2BlockNumber, ()), abi.encode(_l2BlockNumber));
-
-        // Mock the DEFENDER_WINS state.
-        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.DEFENDER_WINS));
-
-        // Make our game type the respected game type.
-        vm.mockCall(
-            address(optimismPortal2),
-            abi.encodeCall(optimismPortal2.respectedGameType, ()),
-            abi.encode(gameProxy.gameType())
-        );
-
-        // Mock the DisputeGameFactory to make it seem that the game was not registered.
-        vm.mockCall(
-            address(disputeGameFactory),
-            abi.encodeCall(
-                disputeGameFactory.games, (gameProxy.gameType(), gameProxy.rootClaim(), gameProxy.extraData())
-            ),
-            abi.encode(address(0), 0)
-        );
-
-        // Try to update the anchor state.
-        vm.prank(_sender);
-        vm.expectRevert(IAnchorStateRegistry.AnchorStateRegistry_Unauthorized.selector);
-        anchorStateRegistry.setAnchorState(gameProxy);
-
-        // Confirm that the anchor state has not updated.
-        (Hash updatedRoot, uint256 updatedL2BlockNumber) = anchorStateRegistry.anchors(gameProxy.gameType());
-        assertEq(updatedL2BlockNumber, l2BlockNumber);
-        assertEq(updatedRoot.raw(), root.raw());
-    }
 
     /// @notice Tests that setAnchorState will revert if the game is not registered.
     /// @param _l2BlockNumber The L2 block number to use for the game.