Rebase

packages/contracts-bedrock/.gas-snapshot

@@ -27,11 +27,19 @@ 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: 12610)
-DisputeGameFactory_Test:test_setImplementation_notOwner_reverts() (gas: 16099)
-DisputeGameFactory_Test:test_setImplementation_succeeds() (gas: 44302)
-DisputeGameFactory_Test:test_transferOwnership_notOwner_reverts() (gas: 15974)
-DisputeGameFactory_Test:test_transferOwnership_succeeds() (gas: 18694)
+DisputeGameFactory_Test:test_owner_succeeds() (gas: 7627)
+DisputeGameFactory_Test:test_setImplementation_notOwner_reverts() (gas: 11077)
+DisputeGameFactory_Test:test_setImplementation_succeeds() (gas: 38320)
+DisputeGameFactory_Test:test_transferOwnership_notOwner_reverts() (gas: 10979)
+DisputeGameFactory_Test:test_transferOwnership_succeeds() (gas: 13225)
+FaultDisputeGame_Test:test_extraData_succeeds() (gas: 17456)
+FaultDisputeGame_Test:test_gameData_succeeds() (gas: 17882)
+FaultDisputeGame_Test:test_gameStart_succeeds() (gas: 10315)
+FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8237)
+FaultDisputeGame_Test:test_initialRootClaimData_succeeds() (gas: 19522)
+FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8225)
+FaultDisputeGame_Test:test_simpleAttack_succeeds() (gas: 129016)
+FaultDisputeGame_Test:test_version_succeeds() (gas: 9736)
 FeeVault_Test:test_constructor_succeeds() (gas: 18185)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352135)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950342)
@@ -435,3 +443,4 @@ SystemConfig_Setters_TestFail:test_setResourceConfig_notOwner_reverts() (gas: 11
 SystemConfig_Setters_TestFail:test_setResourceConfig_zeroDenominator_reverts() (gas: 13039)
 SystemConfig_Setters_TestFail:test_setUnsafeBlockSigner_notOwner_reverts() (gas: 10616)
 TransferOnionTest:test_constructor_succeeds() (gas: 564855)
+TransferOnionTest:test_unwrap_succeeds() (gas: 724955)
\ No newline at end of file

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

@@ -228,7 +228,7 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone {
      * @inheritdoc IDisputeGame
      */
     function gameType() public pure override returns (GameType _gameType) {
-        _gameType = GameType.FAULT;
+        _gameType = GameTypes.FAULT;
     }
 
     /**

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

@@ -21,7 +21,7 @@ contract FaultDisputeGame_Test is Test {
     /**
      * @dev The type of the game being tested.
      */
-    GameType internal constant GAME_TYPE = GameType.FAULT;
+    GameType internal constant GAME_TYPE = GameType.wrap(0);
     /**
      * @dev The current version of the `FaultDisputeGame` contract.
      */
@@ -90,7 +90,7 @@ contract FaultDisputeGame_Test is Test {
      * @dev Tests that the game's type is set correctly.
      */
     function test_gameType_succeeds() public {
-        assertEq(uint256(gameProxy.gameType()), uint256(GAME_TYPE));
+        assertEq(GameType.unwrap(gameProxy.gameType()), GameType.unwrap(GAME_TYPE));
     }
 
     /**
@@ -99,7 +99,7 @@ contract FaultDisputeGame_Test is Test {
     function test_gameData_succeeds() public {
         (GameType gameType, Claim rootClaim, bytes memory extraData) = gameProxy.gameData();
 
-        assertEq(uint256(gameType), uint256(GAME_TYPE));
+        assertEq(GameType.unwrap(gameType), GameType.unwrap(GAME_TYPE));
         assertEq(Claim.unwrap(rootClaim), Claim.unwrap(ROOT_CLAIM));
         assertEq(extraData, EXTRA_DATA);
     }