Merge pull request #8363 from ethereum-optimism/refcell/fix-pre-pr-target

fix(ctb): Package pre-pr Target Fixes

.circleci/config.yml

@@ -432,12 +432,7 @@ jobs:
       - run:
           name: snapshots
           command: |
-            pnpm snapshots
-            if git diff --exit-code snapshots > /dev/null; then
-              [ -z "$(git ls-files --others --exclude-standard snapshots)" ] || echo "export SNAPSHOTS_STATUS=1" >> "$BASH_ENV"
-            else
-              echo "export SNAPSHOTS_STATUS=1" >> "$BASH_ENV"
-            fi
+            pnpm snapshots:check || echo "export SNAPSHOTS_STATUS=1" >> "$BASH_ENV"
           working_directory: packages/contracts-bedrock
       - run:
           name: check statuses

packages/contracts-bedrock/package.json

@@ -26,8 +26,9 @@
     "statediff": "./scripts/statediff.sh && git diff --exit-code",
     "gas-snapshot": "pnpm build:go-ffi && pnpm gas-snapshot:no-build",
     "snapshots": "npx tsx scripts/generate-snapshots.ts",
+    "snapshots:check": "./scripts/check-snapshots.sh",
     "slither": "./scripts/slither.sh",
-    "slither:check": "./scripts/slither.sh && git diff --exit-code",
+    "slither:check": "pnpm slither && git diff --exit-code",
     "slither:triage": "TRIAGE_MODE=1 ./scripts/slither.sh",
     "semver-lock": "forge script scripts/SemverLock.s.sol",
     "validate-deploy-configs": "./scripts/check-deploy-configs.sh",
@@ -35,7 +36,7 @@
     "validate-spacers": "pnpm build && pnpm validate-spacers:no-build",
     "clean": "rm -rf ./artifacts ./forge-artifacts ./cache ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo ./scripts/go-ffi/go-ffi ./.testdata ./deployments/hardhat/*",
     "preinstall": "npx only-allow pnpm",
-    "pre-pr:no-build": "pnpm gas-snapshot:no-build && pnpm storage-snapshot && pnpm semver-lock && pnpm autogen:invariant-docs && pnpm lint && pnpm bindings:go",
+    "pre-pr:no-build": "pnpm gas-snapshot:no-build && pnpm snapshots && pnpm semver-lock && pnpm autogen:invariant-docs && pnpm lint && pnpm bindings:go:no-build",
     "pre-pr": "pnpm clean && pnpm build:go-ffi && pnpm build && pnpm pre-pr:no-build",
     "pre-pr:full": "pnpm test && pnpm slither && pnpm validate-deploy-configs && pnpm validate-spacers && pnpm pre-pr",
     "lint:ts:check": "eslint . --max-warnings=0",

packages/contracts-bedrock/scripts/check-snapshots.sh

+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Generate the snapshots
+pnpm snapshots
+
+# Check if the generated snapshots are different from the committed snapshots
+if git diff --exit-code snapshots > /dev/null; then
+  [ -z "$(git ls-files --others --exclude-standard snapshots)" ] || exit 1
+else
+  exit 1
+fi