Merge optimism 910c9ade

.circleci/config.yml

@@ -162,9 +162,9 @@ jobs:
         description: Whether to notify on failure
         type: boolean
         default: false
-      mips64:
-        type: boolean
-        default: false
+      mips_word_size:
+        type: integer
+        default: 32
     steps:
       - checkout
       - check-changed:
@@ -187,28 +187,34 @@ jobs:
           working_directory: cannon
       - when:
           condition:
-            not: <<parameters.mips64>>
+            equal: [32, <<parameters.mips_word_size>>]
           steps:
             - run:
                 name: Cannon Go 32-bit tests
                 command: |
                   export SKIP_SLOW_TESTS=<<parameters.skip_slow_tests>>
-                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon.xml --jsonfile=../tmp/testlogs/log.json \
-                  -- -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
+                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon-32.xml --jsonfile=../tmp/testlogs/log-32.json \
+                  -- -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage-32.out ./...
+                working_directory: cannon
+            - run:
+                name: Upload Cannon coverage
+                command: codecov --verbose --clean --flags cannon-go-tests-32 -f ./coverage-32.out
                 working_directory: cannon
       - when:
-          condition: <<parameters.mips64>>
+          condition:
+            equal: [64, <<parameters.mips_word_size>>]
           steps:
             - run:
                 name: Cannon Go 64-bit tests
                 command: |
                   export SKIP_SLOW_TESTS=<<parameters.skip_slow_tests>>
-                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon.xml --jsonfile=../tmp/testlogs/log.json \
-                  -- --tags=cannon64 -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
+                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon-64.xml --jsonfile=../tmp/testlogs/log-64.json \
+                  -- --tags=cannon64 -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage-64.out ./...
+                working_directory: cannon
+            - run:
+                name: Upload Cannon coverage
+                command: codecov --verbose --clean --flags cannon-go-tests-64 -f ./coverage-64.out
                 working_directory: cannon
-      - run:
-          name: upload Cannon coverage
-          command: codecov --verbose --clean --flags cannon-go-tests
       - store_test_results:
           path: ./tmp/test-results
       - store_artifacts:
@@ -676,6 +682,8 @@ jobs:
       - run:
           name: print forge version
           command: forge --version
+      - run-contracts-check:
+          command: check-kontrol-summaries-unchanged
       - run-contracts-check:
           command: semgrep-test-validity-check
       - run-contracts-check:
@@ -684,8 +692,6 @@ jobs:
           command: semver-lock
       - run-contracts-check:
           command: semver-diff-check-no-build
-      - run-contracts-check:
-          command: semver-natspec-check-no-build
       - run-contracts-check:
           command: validate-deploy-configs
       - run-contracts-check:
@@ -700,6 +706,8 @@ jobs:
           command: size-check
       - run-contracts-check:
           command: unused-imports-check-no-build
+      - run-contracts-check:
+          command: lint-forge-tests-check-no-build
 
   contracts-bedrock-validate-spacers:
     docker:
@@ -745,32 +753,19 @@ jobs:
         description: should load in foundry artifacts
         type: boolean
         default: false
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
     steps:
       - checkout
       - check-changed:
           patterns: "<<parameters.package_name>>"
       - attach_workspace:
           at: "."
           if: ${{ uses_artifacts }}
-      - restore_cache:
-          name: Restore Go modules cache
-          key: gomod-{{ checksum "go.sum" }}
-      - restore_cache:
-          name: Restore Go build cache
-          keys:
-            - golang-build-cache-fuzz-golang-{{ checksum "go.sum" }}
-            - golang-build-cache-fuzz-golang-
       - run:
           name: Fuzz
           command: make fuzz
           working_directory: "<<parameters.package_name>>"
-      - save_cache:
-          name: Save Go build cache
-          key: golang-build-cache-fuzz-golang-{{ checksum "go.sum" }}
-          paths:
-            - "/root/.cache/go-build"
 
   go-lint:
     machine: true
@@ -810,7 +805,7 @@ jobs:
           command: |
             echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
             sudo apt update
-            sudo apt install kurtosis-cli=1.3.0
+            sudo apt install kurtosis-cli=1.4.0
             kurtosis engine start
       - checkout
       - when:
@@ -864,7 +859,6 @@ jobs:
               op-service
               op-supervisor
               op-deployer
-              packages/contracts-bedrock/scripts/checks/semver-natspec
             )
             formatted_packages=""
             for package in "${packages[@]}"; do
@@ -905,6 +899,10 @@ jobs:
         description: Machine resource class
         type: string
         default: ethereum-optimism/latitude-1
+      skip_slow_tests:
+        description: Indicates that slow tests should be skipped
+        type: boolean
+        default: false
     machine: true
     resource_class: <<parameters.resource_class>>
     steps:
@@ -933,6 +931,7 @@ jobs:
             # need to explicitly set it here to prevent Cannon from running when we don't
             # want it to.
             export OP_E2E_CANNON_ENABLED="false"
+            export OP_E2E_SKIP_SLOW_TEST=<<parameters.skip_slow_tests>>
             # Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
             # constraint that gotestsum does not currently (nor likely will) accept files from different packages when building.
             JUNIT_FILE=../tmp/test-results/<<parameters.module>>_<<parameters.target>>.xml JSON_LOG_FILE=../tmp/testlogs/test.log make <<parameters.target>>
@@ -1032,7 +1031,7 @@ jobs:
           paths:
             - "/root/.cache/go-build"
       - notify-failures-on-develop:
-          mentions: "@proofs-squad"
+          mentions: "@proofs-team"
 
   semgrep-scan:
     parameters:
@@ -1245,10 +1244,28 @@ jobs:
         description: Goreleaser config file
         default: .goreleaser.yaml
         type: string
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
+    resource_class: large
     steps:
+      - setup_remote_docker
+      - gcp-cli/install
+      - gcp-oidc-authenticate:
+          gcp_cred_config_file_path: /root/gcp_cred_config.json
+          oidc_token_file_path: /root/oidc_token.json
       - checkout
+      - run:
+          name: Install goreleaser pro
+          command: |
+            mkdir -p /tmp/goreleaser
+            cd /tmp/goreleaser
+            curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.4.3-pro/goreleaser-pro_Linux_x86_64.tar.gz
+            tar -xzvf goreleaser.tgz
+            mv goreleaser /usr/local/bin/goreleaser
+      - run:
+          name: Configure Docker
+          command: |
+            gcloud auth configure-docker us-docker.pkg.dev
       - run:
           name: Run goreleaser
           command: |
@@ -1297,18 +1314,15 @@ workflows:
       - contracts-bedrock-validate-spacers:
           requires:
             - contracts-bedrock-build
-      - semgrep-scan
       - semgrep-scan:
           name: semgrep-scan-local
-          scan_command: semgrep scan --timeout=100 --config=./semgrep --error .
+          scan_command: semgrep scan --timeout=100 --config .semgrep/rules/ --error .
       - semgrep-scan:
           name: semgrep-test
-          scan_command: semgrep scan --test semgrep/
+          scan_command: semgrep scan --test --config .semgrep/rules/ .semgrep/tests/
       - go-lint
       - fuzz-golang:
           name: fuzz-golang-<<matrix.package_name>>
-          requires:
-            - go-mod-download
           on_changes: <<matrix.package_name>>
           matrix:
             parameters:
@@ -1322,13 +1336,13 @@ workflows:
           package_name: cannon
           on_changes: cannon,packages/contracts-bedrock/src/cannon
           uses_artifacts: true
-          requires: ["go-mod-download", "contracts-bedrock-build"]
+          requires: ["contracts-bedrock-build"]
       - fuzz-golang:
           name: op-e2e-fuzz
           package_name: op-e2e
           on_changes: op-e2e,packages/contracts-bedrock/src
           uses_artifacts: true
-          requires: ["go-mod-download", "contracts-bedrock-build"]
+          requires: ["contracts-bedrock-build"]
       - go-test:
           name: go-test-all
           requires:
@@ -1355,6 +1369,7 @@ workflows:
           name: op-e2e-fault-proof-tests
           module: op-e2e
           target: test-fault-proofs
+          skip_slow_tests: true
           requires:
             - contracts-bedrock-build
             - cannon-prestate
@@ -1364,7 +1379,8 @@ workflows:
             - go-mod-download
             - go-lint
             - cannon-build-test-vectors
-            - cannon-go-lint-and-test
+            - cannon-go-lint-and-test-32-bit
+            - cannon-go-lint-and-test-64-bit
             - check-generated-mocks-op-node
             - check-generated-mocks-op-service
             - go-mod-download
@@ -1402,10 +1418,14 @@ workflows:
       - check-generated-mocks-op-node
       - check-generated-mocks-op-service
       - cannon-go-lint-and-test:
+          name: cannon-go-lint-and-test-<<matrix.mips_word_size>>-bit
           requires:
             - contracts-bedrock-build
           skip_slow_tests: true
           notify: true
+          matrix:
+            parameters:
+              mips_word_size: [ 32, 64 ]
       - cannon-build-test-vectors
       - todo-issues:
           name: todo-issues-check
@@ -1575,6 +1595,7 @@ workflows:
           target: test-cannon
           notify: true
           mentions: "@proofs-team"
+          resource_class: ethereum-optimism/latitude-fps-1
           requires:
             - contracts-bedrock-build
             - cannon-prestate
@@ -1604,10 +1625,14 @@ workflows:
       - contracts-bedrock-build:
           skip_pattern: test
       - cannon-go-lint-and-test:
+          name: cannon-go-lint-and-test-<<matrix.mips_word_size>>-bit
           requires:
             - contracts-bedrock-build
           context:
             - slack
+          matrix:
+            parameters:
+              mips_word_size: [ 32, 64 ]
 
   scheduled-docker-publish:
     when: