Merge branch 'op-es' into delta_testnet

Author: blockchaindevsh

.circleci/config.yml

@@ -3,13 +3,17 @@ description:
 globs: *.sol
 alwaysApply: false
 ---
+
 # Optimism Solidity Style Guide
 
 Applies to Solidity files.
 
 ## Comments
-- Use triple-slash solidity natspec comment style
-- Always use `@notice` instead of `@dev`
+
+- NatSpec documentation comments must use the triple-slash `///` style
+- Use `//` for regular inline comments that are not NatSpec
+- Use `@notice` for documenting what a function/contract does (external-facing documentation)
+- Use `@dev` for internal developer notes, reminders, or invariants (e.g., "when updating this, also update X")
 - Use a line-length of 100 characters
 - Custom tags:
   - `@custom:proxied`: Add to a contract whenever it's meant to live behind a proxy
@@ -19,10 +23,12 @@ Applies to Solidity files.
   - `@custom:network-specific`: Add to state variables which vary between OP Chains
 
 ## Errors
+
 - When adding new errors, always use custom Solidity errors
 - Custom errors should take the format `ContractName_ErrorDescription`
 
 ## Naming Conventions
+
 - Function parameters should be prefixed with an underscore
 - Function return arguments should be suffixed with an underscore
 - Event parameters should NOT be prefixed with an underscore
@@ -33,6 +39,7 @@ Applies to Solidity files.
 - Spacers must be named `spacer_<slot>_<offset>_<length>` and be `private`
 
 ## Upgradeability
+
 - Contracts should be built assuming upgradeability by default
 - Extend OpenZeppelin's `Initializable` or base contract
 - Use the `ReinitializableBase` contract
@@ -43,6 +50,7 @@ Applies to Solidity files.
   - Set any immutables (though generally avoid immutables)
 
 ## Versioning
+
 - All non-library/non-abstract contracts must inherit `ISemver` and expose `version()`
 - Production-ready contracts must have version `1.0.0` or greater
 - Version increments:
@@ -53,12 +61,15 @@ Applies to Solidity files.
 AI code review tools should NOT comment on the choice of version increment.
 
 ## Dependencies
+
 - Prefer OpenZeppelin's Upgradeable contracts for basic functionality
 
 ## State Changes
+
 - All state changing functions should emit a corresponding event
 
 ## Testing
+
 - Tests should be written using Foundry
 - For testing reverts with low-level calls, use the `revertsAsExpected` pattern
 - Test function naming: `[method]_[functionName]_[reason]_[status]`

.cursor/rules/solidity-styles.mdc

@@ -13,6 +13,9 @@
 /op-devstack    @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
 
 # Expert areas
+/op-deployer    @ethereum-optimism/platforms-team
+/op-validator   @ethereum-optimism/platforms-team
+
 /op-node/rollup @ethereum-optimism/consensus @ethereum-optimism/go-reviewers
 
 /op-supervisor  @ethereum-optimism/interop @ethereum-optimism/go-reviewers

.github/CODEOWNERS

@@ -0,0 +1,40 @@
+name: 'Docker Build Prep'
+description: 'Prepare environment for docker builds (checkout, kona version, git versions)'
+
+outputs:
+  versions:
+    description: 'JSON object mapping image names to their GIT_VERSION'
+    value: ${{ steps.compute_versions.outputs.versions }}
+  kona_version:
+    description: 'KONA_VERSION from kona/version.json'
+    value: ${{ steps.kona.outputs.version }}
+  date:
+    description: 'Current date in YYYYMMDD format'
+    value: ${{ steps.date.outputs.date }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Get date
+      id: date
+      shell: bash
+      run: |
+        DATE=$(date +%Y%m%d)
+        echo "date=$DATE" >> $GITHUB_OUTPUT
+
+    - name: Read KONA_VERSION from kona/version.json
+      id: kona
+      shell: bash
+      run: |
+        KONA_VERSION=$(jq -r .version kona/version.json)
+        echo "version=$KONA_VERSION" >> $GITHUB_OUTPUT
+        echo "KONA_VERSION: $KONA_VERSION"
+
+    - name: Compute GIT_VERSION for all images
+      id: compute_versions
+      shell: bash
+      run: |
+        VERSIONS=$(GIT_COMMIT="${{ github.sha }}" make compute-git-versions)
+        echo "versions=$VERSIONS" >> $GITHUB_OUTPUT
+        echo "Computed versions: $VERSIONS"
+

.github/actions/docker-build-prep/action.yml

@@ -0,0 +1,122 @@
+name: branch build
+
+on:
+  push:
+    branches:
+      - 'develop'
+  pull_request:
+    branches:
+      - 'develop'
+    paths:
+      - 'ops/docker/**'
+      - 'packages/contracts-bedrock/**'
+      - 'docker-bake.hcl'
+      - '.github/workflows/branches.yaml'
+      - 'ops/scripts/compute-git-versions.sh'
+
+jobs:
+  prep:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      versions: ${{ steps.prep.outputs.versions }}
+      kona_version: ${{ steps.prep.outputs.kona_version }}
+      date: ${{ steps.prep.outputs.date }}
+    steps:
+      - name: Harden the runner
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2
+        with:
+          egress-policy: audit
+      - name: Checkout
+        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e # v6
+        with:
+          fetch-depth: 0
+      - uses: ./.github/actions/docker-build-prep
+        id: prep
+
+  local:
+    needs: prep
+    # only build if push to develop, or PR from a local branch (not a fork)
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
+    strategy:
+      fail-fast: false
+      matrix:
+        image_name:
+          - op-node
+          - op-batcher
+          - op-deployer
+          - op-faucet
+          - op-program
+          - op-proposer
+          - op-challenger
+          - op-dispute-mon
+          - op-conductor
+          - da-server
+          - op-supervisor
+          - op-supernode
+          - op-test-sequencer
+          - cannon
+          - op-dripper
+          - op-interop-mon
+    uses: ethereum-optimism/factory/.github/workflows/docker.yaml@d04222c229c50320f513afe678b3264869ea11a9
+    with:
+      mode: bake
+      image_name: ${{ matrix.image_name }}
+      bake_file: docker-bake.hcl
+      target: ${{ matrix.image_name }}
+      tag: ${{ github.event_name == 'push' && 'develop' || format('pr-{0}', github.event.pull_request.number) }}
+      gcp_project_id: ${{ vars.GCP_PROJECT_ID_OPLABS_TOOLS_ARTIFACTS }}
+      registry: us-docker.pkg.dev/oplabs-tools-artifacts/oss
+      env: |
+        GIT_VERSION=${{ fromJson(needs.prep.outputs.versions)[matrix.image_name] }}
+        KONA_VERSION=${{ needs.prep.outputs.kona_version }}
+      set: |
+        *.args.GIT_COMMIT=${{ github.sha }}
+        *.args.GIT_DATE=${{ needs.prep.outputs.date }}
+    permissions:
+      contents: read
+      id-token: write
+      attestations: write
+
+  fork:
+    needs: prep
+    # only build if PR from a fork
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+    strategy:
+      fail-fast: false
+      matrix:
+        image_name:
+          - op-node
+          - op-batcher
+          - op-deployer
+          - op-faucet
+          - op-program
+          - op-proposer
+          - op-challenger
+          - op-dispute-mon
+          - op-conductor
+          - da-server
+          - op-supervisor
+          - op-supernode
+          - op-test-sequencer
+          - cannon
+          - op-dripper
+          - op-interop-mon
+    uses: ethereum-optimism/factory/.github/workflows/docker.yaml@d04222c229c50320f513afe678b3264869ea11a9
+    with:
+      mode: bake
+      image_name: ${{ matrix.image_name }}
+      bake_file: docker-bake.hcl
+      target: ${{ matrix.image_name }}
+      tag: 24h
+      registry: ttl.sh/${{ github.sha }}
+      env: |
+        GIT_VERSION=${{ fromJson(needs.prep.outputs.versions)[matrix.image_name] }}
+        KONA_VERSION=${{ needs.prep.outputs.kona_version }}
+      set: |
+        *.args.GIT_COMMIT=${{ github.sha }}
+        *.args.GIT_DATE=${{ needs.prep.outputs.date }}
+    permissions:
+      contents: read
+

.github/workflows/branches.yaml

@@ -0,0 +1,53 @@
+name: tag build
+
+on:
+  push:
+    tags:
+      - '*/v*' # Match tags like op-node/v1.2.3
+
+jobs:
+  prep:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      image_name: ${{ steps.parse-tag.outputs.image_name }}
+      version: ${{ steps.parse-tag.outputs.version }}
+      versions: ${{ steps.prep.outputs.versions }}
+      kona_version: ${{ steps.prep.outputs.kona_version }}
+    steps:
+      - name: Harden the runner
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2
+        with:
+          egress-policy: audit
+      - name: Checkout
+        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e # v6
+        with:
+          fetch-depth: 0
+      - uses: ./.github/actions/docker-build-prep
+        id: prep
+      - name: Parse tag
+        uses: ethereum-optimism/factory/actions/parse-tag@240b16167a5f5aa789270fa9c0efbfa9f010b7e7
+        id: parse-tag
+
+  release:
+    needs: prep
+    uses: ethereum-optimism/factory/.github/workflows/docker.yaml@d04222c229c50320f513afe678b3264869ea11a9
+    with:
+      mode: bake
+      image_name: ${{ needs.prep.outputs.image_name }}
+      bake_file: docker-bake.hcl
+      target: ${{ needs.prep.outputs.image_name }}
+      tag: ${{ needs.prep.outputs.version }}
+      gcp_project_id: ${{ vars.GCP_PROJECT_ID_OPLABS_TOOLS_ARTIFACTS }}
+      registry: us-docker.pkg.dev/oplabs-tools-artifacts/oss
+      env: |
+        GIT_VERSION=${{ fromJson(needs.prep.outputs.versions)[needs.prep.outputs.image_name] }}
+        KONA_VERSION=${{ needs.prep.outputs.kona_version }}
+      set: |
+        *.args.GIT_COMMIT=${{ github.sha }}
+        *.args.GIT_DATE=${{ github.event.head_commit.timestamp }}
+    permissions:
+      contents: read
+      id-token: write
+      attestations: write