Merge upstream for op-es

.cursor/rules/solidity-styles.mdc

@@ -36,8 +36,8 @@ Applies to Solidity files.
 - Contracts should be built assuming upgradeability by default
 - Extend OpenZeppelin's `Initializable` or base contract
 - Use the `ReinitializableBase` contract
-- Include an `initialize` function with the `reinitializer(initValue())` modifier
-- If including an `upgrade` function, use the `reinitializer(initValue())` modifier
+- Include an `initialize` function with the `reinitializer(initVersion())` modifier
+- If including an `upgrade` function, use the `reinitializer(initVersion())` modifier
 - In the constructor:
   - Call `_disableInitializers()`
   - Set any immutables (though generally avoid immutables)
@@ -63,7 +63,7 @@ Applies to Solidity files.
   - `method`: `test`, `testFuzz`, or `testDiff`
   - `status`: `succeeds`, `reverts`, `works`, `fails`, or `benchmark`
 - Test contract naming:
-  - `TargetContract_Init`: for basic setup contracts
+  - `TargetContract_TestInit`: for basic setup contracts
   - `TargetContract_FunctionName_Test`: for happy path tests
   - `TargetContract_FunctionName_TestFail`: for sad path tests
   - `TargetContract_Harness`: for harness contracts

.github/CODEOWNERS

@@ -28,10 +28,6 @@
 /op-e2e/faultproofs    @ethereum-optimism/proofs @ethereum-optimism/go-reviewers
 
 # Ops
-/.circleci                         @ethereum-optimism/monorepo-ops-reviewers
-/.github                           @ethereum-optimism/monorepo-ops-reviewers
-/ops                               @ethereum-optimism/monorepo-ops-reviewers
-/docker-bake.hcl                   @ethereum-optimism/monorepo-ops-reviewers
 /.cursor/rules/solidity-styles.mdc @ethereum-optimism/contract-reviewers
 
 # Contracts

.github/cliff.toml

@@ -0,0 +1,82 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+[remote.github]
+owner = "ethereum-optimism"
+repo = "optimism"
+# token = "" # Set via the GITHUB_TOKEN environment variable.
+
+[changelog]
+# A Tera template to be rendered for each release in the changelog.
+# See https://keats.github.io/tera/docs/#introduction
+body = """
+## What's Changed
+
+{%- if version %} in {{ version }}{%- endif -%}
+{% for commit in commits %}
+  {% if commit.remote.pr_title -%}
+    {%- set commit_message = commit.remote.pr_title -%}
+  {%- else -%}
+    {%- set commit_message = commit.message -%}
+  {%- endif -%}
+  * {{ commit_message | split(pat="\n") | first | trim }}\
+    {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif -%}
+    {% if commit.remote.pr_number %} in \
+      [#{{ commit.remote.pr_number }}]({{ self::remote_url() }}/pull/{{ commit.remote.pr_number }}) \
+    {%- endif %}
+{%- endfor -%}
+
+{%- if github -%}
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
+  {% raw %}\n{% endraw -%}
+  ## New Contributors
+{%- endif %}\
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
+  * @{{ contributor.username }} made their first contribution
+    {%- if contributor.pr_number %} in \
+      [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
+    {%- endif %}
+{%- endfor -%}
+{%- endif -%}
+
+{% if version %}
+    {% if previous.version %}
+      **Full Changelog**: {{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }}
+    {% endif %}
+    🚢 Docker Image: https://us-docker.pkg.dev/oplabs-tools-artifacts/images/{{ version | replace(from="/", to=":") }}
+{% else -%}
+  {% raw %}\n{% endraw %}
+{% endif %}
+
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
+"""
+# Remove leading and trailing whitespaces from the changelog's body.
+trim = true
+# A Tera template to be rendered as the changelog's footer.
+# See https://keats.github.io/tera/docs/#introduction
+footer = """
+<!-- generated by git-cliff -->
+"""
+# An array of regex based postprocessors to modify the changelog.
+# Replace the placeholder `<REPO>` with a URL.
+postprocessors = []
+
+[git]
+# Parse commits according to the conventional commits specification.
+# See https://www.conventionalcommits.org
+conventional_commits = false
+# Exclude commits that do not match the conventional commits specification.
+filter_unconventional = false
+# Split commits on newlines, treating each line as an individual commit.
+split_commits = false
+# An array of regex based parsers to modify commit messages prior to further processing.
+commit_preprocessors = [{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "" }]
+# Exclude commits that are not matched by any commit parser.
+filter_commits = false
+# Order releases topologically instead of chronologically.
+topo_order = false
+# Order of commits in each group/release within the changelog.
+# Allowed values: newest, oldest
+sort_commits = "newest"

.gitignore

@@ -22,7 +22,6 @@ cache
 
 !op-deployer/pkg/deployer/artifacts
 
-
 packages/contracts-bedrock/deployments/anvil
 
 # vim
@@ -45,8 +44,10 @@ packages/contracts-bedrock/deployments/anvil
 
 coverage.out
 
-
 __pycache__
 
 # Ignore echidna artifacts
 crytic-export
+
+# ignore local asdf config
+.tool-versions

.golangci.yaml

@@ -0,0 +1,36 @@
+linters:
+  enable:
+    - goimports
+    - sqlclosecheck
+    - bodyclose
+    - asciicheck
+    - misspell
+    - errorlint
+
+    # Only enabled in specific cases. See settings and exclusions below
+    - exhaustruct
+    - err113
+
+    # Enabled by default but be explicit so it's easy to see what we're running
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+linters-settings:
+  # Require specifying all fields in op-deployer's OPCM input and output structs
+  exhaustruct:
+    include:
+      - '.*op-deployer/pkg/deployer/opcm\..*(Input|Output)$'
+issues:
+  exclude:
+    - 'errors.As'
+    - 'errors.Is'
+  exclude-rules:
+    # Only apply err113 to op-program/client
+    - path-except: 'op-program/client/.*'
+      linters:
+        - err113
+run:
+  timeout: 5m

.semgrep/rules/sol-rules.yaml

@@ -110,6 +110,7 @@ rules:
       exclude:
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/scripts
+        - ops/ai-eng/contracts-test-maintenance/prompt/prompt.md
 
   - id: sol-style-input-arg-fmt
     languages: [solidity]
@@ -319,6 +320,7 @@ rules:
       exclude:
         - packages/contracts-bedrock/src/L1/OPContractsManager.sol
         - packages/contracts-bedrock/src/L1/OptimismPortal2.sol
+        - packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
         - packages/contracts-bedrock/src/L2/FeeVault.sol
         - packages/contracts-bedrock/src/L2/OptimismMintableERC721.sol
         - packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
@@ -328,7 +330,9 @@ rules:
         - packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
         - packages/contracts-bedrock/src/dispute/DelayedWETH.sol
         - packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/v2/FaultDisputeGameV2.sol
         - packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/v2/PermissionedDisputeGameV2.sol
         - packages/contracts-bedrock/src/dispute/SuperFaultDisputeGame.sol
         - packages/contracts-bedrock/src/dispute/SuperPermissionedDisputeGame.sol
         - packages/contracts-bedrock/src/governance/MintManager.sol
@@ -362,3 +366,20 @@ rules:
     paths:
       exclude:
         - packages/contracts-bedrock/scripts/libraries/Config.sol
+
+  - id: sol-style-event-param-fmt
+    languages: [solidity]
+    severity: ERROR
+    message: Event parameters must be named using camelCase and must not be prefixed with underscore
+    pattern-either:
+      # Match parameters with underscore prefix
+      - pattern-regex: event\s+\w+\s*\([^)]*\b(?:address|uint\d*|int\d*|bytes\d*|bool|string)\s+(?:indexed\s+)?_\w+
+      # Match unnamed parameters (type with optional indexed but no parameter name before comma or closing paren)
+      - pattern-regex: event\s+\w+\s*\([^)]*\b(?:address|uint\d*|int\d*|bytes\d*|bool|string)\b(?:\s+indexed)?\s*[,)]
+      # Match parameters that are all uppercase (like NEW_OWNER)
+      - pattern-regex: event\s+\w+\s*\([^)]*\b(?:address|uint\d*|int\d*|bytes\d*|bool|string)\s+(?:indexed\s+)?[A-Z][A-Z0-9_]*\s*[,)]
+    paths:
+      exclude:
+        # LegacyMintableERC20 and the corresponding interface use legacy naming conventions.
+        - packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
+        - packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol

.semgrep/tests/sol-rules.t.sol

@@ -712,3 +712,23 @@ contract SemgrepTest__sol_safety_try_catch_eip_150 {
         }
     }
 }
+
+contract SemgrepTest__sol_style_event_param_fmt {
+    // ok: sol-style-event-param-fmt
+    event OwnerChanged(address previousOwner, address newOwner);
+
+    // ruleid: sol-style-event-param-fmt
+    event OwnerChanged(address _previousOwner, address _newOwner);
+
+    // ruleid: sol-style-event-param-fmt
+    event OwnerChanged(address);
+
+    // ruleid: sol-style-event-param-fmt
+    event OwnerChanged(address NEW_OWNER);
+
+    // ok: sol-style-event-param-fmt
+    event SomethingWithMint(uint256 mint);
+
+    // ruleid: sol-style-event-param-fmt
+    event SomethingWithMint(uint256 _mint);
+}

CONTRIBUTING.md

@@ -24,6 +24,34 @@ spelling, stylistic or grammatical errors in documentation, code or elsewhere.
 Pull Requests that ignore this guideline will be closed,
 and may be aggregated into new Pull Requests without attribution.
 
+### Trivial Changes Discouraged
+
+We kindly ask contributors **not to submit pull requests that only make trivial changes**, such as:
+
+- Adjusting whitespace, punctuation, or formatting without substantive content changes
+- Renaming variables or refactoring code without a clear functional or readability benefit
+- Other one‑line or cosmetic edits that do not materially improve the project
+
+#### Why we discourage trivial PRs
+
+While we appreciate every attempt to contribute, **small, non‑substantive PRs create significant review and merge overhead** for maintainers without meaningfully improving the codebase or documentation. Reviewing, testing, and merging even a one‑word change takes real time and effort.
+
+To keep maintainers focused on impactful contributions, we will:
+
+- **Close trivial PRs** that fall into the above categories
+- **Aggregate minor typo or formatting fixes internally** if needed, without attribution
+- Encourage contributors to instead take on meaningful issues, such as those labeled [`D-good-first-issue`](https://github.com/ethereum-optimism/optimism/labels/D-good-first-issue) or [`S-confirmed`](https://github.com/ethereum-optimism/optimism/labels/S-confirmed)
+
+#### Better ways to help
+
+If you’d like to contribute in a small but meaningful way:
+
+- **Batch several fixes into one PR** instead of submitting many tiny ones
+- Look for beginner‑friendly issues in our [`D-good-first-issue`](https://github.com/ethereum-optimism/optimism/labels/D-good-first-issue) label
+- Improve documentation by adding missing explanations, examples, or clarifications rather than small grammar tweaks
+
+This ensures your effort has a **real impact** and increases the chance your PR will be reviewed and merged quickly.
+
 ## Code of Conduct
 
 Interactions within this repository are subject to a [Code of Conduct](https://github.com/ethereum-optimism/.github/blob/master/CODE_OF_CONDUCT.md) adapted from the [Contributor Covenant](https://www.contributor-covenant.org/version/1/4/code-of-conduct/).

Makefile

@@ -21,13 +21,12 @@ build-contracts:
 .PHONY: build-contracts
 
 lint-go: ## Lints Go code with specific linters
-	golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is" ./...
-	golangci-lint run -E err113 --timeout 5m -e "errors.As" -e "errors.Is" ./op-program/client/...
+	golangci-lint run ./...
 	go mod tidy -diff
 .PHONY: lint-go
 
 lint-go-fix: ## Lints Go code with specific linters and fixes reported issues
-	golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is" ./... --fix
+	golangci-lint run ./... --fix
 .PHONY: lint-go-fix
 
 golang-docker: ## Builds Docker images for Go components using buildx
@@ -207,7 +206,6 @@ TEST_PKGS := \
 	./packages/contracts-bedrock/scripts/checks/... \
 	./op-dripper/... \
 	./devnet-sdk/... \
-	./op-acceptance-tests/... \
 	./kurtosis-devnet/... \
 	./op-devstack/... \
 	./op-deployer/pkg/deployer/artifacts/... \
@@ -231,6 +229,9 @@ RPC_TEST_PKGS := \
 	./op-deployer/pkg/deployer/pipeline/... \
 	./op-deployer/pkg/deployer/upgrade/...
 
+# All test packages used by CI (combination of all package groups)
+ALL_TEST_PACKAGES := $(TEST_PKGS) $(RPC_TEST_PKGS) $(FRAUD_PROOF_TEST_PKGS)
+
 # Common test environment variables
 # For setting PARALLEL, nproc is for linux, sysctl for Mac and then fallback to 4 if neither is available
 define DEFAULT_TEST_ENV_VARS
@@ -245,7 +246,9 @@ endef
 define CI_ENV_VARS
 export OP_TESTLOG_FILE_LOGGER_OUTDIR=$$(realpath ./tmp/testlogs) && \
 export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io" && \
-export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io"
+export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io" && \
+export NAT_INTEROP_LOADTEST_TARGET=10 && \
+export NAT_INTEROP_LOADTEST_TIMEOUT=30s
 endef
 
 # Test timeout (can be overridden via environment)
@@ -261,34 +264,48 @@ go-tests-short: $(TEST_DEPS) ## Runs comprehensive Go tests with -short flag
 	go test -short -parallel=$$PARALLEL -timeout=$(TEST_TIMEOUT) $(TEST_PKGS)
 .PHONY: go-tests-short
 
-go-tests-short-ci: ## Runs short Go tests with gotestsum for CI (assumes deps built by CI)
+# Internal target for running Go tests with gotestsum for CI
+# Usage: make _go-tests-ci-internal GO_TEST_FLAGS="-short"
+_go-tests-ci-internal:
 	@echo "Setting up test directories..."
 	mkdir -p ./tmp/test-results ./tmp/testlogs
 	@echo "Running Go tests with gotestsum..."
 	$(DEFAULT_TEST_ENV_VARS) && \
 	$(CI_ENV_VARS) && \
-	gotestsum --format=testname \
-		--junitfile=./tmp/test-results/results.xml \
-		--jsonfile=./tmp/testlogs/log.json \
-		--rerun-fails=3 \
-		--rerun-fails-max-failures=50 \
-		--packages="$(TEST_PKGS) $(RPC_TEST_PKGS) $(FRAUD_PROOF_TEST_PKGS)" \
-		-- -parallel=$$PARALLEL -coverprofile=coverage.out -short -timeout=$(TEST_TIMEOUT) -tags="ci"
+	if [ -n "$$CIRCLE_NODE_TOTAL" ] && [ "$$CIRCLE_NODE_TOTAL" -gt 1 ]; then \
+		export NODE_INDEX=$${CIRCLE_NODE_INDEX:-0} && \
+		export NODE_TOTAL=$${CIRCLE_NODE_TOTAL:-1} && \
+		export PARALLEL_PACKAGES=$$(echo "$(ALL_TEST_PACKAGES)" | tr ' ' '\n' | awk -v idx=$$NODE_INDEX -v total=$$NODE_TOTAL 'NR % total == idx' | tr '\n' ' ') && \
+		if [ -n "$$PARALLEL_PACKAGES" ]; then \
+			echo "Node $$NODE_INDEX/$$NODE_TOTAL running packages: $$PARALLEL_PACKAGES"; \
+			gotestsum --format=testname \
+				--junitfile=./tmp/test-results/results-$$NODE_INDEX.xml \
+				--jsonfile=./tmp/testlogs/log-$$NODE_INDEX.json \
+				--rerun-fails=3 \
+				--rerun-fails-max-failures=50 \
+				--packages="$$PARALLEL_PACKAGES" \
+				-- -parallel=$$PARALLEL -coverprofile=coverage-$$NODE_INDEX.out $(GO_TEST_FLAGS) -timeout=$(TEST_TIMEOUT) -tags="ci"; \
+		else \
+			echo "ERROR: Node $$NODE_INDEX/$$NODE_TOTAL has no packages to run! Perhaps parallelism is set too high? (ALL_TEST_PACKAGES has $$(echo '$(ALL_TEST_PACKAGES)' | wc -w) packages)"; \
+			exit 1; \
+		fi; \
+	else \
+		gotestsum --format=testname \
+			--junitfile=./tmp/test-results/results.xml \
+			--jsonfile=./tmp/testlogs/log.json \
+			--rerun-fails=3 \
+			--rerun-fails-max-failures=50 \
+			--packages="$(ALL_TEST_PACKAGES)" \
+			-- -parallel=$$PARALLEL -coverprofile=coverage.out $(GO_TEST_FLAGS) -timeout=$(TEST_TIMEOUT) -tags="ci"; \
+	fi
+.PHONY: _go-tests-ci-internal
+
+go-tests-short-ci: ## Runs short Go tests with gotestsum for CI (assumes deps built by CI)
+	$(MAKE) _go-tests-ci-internal GO_TEST_FLAGS="-short"
 .PHONY: go-tests-short-ci
 
 go-tests-ci: ## Runs comprehensive Go tests with gotestsum for CI (assumes deps built by CI)
-	@echo "Setting up test directories..."
-	mkdir -p ./tmp/test-results ./tmp/testlogs
-	@echo "Running Go tests with gotestsum..."
-	$(DEFAULT_TEST_ENV_VARS) && \
-	$(CI_ENV_VARS) && \
-	gotestsum --format=testname \
-		--junitfile=./tmp/test-results/results.xml \
-		--jsonfile=./tmp/testlogs/log.json \
-		--rerun-fails=3 \
-		--rerun-fails-max-failures=50 \
-		--packages="$(TEST_PKGS) $(RPC_TEST_PKGS) $(FRAUD_PROOF_TEST_PKGS)" \
-		-- -parallel=$$PARALLEL -coverprofile=coverage.out -timeout=$(TEST_TIMEOUT) -tags="ci"
+	$(MAKE) _go-tests-ci-internal GO_TEST_FLAGS=""
 .PHONY: go-tests-ci
 
 go-tests-fraud-proofs-ci: ## Runs fraud proofs Go tests with gotestsum for CI (assumes deps built by CI)