Merge branch 'optimism-v1.7.4' into feat/bump-op-v1.7.4

# Conflicts:
#	.circleci/config.yml
#	bedrock-devnet/devnet/__init__.py
#	go.mod
#	go.sum
#	op-batcher/batcher/config.go
#	op-batcher/batcher/driver.go
#	op-bindings/bindings/delayedweth.go
#	op-bindings/bindings/delayedweth_more.go
#	op-bindings/bindings/disputegamefactory.go
#	op-bindings/bindings/disputegamefactory_more.go
#	op-bindings/bindings/faultdisputegame.go
#	op-bindings/bindings/faultdisputegame_more.go
#	op-bindings/bindings/optimismportal.go
#	op-bindings/bindings/optimismportal_more.go
#	op-bindings/bindingspreview/optimismportal2.go
#	op-bindings/bindingspreview/optimismportal2_more.go
#	op-chain-ops/deployer/deployer.go
#	op-chain-ops/genesis/config.go
#	op-chain-ops/genesis/layer_one.go
#	op-chain-ops/genesis/layer_one_test.go
#	op-chain-ops/genesis/layer_two.go
#	op-chain-ops/genesis/layer_two_test.go
#	op-chain-ops/genesis/setters.go
#	op-chain-ops/immutables/immutables.go
#	op-challenger/cmd/list_claims.go
#	op-challenger/cmd/list_games.go
#	op-challenger/cmd/main_test.go
#	op-challenger/cmd/utils.go
#	op-challenger/game/fault/agent.go
#	op-challenger/game/fault/agent_test.go
#	op-challenger/game/fault/contracts/delayed_weth.go
#	op-challenger/game/fault/contracts/delayed_weth_test.go
#	op-challenger/game/fault/contracts/faultdisputegame.go
#	op-challenger/game/fault/contracts/faultdisputegame_test.go
#	op-challenger/game/fault/contracts/gamefactory.go
#	op-challenger/game/fault/contracts/gamefactory_test.go
#	op-challenger/game/fault/player.go
#	op-challenger/game/fault/register.go
#	op-challenger/game/service.go
#	op-challenger/metrics/metrics.go
#	op-challenger/metrics/noop.go
#	op-dispute-mon/mon/bonds/monitor.go
#	op-dispute-mon/mon/bonds/monitor_test.go
#	op-dispute-mon/mon/claims.go
#	op-dispute-mon/mon/claims_test.go
#	op-dispute-mon/mon/extract/bond_enricher_test.go
#	op-dispute-mon/mon/extract/caller.go
#	op-dispute-mon/mon/extract/claim_enricher.go
#	op-dispute-mon/mon/extract/claim_enricher_test.go
#	op-dispute-mon/mon/extract/extractor.go
#	op-dispute-mon/mon/extract/extractor_test.go
#	op-dispute-mon/mon/resolution/delay.go
#	op-dispute-mon/mon/resolution/delay_test.go
#	op-dispute-mon/mon/resolutions.go
#	op-dispute-mon/mon/resolutions_test.go
#	op-dispute-mon/mon/service.go
#	op-dispute-mon/mon/types/types.go
#	op-e2e/e2eutils/disputegame/output_alphabet_helper.go
#	op-e2e/e2eutils/disputegame/output_cannon_helper.go
#	op-e2e/e2eutils/disputegame/output_game_helper.go
#	op-node/rollup/derive/fuzz_parsers_test.go
#	op-node/rollup/types.go
#	op-plasma/daclient_test.go
#	op-ufm/go.mod
#	op-ufm/go.sum
#	ops-bedrock/docker-compose.yml
#	package.json
#	packages/contracts-bedrock/.gas-snapshot
#	packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
#	packages/contracts-bedrock/deploy-config/sepolia.json
#	packages/contracts-bedrock/lib/forge-std
#	packages/contracts-bedrock/package.json
#	packages/contracts-bedrock/scripts/Deploy.s.sol
#	packages/contracts-bedrock/scripts/autogen/generate-snapshots.ts
#	packages/contracts-bedrock/scripts/fpac/FPACOPS.s.sol
#	packages/contracts-bedrock/semver-lock.json
#	packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json
#	packages/contracts-bedrock/snapshots/abi/PermissionedDisputeGame.json
#	packages/contracts-bedrock/snapshots/state-diff/Kontrol-Deploy.json
#	packages/contracts-bedrock/snapshots/storageLayout/FaultDisputeGame.json
#	packages/contracts-bedrock/snapshots/storageLayout/PermissionedDisputeGame.json
#	packages/contracts-bedrock/src/L1/OptimismPortal2.sol
#	packages/contracts-bedrock/src/dispute/DisputeGameFactory.sol
#	packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
#	packages/contracts-bedrock/src/universal/StandardBridge.sol
#	packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
#	packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
#	packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
#	packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol
#	packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
#	packages/contracts-bedrock/test/governance/GovernanceToken.t.sol
#	packages/contracts-bedrock/test/governance/MintManager.t.sol
#	packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal.k.sol
#	packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol
#	packages/contracts-bedrock/test/kontrol/scripts/make-summary-deployment.sh
#	packages/contracts-bedrock/test/setup/Setup.sol
#	packages/contracts-ts/package.json
#	packages/fee-estimation/package.json
#	packages/sdk/package.json
#	packages/sdk/src/utils/contracts.ts
#	packages/web3js-plugin/package.json
#	pnpm-lock.yaml
#	proxyd/go.mod
#	proxyd/go.sum
#	versions.json

Author: iavl

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   ci_builder_image:
     type: string
-    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.46.1
+    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.48.0
   ci_builder_rust_image:
     type: string
     default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder-rust:latest
@@ -229,11 +229,17 @@ jobs:
             - "packages/contracts-bedrock/tsconfig.tsbuildinfo"
             - "packages/contracts-bedrock/tsconfig.build.tsbuildinfo"
             - ".devnet/allocs-l1.json"
+            - ".devnet/allocs-l2.json"
+            - ".devnet/allocs-l2-delta.json"
             - ".devnet/addresses.json"
             - ".devnet-fault-proofs/allocs-l1.json"
             - ".devnet-fault-proofs/addresses.json"
+            - ".devnet-fault-proofs/allocs-l2.json"
+            - ".devnet-fault-proofs/allocs-l2-delta.json"
             - ".devnet-plasma/allocs-l1.json"
             - ".devnet-plasma/addresses.json"
+            - ".devnet-plasma/allocs-l2.json"
+            - ".devnet-plasma/allocs-l2-delta.json"
             - "packages/contracts-bedrock/deploy-config/devnetL1.json"
             - "packages/contracts-bedrock/deployments/devnetL1"
 
@@ -506,6 +512,16 @@ jobs:
           command: |
             pnpm lint:check || echo "export LINT_STATUS=1" >> "$BASH_ENV"
           working_directory: packages/contracts-bedrock
+      - run:
+          # The solc warnings check must be the first step to build the contracts, that way the
+          # warnings are output here. On subsequent runs, forge will read artifacts from the cache
+          # so warnings would not occur.
+          name: solc warnings check
+          command: |
+            forge build --deny-warnings || echo "export SOLC_WARNINGS_CHECK=1" >> "$BASH_ENV"
+          environment:
+            FOUNDRY_PROFILE: ci
+          working_directory: packages/contracts-bedrock
       - run:
           name: gas snapshot
           command: |
@@ -525,13 +541,24 @@ jobs:
           command: |
             pnpm snapshots:check || echo "export SNAPSHOTS_STATUS=1" >> "$BASH_ENV"
           working_directory: packages/contracts-bedrock
+      - run:
+          name: size check
+          command: |
+            forge build --sizes --skip "/**/test/**" --skip "/**/scripts/**" || echo "export SIZE_CHECK=1" >> "$BASH_ENV"
+          environment:
+            FOUNDRY_PROFILE: ci
+          working_directory: packages/contracts-bedrock
       - run:
           name: check statuses
           command: |
             if [[ "$LINT_STATUS" -ne 0 ]]; then
               echo "Linting failed, see job output for details."
               FAILED=1
             fi
+            if [[ "$SOLC_WARNINGS_CHECK" -ne 0 ]]; then
+              echo "Solidity emitted warnings, see job output for details."
+              FAILED=1
+            fi
             if [[ "$GAS_SNAPSHOT_STATUS" -ne 0 ]]; then
               echo "Gas snapshot failed, see job output for details."
               FAILED=1
@@ -552,6 +579,10 @@ jobs:
               echo "Snapshots check failed, see job output for details."
               FAILED=1
             fi
+            if [[ "$SIZE_CHECK" -ne 0 ]]; then
+              echo "Contract(s) exceed size limit, see job output for details."
+              FAILED=1
+            fi
             if [[ "$FAILED" -ne 0 ]]; then
               exit 1
             fi
@@ -938,6 +969,8 @@ jobs:
           name: Load devnet-allocs
           command: |
             mkdir -p .devnet
+            cp /tmp/workspace/.devnet<<parameters.fpac>>/allocs-l2.json .devnet/allocs-l2.json
+            cp /tmp/workspace/.devnet<<parameters.fpac>>/allocs-l2-delta.json .devnet/allocs-l2-delta.json
             cp /tmp/workspace/.devnet<<parameters.fpac>>/allocs-l1.json .devnet/allocs-l1.json
             cp /tmp/workspace/.devnet<<parameters.fpac>>/addresses.json .devnet/addresses.json
             cp /tmp/workspace/packages/contracts-bedrock/deploy-config/devnetL1.json packages/contracts-bedrock/deploy-config/devnetL1.json
@@ -1130,6 +1163,8 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
+            - ".devnet/allocs-l2.json"
+            - ".devnet/allocs-l2-delta.json"
             - ".devnet/allocs-l1.json"
             - ".devnet/addresses.json"
             - "packages/contracts-bedrock/deploy-config/devnetL1.json"
@@ -1146,15 +1181,23 @@ jobs:
       DEVNET_NO_BUILD: 'true'
       # Default value; Can be overridden.
       DEVNET_FPAC: 'false'
+      DEVNET_PLASMA: 'false'
     steps:
       - checkout
       - when:
           condition:
-            equal: ['-fault-proofs', <<parameters.fpac>>]
+            equal: ['fault-proofs', <<parameters.fpac>>]
           steps:
             - run:
                 name: Set DEVNET_FPAC = true
                 command: echo 'export DEVNET_FPAC=true' >> $BASH_ENV
+      - when:
+          condition:
+            equal: ['plasma', <<parameters.fpac>>]
+          steps:
+            - run:
+                name: Set DEVNET_PLASMA = true
+                command: echo 'export DEVNET_PLASMA=true' >> $BASH_ENV
       - check-changed:
           patterns: op-(.+),packages,ops-bedrock,bedrock-devnet
       - run:
@@ -1202,6 +1245,14 @@ jobs:
           command: make submodules
       - attach_workspace:
           at: "."
+      - when:
+          condition:
+            not:
+              equal: ['legacy', <<parameters.fpac>>]
+          steps:
+            - run:
+                name: Use non-legacy devnet allocs
+                command: rm -r .devnet && mv .devnet-<<parameters.fpac>> .devnet
       - run:
           name: Load and tag docker images
           command: |
@@ -1211,11 +1262,13 @@ jobs:
             docker load < "./op-node.tar"
             docker load < "./op-proposer.tar"
             docker load < "./op-batcher.tar"
+            docker load < "./da-server.tar"
             # rename to the tags that the docker-compose of the devnet expects
             docker tag "$IMAGE_BASE_PREFIX/op-stack-go:<<pipeline.git.revision>>" "$IMAGE_BASE_PREFIX/op-stack-go:devnet"
             docker tag "$IMAGE_BASE_PREFIX/op-node:<<pipeline.git.revision>>" "$IMAGE_BASE_PREFIX/op-node:devnet"
             docker tag "$IMAGE_BASE_PREFIX/op-proposer:<<pipeline.git.revision>>" "$IMAGE_BASE_PREFIX/op-proposer:devnet"
             docker tag "$IMAGE_BASE_PREFIX/op-batcher:<<pipeline.git.revision>>" "$IMAGE_BASE_PREFIX/op-batcher:devnet"
+            docker tag "$IMAGE_BASE_PREFIX/da-server:<<pipeline.git.revision>>" "$IMAGE_BASE_PREFIX/da-server:devnet"
       - run:
           name: pnpm i
           command: |
@@ -1258,6 +1311,11 @@ jobs:
           command: |
             docker logs ops-bedrock-op-challenger-1 || echo "No logs."
           when: on_fail
+      - run:
+          name: Dump da-server logs
+          command: |
+            docker logs ops-bedrock-da-server-1 || echo "No logs."
+          when: on_fail
       - run:
           name: Log deployment artifact
           command: |
@@ -1663,7 +1721,7 @@ workflows:
           name: op-e2e-action-tests<< matrix.fpac >>
           matrix:
             parameters:
-              fpac: ["", "-fault-proofs"]
+              fpac: ["", "-fault-proofs", "-plasma"]
           module: op-e2e
           target: test-actions
           parallelism: 1
@@ -1772,18 +1830,25 @@ workflows:
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
           requires: ['op-stack-go-docker-build']
           save_image_tag: <<pipeline.git.revision>> # for devnet later
+      - docker-build:
+          name: da-server-docker-build
+          docker_name: da-server
+          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
+          requires: ['op-stack-go-docker-build']
+          save_image_tag: <<pipeline.git.revision>> # for devnet later
       - cannon-prestate:
           requires:
             - go-mod-download
       - devnet:
           matrix:
             parameters:
-              fpac: ["legacy", "fault-proofs"]
+              fpac: ["legacy", "fault-proofs", "plasma"]
           requires:
             - pnpm-monorepo
             - op-batcher-docker-build
             - op-proposer-docker-build
             - op-node-docker-build
+            - da-server-docker-build
             - cannon-prestate
       - docker-build:
           name: indexer-docker-build
@@ -1813,14 +1878,14 @@ workflows:
           type: approval
           filters:
             tags:
-              only: /^(proxyd|chain-mon|indexer|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
+              only: /^(da-server|proxyd|chain-mon|indexer|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
             branches:
               ignore: /.*/
       - docker-build: # just to warm up the cache (other jobs run in parallel)
           name: op-stack-go-docker-build-release
           filters:
             tags:
-              only: /^(proxyd|chain-mon|indexer|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
+              only: /^(da-server|proxyd|chain-mon|indexer|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
             branches:
               ignore: /.*/
           docker_name: op-stack-go
@@ -1933,6 +1998,21 @@ workflows:
           release: true
           context:
             - oplabs-gcr-release
+      - docker-build:
+          name: da-server-docker-release
+          filters:
+            tags:
+              only: /^da-server\/v.*/
+            branches:
+              ignore: /.*/
+          docker_name: da-server
+          docker_tags: <<pipeline.git.revision>>
+          requires: ['op-stack-go-docker-build-release']
+          platforms: "linux/amd64,linux/arm64"
+          publish: true
+          release: true
+          context:
+            - oplabs-gcr-release
       - docker-build:
           name: op-ufm-docker-release
           filters:

.github/CODEOWNERS

@@ -1,5 +1,6 @@
 # Packages
-/packages/chain-mon             @ethereum-optimism/devxpod
+/packages/chain-mon             @ethereum-optimism/security-reviewers
+/packages/chain-mon/src/balance-mon             @ethereum-optimism/infra-reviewers
 /packages/common-ts             @ethereum-optimism/typescript-reviewers
 /packages/contracts-bedrock     @ethereum-optimism/contract-reviewers
 /packages/core-utils            @ethereum-optimism/legacy-reviewers

.github/actions/setup/action.yml

@@ -4,9 +4,9 @@ runs:
   using: composite
   steps:
     - name: Setup pnpm
-      uses: pnpm/action-setup@v2
+      uses: pnpm/action-setup@v3
       with:
-        version: 8.6.5
+        version: 9
     - name: Setup node
       uses: actions/setup-node@v3
       with:

.github/workflows/tag-service.yml

@@ -30,6 +30,7 @@ on:
           - op-program
           - op-dispute-mon
           - op-ufm
+          - da-server
           - proxyd
           - ufm-metamask
           - op-contracts

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "packages/contracts-bedrock/lib/solmate"]
 	path = packages/contracts-bedrock/lib/solmate
 	url = https://github.com/transmissions11/solmate
-[submodule "packages/contracts-bedrock/lib/clones-with-immutable-args"]
-	path = packages/contracts-bedrock/lib/clones-with-immutable-args
-	url = https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args
 [submodule "packages/contracts-bedrock/lib/forge-std"]
 	path = packages/contracts-bedrock/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std

Makefile

@@ -41,6 +41,18 @@ golang-docker:
 			op-node op-batcher op-proposer op-challenger
 .PHONY: golang-docker
 
+chain-mon-docker:
+	# We don't use a buildx builder here, and just load directly into regular docker, for convenience.
+	GIT_COMMIT=$$(git rev-parse HEAD) \
+	GIT_DATE=$$(git show -s --format='%ct') \
+	IMAGE_TAGS=$$(git rev-parse HEAD),latest \
+	docker buildx bake \
+			--progress plain \
+			--load \
+			-f docker-bake.hcl \
+			chain-mon
+.PHONY: chain-mon-docker
+
 contracts-bedrock-docker:
 	IMAGE_TAGS=$$(git rev-parse HEAD),latest \
 	docker buildx bake \