Dispute Game Factory and tests :test_tube:

op-bindings/bindings/weth9_more.go

@@ -13,7 +13,7 @@ const WETH9StorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":\"con
 
 var WETH9StorageLayout = new(solc.StorageLayout)
 
-var WETH9DeployedBin = "0x6080604052600436106100bc5760003560e01c8063313ce56711610074578063a9059cbb1161004e578063a9059cbb146102cb578063d0e30db0146100bc578063dd62ed3e14610311576100bc565b8063313ce5671461024b57806370a082311461027657806395d89b41146102b6576100bc565b806318160ddd116100a557806318160ddd146101aa57806323b872dd146101d15780632e1a7d4d14610221576100bc565b806306fdde03146100c6578063095ea7b314610150575b6100c4610359565b005b3480156100d257600080fd5b506100db6103a8565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101155781810151838201526020016100fd565b50505050905090810190601f1680156101425780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015c57600080fd5b506101966004803603604081101561017357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610454565b604080519115158252519081900360200190f35b3480156101b657600080fd5b506101bf6104c7565b60408051918252519081900360200190f35b3480156101dd57600080fd5b50610196600480360360608110156101f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135811691602081013590911690604001356104cb565b34801561022d57600080fd5b506100c46004803603602081101561024457600080fd5b503561066b565b34801561025757600080fd5b50610260610700565b6040805160ff9092168252519081900360200190f35b34801561028257600080fd5b506101bf6004803603602081101561029957600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610709565b3480156102c257600080fd5b506100db61071b565b3480156102d757600080fd5b50610196600480360360408110156102ee57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610793565b34801561031d57600080fd5b506101bf6004803603604081101561033457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160200135166107a7565b33600081815260036020908152604091829020805434908101909155825190815291517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9281900390910190a2565b6000805460408051602060026001851615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b4790565b73ffffffffffffffffffffffffffffffffffffffff83166000908152600360205260408120548211156104fd57600080fd5b73ffffffffffffffffffffffffffffffffffffffff84163314801590610573575073ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14155b156105ed5773ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020548211156105b557600080fd5b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020805483900390555b73ffffffffffffffffffffffffffffffffffffffff808516600081815260036020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a35060019392505050565b3360009081526003602052604090205481111561068757600080fd5b33600081815260036020526040808220805485900390555183156108fc0291849190818181858888f193505050501580156106c6573d6000803e3d6000fd5b5060408051828152905133917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a250565b60025460ff1681565b60036020526000908152604090205481565b60018054604080516020600284861615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b60006107a03384846104cb565b9392505050565b60046020908152600092835260408084209091529082529020548156fea265627a7a72315820fd69d075d01838a66174ca9cefc98bf8f255e049a94475b253ffc70bf383f90564736f6c63430005110032"
+var WETH9DeployedBin = "0x6080604052600436106100bc5760003560e01c8063313ce56711610074578063a9059cbb1161004e578063a9059cbb146102cb578063d0e30db0146100bc578063dd62ed3e14610311576100bc565b8063313ce5671461024b57806370a082311461027657806395d89b41146102b6576100bc565b806318160ddd116100a557806318160ddd146101aa57806323b872dd146101d15780632e1a7d4d14610221576100bc565b806306fdde03146100c6578063095ea7b314610150575b6100c4610359565b005b3480156100d257600080fd5b506100db6103a8565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101155781810151838201526020016100fd565b50505050905090810190601f1680156101425780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015c57600080fd5b506101966004803603604081101561017357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610454565b604080519115158252519081900360200190f35b3480156101b657600080fd5b506101bf6104c7565b60408051918252519081900360200190f35b3480156101dd57600080fd5b50610196600480360360608110156101f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135811691602081013590911690604001356104cb565b34801561022d57600080fd5b506100c46004803603602081101561024457600080fd5b503561066b565b34801561025757600080fd5b50610260610700565b6040805160ff9092168252519081900360200190f35b34801561028257600080fd5b506101bf6004803603602081101561029957600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610709565b3480156102c257600080fd5b506100db61071b565b3480156102d757600080fd5b50610196600480360360408110156102ee57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610793565b34801561031d57600080fd5b506101bf6004803603604081101561033457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160200135166107a7565b33600081815260036020908152604091829020805434908101909155825190815291517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9281900390910190a2565b6000805460408051602060026001851615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b4790565b73ffffffffffffffffffffffffffffffffffffffff83166000908152600360205260408120548211156104fd57600080fd5b73ffffffffffffffffffffffffffffffffffffffff84163314801590610573575073ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14155b156105ed5773ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020548211156105b557600080fd5b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020805483900390555b73ffffffffffffffffffffffffffffffffffffffff808516600081815260036020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a35060019392505050565b3360009081526003602052604090205481111561068757600080fd5b33600081815260036020526040808220805485900390555183156108fc0291849190818181858888f193505050501580156106c6573d6000803e3d6000fd5b5060408051828152905133917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a250565b60025460ff1681565b60036020526000908152604090205481565b60018054604080516020600284861615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b60006107a03384846104cb565b9392505050565b60046020908152600092835260408084209091529082529020548156fea265627a7a72315820e496abb80c5983b030f680d0bd88f66bf44e261bc3be070d612dd72f9f1f5e9a64736f6c63430005110032"
 
 func init() {
 	if err := json.Unmarshal([]byte(WETH9StorageLayoutJSON), WETH9StorageLayout); err != nil {

package.json

@@ -25,6 +25,7 @@
       "@eth-optimism/contracts-bedrock/ds-test",
       "@eth-optimism/contracts-bedrock/forge-std",
       "@eth-optimism/contracts-bedrock/@rari-capital/solmate",
+      "@eth-optimism/contracts-bedrock/clones-with-immutable-args",
       "**/@openzeppelin/*",
       "@eth-optimism/contracts-periphery/ds-test",
       "@eth-optimism/contracts-periphery/forge-std",

packages/contracts-bedrock/.gas-snapshot

@@ -27,6 +27,11 @@ CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
 CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
 DeployerWhitelist_Test:test_owner_succeeds() (gas: 7582)
 DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
+DisputeGameFactory_Test:test_owner_succeeds() (gas: 7582)
+DisputeGameFactory_Test:test_setImplementation_notOwner_reverts() (gas: 11191)
+DisputeGameFactory_Test:test_setImplementation_succeeds() (gas: 32635)
+DisputeGameFactory_Test:test_transferOwnership_notOwner_reverts() (gas: 10979)
+DisputeGameFactory_Test:test_transferOwnership_succeeds() (gas: 13180)
 FeeVault_Test:test_constructor_succeeds() (gas: 10736)
 FeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 10713)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352135)

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

+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { ClonesWithImmutableArgs } from "@cwia/ClonesWithImmutableArgs.sol";
+
+import { Claim } from "../libraries/DisputeTypes.sol";
+import { Hash } from "../libraries/DisputeTypes.sol";
+import { GameType } from "../libraries/DisputeTypes.sol";
+
+import { NoImplementation } from "../libraries/DisputeErrors.sol";
+import { GameAlreadyExists } from "../libraries/DisputeErrors.sol";
+
+import { IDisputeGame } from "./IDisputeGame.sol";
+import { IBondManager } from "./IBondManager.sol";
+import { IDisputeGameFactory } from "./IDisputeGameFactory.sol";
+
+/**
+ * @title DisputeGameFactory
+ * @notice A factory contract for creating `IDisputeGame` contracts.
+ */
+contract DisputeGameFactory is Ownable, IDisputeGameFactory {
+    /**
+     * @dev Allows for the creation of clone proxies with immutable arguments.
+     */
+    using ClonesWithImmutableArgs for address;
+
+    /**
+     * @notice Mapping of `GameType`s to their respective `IDisputeGame` implementations.
+     */
+    mapping(GameType => IDisputeGame) public gameImpls;
+
+    /**
+     * @notice Mapping of a hash of `gameType . rootClaim . extraData` to
+     *         the deployed `IDisputeGame` clone.
+     * @dev Note: `.` denotes concatenation.
+     */
+    mapping(Hash => IDisputeGame) internal disputeGames;
+
+    /**
+     * @notice Constructs a new DisputeGameFactory contract.
+     * @param _owner The owner of the contract.
+     */
+    constructor(address _owner) Ownable() {
+        transferOwnership(_owner);
+    }
+
+    /**
+     * @notice Retrieves the hash of `gameType . rootClaim . extraData`
+     *         to the deployed `DisputeGame` clone.
+     * @dev Note: `.` denotes concatenation.
+     * @param gameType The type of the DisputeGame.
+     *        Used to decide the implementation to clone.
+     * @param rootClaim The root claim of the DisputeGame.
+     * @param extraData Any extra data that should be provided to the
+     *        created dispute game.
+     * @return _proxy The clone of the `DisputeGame` created with the
+     *         given parameters. `address(0)` if nonexistent.
+     */
+    function games(
+        GameType gameType,
+        Claim rootClaim,
+        bytes calldata extraData
+    ) external view returns (IDisputeGame _proxy) {
+        return disputeGames[getGameUUID(gameType, rootClaim, extraData)];
+    }
+
+    /**
+     * @notice Creates a new DisputeGame proxy contract.
+     * @notice If a dispute game with the given parameters already exists,
+     *         it will be returned.
+     * @param gameType The type of the DisputeGame.
+     *        Used to decide the proxy implementation.
+     * @param rootClaim The root claim of the DisputeGame.
+     * @param extraData Any extra data that should be provided
+     *        to the created dispute game.
+     * @return proxy The clone of the `DisputeGame`.
+     */
+    function create(
+        GameType gameType,
+        Claim rootClaim,
+        bytes calldata extraData
+    ) external returns (IDisputeGame proxy) {
+        // Grab the implementation contract for the given `GameType`.
+        IDisputeGame impl = gameImpls[gameType];
+
+        // If there is no implementation to clone for the given `GameType`, revert.
+        if (address(impl) == address(0)) {
+            revert NoImplementation(gameType);
+        }
+
+        // Clone the implementation contract and initialize it with the given parameters.
+        bytes memory data = abi.encodePacked(rootClaim, extraData);
+        proxy = IDisputeGame(address(impl).clone(data));
+        proxy.initialize();
+
+        // Compute the unique identifier for the dispute game.
+        Hash uuid = getGameUUID(gameType, rootClaim, extraData);
+
+        // If a dispute game with the same UUID already exists, revert.
+        if (address(disputeGames[uuid]) != address(0)) {
+            revert GameAlreadyExists(uuid);
+        }
+
+        // Store the dispute game in the mapping & emit the `DisputeGameCreated` event.
+        disputeGames[uuid] = proxy;
+        emit DisputeGameCreated(address(proxy), gameType, rootClaim);
+    }
+
+    /**
+     * @notice Sets the implementation contract for a specific `GameType`.
+     * @param gameType The type of the DisputeGame.
+     * @param impl The implementation contract for the given `GameType`.
+     */
+    function setImplementation(GameType gameType, IDisputeGame impl) external onlyOwner {
+        gameImpls[gameType] = impl;
+    }
+
+    /**
+     * @notice Returns a unique identifier for the given dispute game parameters.
+     * @dev Hashes the concatenation of `gameType . rootClaim . extraData`
+     *      without expanding memory.
+     * @param gameType The type of the DisputeGame.
+     * @param rootClaim The root claim of the DisputeGame.
+     * @param extraData Any extra data that should be provided to the created dispute game.
+     * @return _uuid The unique identifier for the given dispute game parameters.
+     */
+    function getGameUUID(
+        GameType gameType,
+        Claim rootClaim,
+        bytes memory extraData
+    ) public pure returns (Hash _uuid) {
+        assembly {
+            // Grab the offsets of the other memory locations we will need to temporarily overwrite.
+            let gameTypeOffset := sub(extraData, 0x60)
+            let rootClaimOffset := add(gameTypeOffset, 0x20)
+            let pointerOffset := add(rootClaimOffset, 0x20)
+
+            // Copy the memory that we will temporarily overwrite onto the stack
+            // so we can restore it later
+            let tempA := mload(gameTypeOffset)
+            let tempB := mload(rootClaimOffset)
+            let tempC := mload(pointerOffset)
+
+            // Overwrite the memory with the data we want to hash
+            mstore(gameTypeOffset, gameType)
+            mstore(rootClaimOffset, rootClaim)
+            mstore(pointerOffset, 0x60)
+
+            // Compute the length of the memory to hash
+            // `0x60 + 0x20 + extraData.length` rounded to the *next* multiple of 32.
+            let hashLen := and(add(mload(extraData), 0x9F), not(0x1F))
+
+            // Hash the memory to produce the UUID digest
+            _uuid := keccak256(gameTypeOffset, hashLen)
+
+            // Restore the memory prior to `extraData`
+            mstore(gameTypeOffset, tempA)
+            mstore(rootClaimOffset, tempB)
+            mstore(pointerOffset, tempC)
+        }
+    }
+}

packages/contracts-bedrock/contracts/dispute/IDisputeGameFactory.sol

@@ -4,13 +4,12 @@ pragma solidity ^0.8.15;
 import { Claim, GameType } from "../libraries/DisputeTypes.sol";
 
 import { IDisputeGame } from "./IDisputeGame.sol";
-import { IOwnable } from "./IOwnable.sol";
 
 /**
  * @title IDisputeGameFactory
  * @notice The interface for a DisputeGameFactory contract.
  */
-interface IDisputeGameFactory is IOwnable {
+interface IDisputeGameFactory {
     /**
      * @notice Emitted when a new dispute game is created
      * @param disputeProxy The address of the dispute game proxy

packages/contracts-bedrock/contracts/dispute/IOwnable.sol

-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
-
-/**
- * @title IOwnable
- * @notice An interface for ownable contracts.
- */
-interface IOwnable {
-    /**
-     * @notice Returns the owner of the contract
-     * @return _owner The address of the owner
-     */
-    function owner() external view returns (address _owner);
-
-    /**
-     * @notice Transfers ownership of the contract to a new address
-     * @dev May only be called by the contract owner
-     * @param newOwner The address to transfer ownership to
-     */
-    function transferOwnership(address newOwner) external;
-}

packages/contracts-bedrock/contracts/libraries/DisputeErrors.sol

+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import "./DisputeTypes.sol";
+
+////////////////////////////////////////////////////////////////
+//                `DisputeGameFactory` Errors                 //
+////////////////////////////////////////////////////////////////
+
+/**
+ * @notice Thrown when a dispute game is attempted to be created with an unsupported game type.
+ * @param gameType The unsupported game type.
+ */
+error NoImplementation(GameType gameType);
+
+/**
+ * @notice Thrown when a dispute game that already exists is attempted to be created.
+ * @param uuid The UUID of the dispute game that already exists.
+ */
+error GameAlreadyExists(Hash uuid);
+
+////////////////////////////////////////////////////////////////
+//               `DisputeGame_Fault.sol` Errors               //
+////////////////////////////////////////////////////////////////
+
+/**
+ * @notice Thrown when a supplied bond is too low to cover the
+ *         cost of the next possible counter claim.
+ */
+error BondTooLow();
+
+/**
+ * @notice Thrown when a defense against the root claim is attempted.
+ */
+error CannotDefendRootClaim();
+
+/**
+ * @notice Thrown when a claim is attempting to be made that already exists.
+ */
+error ClaimAlreadyExists();
+
+////////////////////////////////////////////////////////////////
+//              `AttestationDisputeGame` Errors               //
+////////////////////////////////////////////////////////////////
+
+/**
+ * @notice Thrown when an invalid signature is submitted to `challenge`.
+ */
+error InvalidSignature();
+
+/**
+ * @notice Thrown when a signature that has already been used to support the
+ *         `rootClaim` is submitted to `challenge`.
+ */
+error AlreadyChallenged();
+
+////////////////////////////////////////////////////////////////
+//                      `Ownable` Errors                      //
+////////////////////////////////////////////////////////////////
+
+/**
+ * @notice Thrown when a function that is protected by the `onlyOwner` modifier
+ *          is called from an account other than the owner.
+ */
+error NotOwner();

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

+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import "../libraries/DisputeTypes.sol";
+import "../libraries/DisputeErrors.sol";
+
+import { Test } from "forge-std/Test.sol";
+import { DisputeGameFactory } from "../dispute/DisputeGameFactory.sol";
+import { IDisputeGame } from "../dispute/IDisputeGame.sol";
+
+contract DisputeGameFactory_Test is Test {
+    DisputeGameFactory factory;
+    FakeClone fakeClone;
+
+    event DisputeGameCreated(
+        address indexed disputeProxy,
+        GameType indexed gameType,
+        Claim indexed rootClaim
+    );
+
+    function setUp() public {
+        factory = new DisputeGameFactory(address(this));
+        fakeClone = new FakeClone();
+    }
+
+    /**
+     * @dev Tests that the `create` function succeeds when creating a new dispute game
+     *      with a `GameType` that has an implementation set.
+     */
+    function testFuzz_create_succeeds(
+        uint8 gameType,
+        Claim rootClaim,
+        bytes calldata extraData
+    ) public {
+        // Ensure that the `gameType` is within the bounds of the `GameType` enum's possible values.
+        GameType gt = GameType(uint8(bound(gameType, 0, 2)));
+
+        // Set all three implementations to the same `FakeClone` contract.
+        for (uint8 i; i < 3; i++) {
+            factory.setImplementation(GameType(i), IDisputeGame(address(fakeClone)));
+        }
+
+        vm.expectEmit(false, true, true, false);
+        emit DisputeGameCreated(address(0), gt, rootClaim);
+        IDisputeGame proxy = factory.create(gt, rootClaim, extraData);
+
+        // Ensure that the dispute game was assigned to the `disputeGames` mapping.
+        assertEq(address(factory.games(gt, rootClaim, extraData)), address(proxy));
+    }
+
+    /**
+     * @dev Tests that the `create` function reverts when there is no implementation
+     *      set for the given `GameType`.
+     */
+    function testFuzz_create_noImpl_reverts(
+        uint8 gameType,
+        Claim rootClaim,
+        bytes calldata extraData
+    ) public {
+        // Ensure that the `gameType` is within the bounds of the `GameType` enum's possible values.
+        GameType gt = GameType(uint8(bound(gameType, 0, 2)));
+
+        vm.expectRevert(abi.encodeWithSelector(NoImplementation.selector, gt));
+        factory.create(gt, rootClaim, extraData);
+    }
+
+    /**
+     * @dev Tests that the `create` function reverts when there exists a dispute game with the same UUID.
+     */
+    function testFuzz_create_sameUUID_reverts(
+        uint8 gameType,
+        Claim rootClaim,
+        bytes calldata extraData
+    ) public {
+        // Ensure that the `gameType` is within the bounds of the `GameType` enum's possible values.
+        GameType gt = GameType(uint8(bound(gameType, 0, 2)));
+
+        // Set all three implementations to the same `FakeClone` contract.
+        for (uint8 i; i < 3; i++) {
+            factory.setImplementation(GameType(i), IDisputeGame(address(fakeClone)));
+        }
+
+        // Create our first dispute game - this should succeed.
+        vm.expectEmit(false, true, true, false);
+        emit DisputeGameCreated(address(0), gt, rootClaim);
+        IDisputeGame proxy = factory.create(gt, rootClaim, extraData);
+
+        // Ensure that the dispute game was assigned to the `disputeGames` mapping.
+        assertEq(address(factory.games(gt, rootClaim, extraData)), address(proxy));
+
+        // Ensure that the `create` function reverts when called with parameters that would result in the same UUID.
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                GameAlreadyExists.selector,
+                factory.getGameUUID(gt, rootClaim, extraData)
+            )
+        );
+        factory.create(gt, rootClaim, extraData);
+    }
+
+    /**
+     * @dev Tests that the `setImplementation` function properly sets the implementation for a given `GameType`.
+     */
+    function test_setImplementation_succeeds() public {
+        // There should be no implementation for the `GameType.FAULT` enum value, it has not been set.
+        assertEq(address(factory.gameImpls(GameType.FAULT)), address(0));
+
+        // Set the implementation for the `GameType.FAULT` enum value.
+        factory.setImplementation(GameType.FAULT, IDisputeGame(address(1)));
+
+        // Ensure that the implementation for the `GameType.FAULT` enum value is set.
+        assertEq(address(factory.gameImpls(GameType.FAULT)), address(1));
+    }
+
+    /**
+     * @dev Tests that the `setImplementation` function reverts when called by a non-owner.
+     */
+    function test_setImplementation_notOwner_reverts() public {
+        // Ensure that the `setImplementation` function reverts when called by a non-owner.
+        vm.prank(address(0));
+        vm.expectRevert("Ownable: caller is not the owner");
+        factory.setImplementation(GameType.FAULT, IDisputeGame(address(1)));
+    }
+
+    /**
+     * @dev Tests that the `getGameUUID` function returns the correct hash when comparing
+     *      against the keccak256 hash of the abi-encoded parameters.
+     */
+    function testDiff_getGameUUID_succeeds(
+        uint8 gameType,
+        Claim rootClaim,
+        bytes calldata extraData
+    ) public {
+        // Ensure that the `gameType` is within the bounds of the `GameType` enum's possible values.
+        GameType gt = GameType(uint8(bound(gameType, 0, 2)));
+
+        assertEq(
+            Hash.unwrap(factory.getGameUUID(gt, rootClaim, extraData)),
+            keccak256(abi.encode(gt, rootClaim, extraData))
+        );
+    }
+
+    /**
+     * @dev Tests that the `owner` function returns the correct address after deployment.
+     */
+    function test_owner_succeeds() public {
+        assertEq(factory.owner(), address(this));
+    }
+
+    /**
+     * @dev Tests that the `transferOwnership` function succeeds when called by the owner.
+     */
+    function test_transferOwnership_succeeds() public {
+        factory.transferOwnership(address(1));
+        assertEq(factory.owner(), address(1));
+    }
+
+    /**
+     * @dev Tests that the `transferOwnership` function reverts when called by a non-owner.
+     */
+    function test_transferOwnership_notOwner_reverts() public {
+        vm.prank(address(0));
+        vm.expectRevert("Ownable: caller is not the owner");
+        factory.transferOwnership(address(1));
+    }
+}
+
+/**
+ * @dev A fake clone used for testing the `DisputeGameFactory` contract's `create` function.
+ */
+contract FakeClone {
+    function initialize() external {
+        // noop
+    }
+}

packages/contracts-bedrock/foundry.toml

@@ -8,6 +8,7 @@ remappings = [
   '@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/',
   '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
   '@rari-capital/solmate/=node_modules/@rari-capital/solmate',
+  "@cwia/=node_modules/clones-with-immutable-args/src",
   'forge-std/=node_modules/forge-std/src',
   'ds-test/=node_modules/ds-test/src'
 ]

packages/contracts-bedrock/package.json

@@ -70,6 +70,7 @@
     "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@nomiclabs/hardhat-waffle": "^2.0.0",
     "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
+    "clones-with-immutable-args": "https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args.git#105efee1b9127ed7f6fedf139e1fc796ce8791f2",
     "@typechain/ethers-v5": "^10.1.0",
     "@typescript-eslint/eslint-plugin": "^5.45.1",
     "@typescript-eslint/parser": "^5.45.1",

yarn.lock

@@ -7915,6 +7915,10 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
+"clones-with-immutable-args@https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args.git#105efee1b9127ed7f6fedf139e1fc796ce8791f2":
+  version "2.0.0"
+  resolved "https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args.git#105efee1b9127ed7f6fedf139e1fc796ce8791f2"
+
 clsx@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"