Skip to content

feat: handle operator fee in OPCM #14662

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
mslipper merged 3 commits into from
Mar 5, 2025
Merged

feat: handle operator fee in OPCM #14662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2923232
feat: handle operator fee in OPCM
leruaa Mar 5, 2025
f73b3fe
fix: upgrade version
leruaa Mar 5, 2025
c47dda4
feat: check implementation address
leruaa Mar 5, 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 @@ -16,8 +16,8 @@
"sourceCodeHash": "0x44797707aea8c63dec049a02d69ea056662a06e5cf320028ab8b388634bf1c67"
},
"src/L1/OPContractsManager.sol": {
"initCodeHash": "0xc50bce08abbfc66d7f902b5b1f5504c99cbdca17ca4ff98f67801e40c0751f6b",
"sourceCodeHash": "0xff40fd58a78fdfa90e8ac84bed278e6af8329fd826b478fb4fcd6641f62ae1b6"
"initCodeHash": "0x216fe3ceef5d3e839d18a00383793bd326f20944fc3b55ef099a26a22141de18",
"sourceCodeHash": "0xd1de3414a3db731447cb6172df23a00cb1664783de56a93fb29f87d6bc8b8bb0"
},
"src/L1/OptimismPortal2.sol": {
"initCodeHash": "0xd1651b8a6f4d25611a0105d5cc7c1da3921417bd44da870ec63bf5ccd1bc7c63",
Expand Down
9 changes: 7 additions & 2 deletions packages/contracts-bedrock/src/L1/OPContractsManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,11 @@ contract OPContractsManagerUpgrader is OPContractsManagerBase {
assertValidOpChainConfig(_opChainConfigs[i]);
ISystemConfig.Addresses memory opChainAddrs = _opChainConfigs[i].systemConfigProxy.getAddresses();

// -------- Upgrade SystemConfig to Isthmus implementation --------
upgradeTo(
_opChainConfigs[i].proxyAdmin, address(_opChainConfigs[i].systemConfigProxy), impls.systemConfigImpl
);

// -------- Upgrade Contracts Stored in SystemConfig --------

// OptimismPortal and L1CrossDomainMessenger are being upgraded to include the fixes
Expand Down Expand Up @@ -1230,9 +1235,9 @@ contract OPContractsManager is ISemver {

// -------- Constants and Variables --------

/// @custom:semver 1.8.0
/// @custom:semver 1.9.0
function version() public pure virtual returns (string memory) {
return "1.8.0";
return "1.9.0";
}

OPContractsManagerGameTypeAdder public immutable opcmGameTypeAdder;
Expand Down
4 changes: 4 additions & 0 deletions 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 @@ -444,6 +444,10 @@ contract OPContractsManager_Upgrade_Harness is CommonTest {
assertEq(ISemver(address(pdg)).version(), "1.4.1");
assertEq(address(pdg.vm()), impls.mipsImpl);

// Check that the SystemConfig is upgraded to the expected version
assertEq(ISemver(address(systemConfig)).version(), "2.5.0");
assertEq(impls.systemConfigImpl, EIP1967Helper.getImplementation(address(systemConfig)));

if (address(oldFDG) != address(0)) {
// Check that the PermissionlessDisputeGame is upgraded to the expected version
IFaultDisputeGame newFDG = IFaultDisputeGame(address(disputeGameFactory.gameImpls(GameTypes.CANNON)));
Expand Down