Skip to content

fix: shared lockbox CI #256

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
agusduha merged 1 commit into from
Feb 5, 2025
Merged

fix: shared lockbox CI #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions .semgrep/rules/sol-rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ rules:
paths:
exclude:
- packages/contracts-bedrock/src/L1/OPContractsManager.sol
- packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
- packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol

- id: sol-style-enforce-require-msg
Expand Down Expand Up @@ -209,7 +208,6 @@ rules:
}
paths:
exclude:
- packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
- packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol

- id: sol-safety-proper-initializer
Expand All @@ -230,4 +228,3 @@ rules:
paths:
exclude:
- packages/contracts-bedrock/src/L1/SystemConfig.sol
- packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
6 changes: 0 additions & 6 deletions op-deployer/pkg/deployer/opcm/implementations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,12 @@ func DeployImplementations(
defer cleanupDeploy()

opcmContract := "OPContractsManager"
if input.UseInterop {
opcmContract = "OPContractsManagerInterop"
}
if err := host.RememberOnLabel("OPContractsManager", opcmContract+".sol", opcmContract); err != nil {
return output, fmt.Errorf("failed to link OPContractsManager label: %w", err)
}

// So we can see in detail where the SystemConfig interop initializer fails
sysConfig := "SystemConfig"
if input.UseInterop {
sysConfig = "SystemConfigInterop"
}
if err := host.RememberOnLabel("SystemConfigImpl", sysConfig+".sol", sysConfig); err != nil {
return output, fmt.Errorf("failed to link SystemConfig label: %w", err)
}
Expand Down
20 changes: 0 additions & 20 deletions packages/contracts-bedrock/interfaces/L1/IOPContractsManagerInterop.sol
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions packages/contracts-bedrock/test/vendor/Initializable.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ contract Initializer_Test is CommonTest {
function test_cannotReinitialize_succeeds() public {
// Collect exclusions.
uint256 j = 0;
string[] memory excludes = new string[](10);
string[] memory excludes = new string[](9);
// TODO: Neither of these contracts are labeled properly in the deployment script. Both are
// currently being labeled as their non-interop versions. Remove these exclusions once
// the deployment script is fixed.
Expand All @@ -363,7 +363,6 @@ contract Initializer_Test is CommonTest {
excludes[j++] = "src/dispute/PermissionedDisputeGame.sol";
// TODO: Eventually remove this exclusion. Same reason as above dispute contracts.
excludes[j++] = "src/L1/OPContractsManager.sol";
excludes[j++] = "src/L1/OPContractsManagerInterop.sol";
// L2 contract initialization is tested in Predeploys.t.sol
excludes[j++] = "src/L2/*";
// Exclude SharedLockbox since using OZv5 initializer
Expand Down