Merge pull request #7351 from ethereum-optimism/ctb/dispute-isemver

contracts-bedrock: migrate dispute package to ISemver

packages/contracts-bedrock/.gas-snapshot

@@ -103,10 +103,10 @@ FaultDisputeGame_ResolvesCorrectly_IncorrectRoot4:test_resolvesCorrectly_succeed
 FaultDisputeGame_ResolvesCorrectly_IncorrectRoot5:test_resolvesCorrectly_succeeds() (gas: 656332)
 FaultDisputeGame_Test:test_addLocalData_static_succeeds() (gas: 640567)
 FaultDisputeGame_Test:test_createdAt_succeeds() (gas: 10342)
-FaultDisputeGame_Test:test_extraData_succeeds() (gas: 32355)
-FaultDisputeGame_Test:test_gameData_succeeds() (gas: 32782)
+FaultDisputeGame_Test:test_extraData_succeeds() (gas: 32328)
+FaultDisputeGame_Test:test_gameData_succeeds() (gas: 32755)
 FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8265)
-FaultDisputeGame_Test:test_initialize_correctData_succeeds() (gas: 57739)
+FaultDisputeGame_Test:test_initialize_correctData_succeeds() (gas: 57712)
 FaultDisputeGame_Test:test_initialize_firstOutput_reverts() (gas: 210563)
 FaultDisputeGame_Test:test_initialize_l1HeadTooOld_reverts() (gas: 228368)
 FaultDisputeGame_Test:test_move_clockCorrectness_succeeds() (gas: 594268)

packages/contracts-bedrock/scripts/SemverLock.s.sol

@@ -2,6 +2,7 @@
 pragma solidity 0.8.15;
 
 import { Script } from "forge-std/Script.sol";
+import { stdJson } from "forge-std/StdJson.sol";
 import { console2 as console } from "forge-std/console2.sol";
 
 contract SemverLock is Script {
@@ -34,14 +35,23 @@ contract SemverLock is Script {
             commands[2] = string.concat("echo \"", _files[i], "\"| sed -E \'s|src/.*/(.+)\\.sol|\\1|\'");
             string memory contractName = string(vm.ffi(commands));
 
-            commands[0] = "bash";
-            commands[1] = "-c";
             commands[2] = "forge config --json | jq -r .out";
             string memory artifactsDir = string(vm.ffi(commands));
 
+            // Handle the case where there are multiple artifacts for a contract. This happens
+            // when the same contract is compiled with multiple compiler versions.
+            string memory contractArtifactDir = string.concat(artifactsDir, "/", contractName, ".sol");
+            commands[2] = string.concat(
+                "ls -1 --color=never ", contractArtifactDir, " | jq -R -s -c 'split(\"\n\") | map(select(length > 0))'"
+            );
+            string memory artifactFiles = string(vm.ffi(commands));
+
+            string[] memory files = stdJson.readStringArray(artifactFiles, "");
+            require(files.length > 0, string.concat("No artifacts found for ", contractName));
+            string memory fileName = files[0];
+
             // Parse the artifact to get the contract's initcode hash.
-            bytes memory initCode =
-                vm.getCode(string.concat(artifactsDir, "/", contractName, ".sol/", contractName, ".json"));
+            bytes memory initCode = vm.getCode(string.concat(artifactsDir, "/", contractName, ".sol/", fileName));
 
             // Serialize the source hash in JSON.
             string memory j = vm.serializeBytes32(out, _files[i], keccak256(abi.encodePacked(fileContents, initCode)));

packages/contracts-bedrock/semver-lock.json

@@ -18,7 +18,8 @@
   "src/L2/L2StandardBridge.sol": "0xfe01bcb1ddc947b9b8a7093d0971854b9fa8d49da5bd933a3dd106167907f882",
   "src/L2/L2ToL1MessagePasser.sol": "0xafc710b4d320ef450586d96a61cbd58cac814cb3b0c4fdc280eace3efdcdf321",
   "src/L2/SequencerFeeVault.sol": "0xc2f733c1128d06ad60bf1e1d98c8f684a4825b11875ccdf2376ede33f5aad4e6",
-  "src/dispute/FaultDisputeGame.sol": "0x76e7c16431faa32e2074e6abdfe3e86f5ec90b4ac8a6b662edba8c3ce791ad80",
+  "src/dispute/DisputeGameFactory.sol": "0xfdfa141408d7f8de7e230ff4bef088e30d0e4d569ca743d60d292abdd21ff270",
+  "src/dispute/FaultDisputeGame.sol": "0xfdf4be4d6ed4bcbf6492c43fdbfd04d0c62ebee11b8fe9ee2e7757bde8f7383d",
   "src/legacy/DeployerWhitelist.sol": "0xf2129ec3da75307ba8e21bc943c332bb04704642e6e263149b5c8ee92dbcb7a8",
   "src/legacy/L1BlockNumber.sol": "0x30aae1fc85103476af0226b6e98c71c01feebbdc35d93401390b1ad438a37be6",
   "src/legacy/LegacyMessagePasser.sol": "0x5c08b0a663cc49d30e4e38540f6aefab19ef287c3ecd31c8d8c3decd5f5bd497",

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

@@ -3,10 +3,10 @@ pragma solidity ^0.8.15;
 
 import { ClonesWithImmutableArgs } from "@cwia/ClonesWithImmutableArgs.sol";
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import { Semver } from "src/universal/Semver.sol";
+import { ISemver } from "src/universal/ISemver.sol";
 
-import { IDisputeGame } from "./interfaces/IDisputeGame.sol";
-import { IDisputeGameFactory } from "./interfaces/IDisputeGameFactory.sol";
+import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 
 import { LibGameId } from "src/dispute/lib/LibGameId.sol";
 
@@ -19,7 +19,7 @@ import "src/libraries/DisputeErrors.sol";
 ///         time of the dispute game is packed tightly into the storage slot with the address of
 ///         the dispute game. This is to make offchain discoverability of playable dispute games
 ///         easier.
-contract DisputeGameFactory is OwnableUpgradeable, IDisputeGameFactory, Semver {
+contract DisputeGameFactory is OwnableUpgradeable, IDisputeGameFactory, ISemver {
     /// @dev Allows for the creation of clone proxies with immutable arguments.
     using ClonesWithImmutableArgs for address;
 
@@ -36,8 +36,12 @@ contract DisputeGameFactory is OwnableUpgradeable, IDisputeGameFactory, Semver {
     ///      track dispute games
     GameId[] internal _disputeGameList;
 
+    /// @notice Semantic version.
+    /// @custom:semver 0.0.6
+    string public constant version = "0.0.6";
+
     /// @notice constructs a new DisputeGameFactory contract.
-    constructor() OwnableUpgradeable() Semver(0, 0, 5) {
+    constructor() OwnableUpgradeable() {
         initialize(address(0));
     }
 

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

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { IDisputeGame } from "./interfaces/IDisputeGame.sol";
-import { IFaultDisputeGame } from "./interfaces/IFaultDisputeGame.sol";
-import { IInitializable } from "./interfaces/IInitializable.sol";
-import { IBondManager } from "./interfaces/IBondManager.sol";
-import { IBigStepper, IPreimageOracle } from "./interfaces/IBigStepper.sol";
+import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IInitializable } from "src/dispute/interfaces/IInitializable.sol";
+import { IBondManager } from "src/dispute/interfaces/IBondManager.sol";
+import { IBigStepper, IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
 import { L2OutputOracle } from "src/L1/L2OutputOracle.sol";
-import { BlockOracle } from "./BlockOracle.sol";
+import { BlockOracle } from "src/dispute/BlockOracle.sol";
 
 import { Clone } from "src/libraries/Clone.sol";
 import { Types } from "src/libraries/Types.sol";
-import { Semver } from "src/universal/Semver.sol";
-import { LibHashing } from "./lib/LibHashing.sol";
-import { LibPosition } from "./lib/LibPosition.sol";
-import { LibClock } from "./lib/LibClock.sol";
+import { ISemver } from "src/universal/ISemver.sol";
+import { LibHashing } from "src/dispute/lib/LibHashing.sol";
+import { LibPosition } from "src/dispute/lib/LibPosition.sol";
+import { LibClock } from "src/dispute/lib/LibClock.sol";
 
 import "src/libraries/DisputeTypes.sol";
 import "src/libraries/DisputeErrors.sol";
 
 /// @title FaultDisputeGame
 /// @notice An implementation of the `IFaultDisputeGame` interface.
-contract FaultDisputeGame is IFaultDisputeGame, Clone, Semver {
+contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
     ////////////////////////////////////////////////////////////////
     //                         State Vars                         //
     ////////////////////////////////////////////////////////////////
@@ -81,6 +81,10 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, Semver {
     /// @notice Indicates whether the subgame rooted at the root claim has been resolved.
     bool internal subgameAtRootResolved;
 
+    /// @notice Semantic version.
+    /// @custom:semver 0.0.10
+    string public constant version = "0.0.10";
+
     /// @param _gameType The type ID of the game.
     /// @param _absolutePrestate The absolute prestate of the instruction trace.
     /// @param _maxGameDepth The maximum depth of bisection.
@@ -91,7 +95,6 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, Semver {
     /// @param _blockOracle The block oracle, used for loading block hashes further back
     ///                     than the `BLOCKHASH` opcode allows as well as their estimated
     ///                     timestamps.
-    /// @custom:semver 0.0.9
     constructor(
         GameType _gameType,
         Claim _absolutePrestate,
@@ -100,9 +103,7 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, Semver {
         IBigStepper _vm,
         L2OutputOracle _l2oo,
         BlockOracle _blockOracle
-    )
-        Semver(0, 0, 9)
-    {
+    ) {
         GAME_TYPE = _gameType;
         ABSOLUTE_PRESTATE = _absolutePrestate;
         MAX_GAME_DEPTH = _maxGameDepth;