Rebase on Mofi's changes

packages/contracts-bedrock/.gas-snapshot

@@ -32,19 +32,19 @@ DisputeGameFactory_SetImplementation_Test:test_setImplementation_notOwner_revert
 DisputeGameFactory_SetImplementation_Test:test_setImplementation_succeeds() (gas: 44243)
 DisputeGameFactory_TransferOwnership_Test:test_transferOwnership_notOwner_reverts() (gas: 15950)
 DisputeGameFactory_TransferOwnership_Test:test_transferOwnership_succeeds() (gas: 18642)
-FaultDisputeGame_Test:test_clockTimeExceeded_reverts() (gas: 26468)
+FaultDisputeGame_Test:test_clockTimeExceeded_reverts() (gas: 26474)
 FaultDisputeGame_Test:test_defendRoot_reverts() (gas: 13258)
-FaultDisputeGame_Test:test_duplicateClaim_reverts() (gas: 103369)
+FaultDisputeGame_Test:test_duplicateClaim_reverts() (gas: 103381)
 FaultDisputeGame_Test:test_extraData_succeeds() (gas: 17478)
 FaultDisputeGame_Test:test_gameData_succeeds() (gas: 17859)
-FaultDisputeGame_Test:test_gameDepthExceeded_reverts() (gas: 5906891)
+FaultDisputeGame_Test:test_gameDepthExceeded_reverts() (gas: 5907275)
 FaultDisputeGame_Test:test_gameStart_succeeds() (gas: 10337)
 FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8194)
 FaultDisputeGame_Test:test_initialRootClaimData_succeeds() (gas: 17580)
 FaultDisputeGame_Test:test_moveAgainstNonexistentParent_reverts() (gas: 24587)
 FaultDisputeGame_Test:test_move_gameNotInProgress_reverts() (gas: 10945)
 FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8191)
-FaultDisputeGame_Test:test_simpleAttack_succeeds() (gas: 107361)
+FaultDisputeGame_Test:test_simpleAttack_succeeds() (gas: 107367)
 FaultDisputeGame_Test:test_version_succeeds() (gas: 9780)
 FeeVault_Test:test_constructor_succeeds() (gas: 18185)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352135)
@@ -449,3 +449,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/test/FaultDisputeGame.t.sol

@@ -247,7 +247,7 @@ contract FaultDisputeGame_Test is DisputeGameFactory_Init {
         assertEq(parentIndex, 0);
         assertEq(countered, false);
         assertEq(Claim.unwrap(claim), Claim.unwrap(counter));
-        assertEq(Position.unwrap(position), Position.unwrap(Position.wrap(0).attack()));
+        assertEq(Position.unwrap(position), Position.unwrap(Position.wrap(1).attack()));
         assertEq(
             Clock.unwrap(clock),
             Clock.unwrap(LibClock.wrap(Duration.wrap(5), Timestamp.wrap(uint64(block.timestamp))))

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

@@ -108,7 +108,7 @@ contract LibPosition_Test is Test {
         uint64 rightIndex = position.rightIndex(_maxDepth);
 
         // Find the deepest, rightmost index in Solidity rather than Yul
-        for (uint256 i = _depth; i < _maxDepth - 1; ++i) {
+        for (uint256 i = _depth; i < _maxDepth; ++i) {
             position = position.right();
         }
         uint64 _rightIndex = position.indexAtDepth();