diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json index 632df042114c9..179222619cf01 100644 --- a/packages/contracts-bedrock/snapshots/semver-lock.json +++ b/packages/contracts-bedrock/snapshots/semver-lock.json @@ -24,8 +24,8 @@ "sourceCodeHash": "0xafa3ebc3061831c4503664dff2e290934a2ba0ec7be354e1a11afcf9d130962e" }, "src/L1/OptimismPortal2.sol:OptimismPortal2": { - "initCodeHash": "0x6f0c9089e4cbe2360473c95235115a4eb31462cd06799cd7ff288fc85efdbf91", - "sourceCodeHash": "0x2fa10a8e28dac549ec29270aa0f3ddd8963873762fd8dcd19a0fc8bc14e8d1fe" + "initCodeHash": "0x785b09610b2da65d248b49150fafc85b8369c921ddae95b0ea45608b1ce5cbc6", + "sourceCodeHash": "0x925821e7ca59f1799a900fbf5ce7d2c6bef35fc2636c306977d9889f60a987bb" }, "src/L1/ProtocolVersions.sol:ProtocolVersions": { "initCodeHash": "0x5a76c8530cb24cf23d3baacc6eefaac226382af13f1e2a35535d2ec2b0573b29", diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol index e68b022594299..ef2f8c8cb0e07 100644 --- a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol +++ b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol @@ -232,9 +232,9 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ReinitializableBase error OptimismPortal_MigratingToSameRegistry(); /// @notice Semantic version. - /// @custom:semver 4.5.0 + /// @custom:semver 4.6.0 function version() public pure virtual returns (string memory) { - return "4.5.0"; + return "4.6.0"; } /// @param _proofMaturityDelaySeconds The proof maturity delay in seconds. @@ -331,8 +331,9 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ReinitializableBase /// @custom:legacy /// @notice Getter for the retirement timestamp. Note that this value NO LONGER reflects the - /// timestamp at which the respected game type. Game retirement and respected game type - /// value have been decoupled, this function now only returns the retirement timestamp. + /// timestamp at which the respected game type was updated. Game retirement and + /// respected game type value have been decoupled, this function now only returns the + /// retirement timestamp. function respectedGameTypeUpdatedAt() external view returns (uint64) { return anchorStateRegistry.retirementTimestamp(); } @@ -672,8 +673,8 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ReinitializableBase // be achieved through contracts built on top of this contract emit WithdrawalFinalized(withdrawalHash, success); - // Send ETH back to the Lockbox or it'll get stuck here and would need to be moved back via - // the migrateLiquidity function. + // Send ETH back to the Lockbox in the case of a failed transaction or it'll get stuck here + // and would need to be moved back via the migrateLiquidity function. if (!success && _tx.value > 0) { ethLockbox.lockETH{ value: _tx.value }(); } diff --git a/packages/contracts-bedrock/src/L1/StandardValidator.sol b/packages/contracts-bedrock/src/L1/StandardValidator.sol index 891355aa8d9e1..34934f2276e57 100644 --- a/packages/contracts-bedrock/src/L1/StandardValidator.sol +++ b/packages/contracts-bedrock/src/L1/StandardValidator.sol @@ -126,7 +126,7 @@ contract StandardValidator { } function optimismPortalVersion() public pure returns (string memory) { - return "4.5.0"; + return "4.6.0"; } function l1CrossDomainMessengerVersion() public pure returns (string memory) { diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol index ea2ec0dfb473e..472efd25cb216 100644 --- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol +++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol @@ -610,7 +610,7 @@ contract OPContractsManager_Upgrade_Harness is CommonTest { // Make sure that the OptimismPortal is upgraded to the right version. It must also have a // reference to the new AnchorStateRegistry. - assertEq(ISemver(address(optimismPortal2)).version(), "4.5.0"); + assertEq(ISemver(address(optimismPortal2)).version(), "4.6.0"); assertEq(impls.optimismPortalImpl, EIP1967Helper.getImplementation(address(optimismPortal2))); assertEq(address(optimismPortal2.anchorStateRegistry()), address(newAsrProxy)); DeployUtils.assertInitialized({