Skip to content

fix: small issues in portal comments #15960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maurelian merged 2 commits into from
May 15, 2025
Merged

fix: small issues in portal comments #15960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd82753
fix: small issues in portal comments
smartcontracts May 15, 2025
e97dc20
fix: pre-pr
smartcontracts May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 7 additions & 6 deletions packages/contracts-bedrock/src/L1/OptimismPortal2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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 }();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/src/L1/StandardValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down