minor tweaks

Author: smartcontracts

op-chain-ops/interopgen/recipe.go

@@ -71,7 +71,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
 		Implementations: OPCMImplementationsConfig{
 			L1ContractsRelease: "dev",
 			FaultProof: SuperFaultProofConfig{
-				WithdrawalDelaySeconds:          big.NewInt(604800),
+				WithdrawalDelaySeconds:          big.NewInt(302400),
 				MinProposalSizeBytes:            big.NewInt(10000),
 				ChallengePeriodSeconds:          big.NewInt(120),
 				ProofMaturityDelaySeconds:       big.NewInt(12),

op-deployer/pkg/deployer/standard/standard.go

@@ -15,7 +15,7 @@ const (
 	GasLimit                        uint64 = 60_000_000
 	BasefeeScalar                   uint32 = 1368
 	BlobBaseFeeScalar               uint32 = 801949
-	WithdrawalDelaySeconds          uint64 = 604800
+	WithdrawalDelaySeconds          uint64 = 302400
 	MinProposalSizeBytes            uint64 = 126000
 	ChallengePeriodSeconds          uint64 = 86400
 	ProofMaturityDelaySeconds       uint64 = 604800

op-e2e/faultproofs/output_alphabet_test.go

@@ -127,6 +127,11 @@ func TestOutputAlphabetGame_ReclaimBond(t *testing.T) {
 	sys.TimeTravelClock.AdvanceTime(game.CreditUnlockDuration(ctx))
 	require.NoError(t, wait.ForNextBlock(ctx, l1Client))
 
+	// Advance the time past the finalization delay
+	// Finalization delay is the same as the credit unlock delay
+	sys.TimeTravelClock.AdvanceTime(game.CreditUnlockDuration(ctx))
+	require.NoError(t, wait.ForNextBlock(ctx, l1Client))
+
 	// Wait for alice to have no available credit
 	// aka, wait for the challenger to claim its credit
 	game.WaitForNoAvailableCredit(ctx, alice)

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

@@ -20,11 +20,11 @@
     "sourceCodeHash": "0x2d21506cc51ebe0b60bcf89883aff5e9b1269567ce44ee779de3d3940e23fb65"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0x5121ab634e470633d965d709bb65c8ea97f8cecf84c42aa4541b5eb9a92d6cc9",
-    "sourceCodeHash": "0x889a4a53f38fa885281be58bad88c25bafec0a9fd7fb2ddfa16dcda1cecaf7d5"
+    "initCodeHash": "0x94c880ae1974be774ec956ed2d9f8d71c19ba500d47abe28856ea8a019dc9c3f",
+    "sourceCodeHash": "0x99ab9155cd18ee2bbab440431923f944a89535670546bfaa01e637eadb0342b8"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x137910751db2e7a4edc76728b8433b47911b82fe1514465f2cbc5b35daf2e53a",
+    "initCodeHash": "0x529e192525bc0f28b4402439af1defcf5407016b44a3eda2da5a6260b31779e2",
     "sourceCodeHash": "0xc04a7f9c14a13ec3587f5cc351c8e9f27fbbe9f1291a1aba07de29edbeef418a"
   },
   "src/L1/ProtocolVersions.sol": {

packages/contracts-bedrock/src/L1/OptimismPortal2.sol

@@ -482,11 +482,10 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
         // respectedGameTypeUpdatedAt timestamp without modifying this function's signature.
         if (_gameType.raw() == type(uint32).max) {
             respectedGameTypeUpdatedAt = uint64(block.timestamp);
-            emit RespectedGameTypeSet(respectedGameType, Timestamp.wrap(respectedGameTypeUpdatedAt));
         } else {
             respectedGameType = _gameType;
-            emit RespectedGameTypeSet(_gameType, Timestamp.wrap(respectedGameTypeUpdatedAt));
         }
+        emit RespectedGameTypeSet(respectedGameType, Timestamp.wrap(respectedGameTypeUpdatedAt));
     }
 
     /// @notice Checks if a withdrawal can be finalized. This function will revert if the withdrawal cannot be