Skip to content

fix: no env var manipulation in VerifyOPCM tests #17813

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
merged 4 commits into from
Oct 16, 2025
+15 −8
Merged

fix: no env var manipulation in VerifyOPCM tests #17813

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b27635b
fix: no env var manipulation in VerifyOPCM tests
smartcontracts Oct 9, 2025
2fdbf08
Update packages/contracts-bedrock/test/scripts/VerifyOPCM.t.sol
smartcontracts Oct 10, 2025
4c4db63
Merge branch 'develop' into sc/fix-no-env-manip
smartcontracts Oct 15, 2025
f34cd67
fix: remove old variable
smartcontracts Oct 16, 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
23 changes: 15 additions & 8 deletions packages/contracts-bedrock/test/scripts/VerifyOPCM.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,6 @@ contract VerifyOPCM_Run_Test is VerifyOPCM_TestInit {
// Coverage changes bytecode and causes failures, skip.
skipIfCoverage();

// Ensure environment variables are set correctly (in case other tests modified them)
setupEnvVars();

// Test that the immutable variables are correctly verified.
// Environment variables are set in setUp() to match the actual OPCM addresses.
bool result = harness.verifyOpcmImmutableVariables(opcm);
Expand Down Expand Up @@ -463,15 +460,25 @@ contract VerifyOPCM_Run_Test is VerifyOPCM_TestInit {
address expectedSuperchainConfig = address(0x1111);
address expectedProtocolVersions = address(0x2222);

vm.setEnv("EXPECTED_SUPERCHAIN_CONFIG", vm.toString(expectedSuperchainConfig));
vm.setEnv("EXPECTED_PROTOCOL_VERSIONS", vm.toString(expectedProtocolVersions));
// Use vm.mockCall instead of vm.setEnv to avoid global env mutation. We need to ignore
// semgrep here because envAddress has multiple potential signatures so we can't use
// abi.encodeCall.
// nosemgrep: sol-style-use-abi-encodecall
vm.mockCall(
address(vm),
abi.encodeWithSignature("envAddress(string)", "EXPECTED_SUPERCHAIN_CONFIG"),
abi.encode(expectedSuperchainConfig)
);
// nosemgrep: sol-style-use-abi-encodecall
vm.mockCall(
address(vm),
abi.encodeWithSignature("envAddress(string)", "EXPECTED_PROTOCOL_VERSIONS"),
abi.encode(expectedProtocolVersions)
);

// Test that mocking each individual getter causes verification to fail
_assertOnOpcmGetter(IOPContractsManager.superchainConfig.selector);
_assertOnOpcmGetter(IOPContractsManager.protocolVersions.selector);

// Reset environment variables to correct values (as set in setUp())
setupEnvVars();
}

/// @notice Tests that the ABI getter validation succeeds when all getters are accounted for.
Expand Down