Skip to content

chore: sync opcm2 support op deployer with develop#775

Merged
0xOneTony merged 2 commits intosc-feat/opcm2-revert-opcmfrom
sync/opcm2-support-op-deployer
Dec 18, 2025
Merged

chore: sync opcm2 support op deployer with develop#775
0xOneTony merged 2 commits intosc-feat/opcm2-revert-opcmfrom
sync/opcm2-support-op-deployer

Conversation

@0xOneTony
Copy link
Copy Markdown
Member

@0xOneTony 0xOneTony commented Dec 18, 2025

Note

Enforces custom Test import across the test suite, bumps OptimismPortalInterop to 5.2.0+interop with updated hashes, and updates CI feature matrix and pinned fork block numbers.

  • Testing/Style:
    • Add semgrep rule sol-style-ban-forge-std-test-import to ban forge-std/Test.sol in tests; require test/setup/Test.sol and specific forge-std/* imports.
    • Introduce test/setup/Test.sol overriding makeAddr and refactor many tests to use it and granular forge-std modules.
    • Add semgrep test /.semgrep/tests/sol-rules.sol-style-ban-forge-std-test-import.t.sol.
  • Contracts:
    • Bump src/L1/OptimismPortalInterop.sol semver to 5.2.0+interop and update version(); refresh semver lock hashes.
  • Tooling/CI:
    • Adjust CircleCI contracts-bedrock test feature matrix (reorder/add CUSTOM_GAS_TOKEN, remove deprecated combo).
    • Update packages/contracts-bedrock/justfile pinned block numbers for sepolia and mainnet.

Written by Cursor Bugbot for commit 331738c. This will update automatically on new commits. Configure here.

smartcontracts and others added 2 commits December 18, 2025 18:54
* test: use a custom Test contract for makeAddr

This PR introduces a light wrapper around the forge Test contract
specifically for the purpose of making sure people are using a
version of makeAddr that will always be reproducible. Without this
makeAddr uses a private key which means that fork tests can be
unreliable if people mess with these addresses on mainnet.

* fix: compilation failures

* fix: linting issues, version issues
@0xOneTony
Copy link
Copy Markdown
Member Author

There was a conflict on /DeployOPChain.t.sol

@0xOneTony 0xOneTony merged commit 871b5d6 into sc-feat/opcm2-revert-opcm Dec 18, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants