feat: merge-train/spartan (#24924)

AztecBot · web-flow · commit ab7be1f1c18b · 2026-07-23T13:58:00.000Z
BEGIN_COMMIT_OVERRIDE chore: declare bb.js and l1-artifacts portals once via root resolutions (#24917) fix(ci): report merge train merged alerts against the base branch (#24940) END_COMMIT_OVERRIDE
diff --git a/.github/workflows/merge-queue-dequeue-notify.yml b/.github/workflows/merge-queue-dequeue-notify.yml
@@ -37,5 +37,6 @@ jobs:
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           REF_NAME: ${{ github.event.pull_request.head.ref }}
+          TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
           PR_URL: ${{ github.event.pull_request.html_url }}
         run: ./ci3/merge_train_failure_slack_notify --merged
diff --git a/ci3/merge_train_failure_slack_notify b/ci3/merge_train_failure_slack_notify
@@ -55,7 +55,8 @@ if [[ "$MODE" == "dequeued" ]]; then
     --repo "${GITHUB_REPOSITORY:-}"
 
 elif [[ "$MODE" == "merged" ]]; then
-  "$TOPDIR/ci3/slack_notify" "PR merged into $REF_NAME: <$PR_URL|$commit_title> by $commit_author" "$channel"
+  merged_target="${TARGET_BRANCH:-$REF_NAME}"
+  "$TOPDIR/ci3/slack_notify" "PR merged into $merged_target: <$PR_URL|$commit_title> by $commit_author" "$channel"
 
 else
   "$TOPDIR/ci3/slack_notify_with_claudebox_kickoff" "$channel" \
diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
@@ -72,7 +72,7 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",
diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
@@ -67,15 +67,15 @@
   "dependencies": {
     "@aztec/archiver": "workspace:^",
     "@aztec/bb-prover": "workspace:^",
-    "@aztec/bb.js": "portal:../../barretenberg/ts",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/blob-client": "workspace:^",
     "@aztec/blob-lib": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/epoch-cache": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/node-keystore": "workspace:^",
     "@aztec/node-lib": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json
@@ -98,7 +98,7 @@
     "@aztec/entrypoints": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/standard-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",
diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json
@@ -33,7 +33,7 @@
     "@aztec/aztec-node": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
     "@aztec/bb-prover": "workspace:^",
-    "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/blob-client": "workspace:^",
     "@aztec/bot": "workspace:^",
     "@aztec/builder": "workspace:^",
@@ -43,7 +43,7 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/node-lib": "workspace:^",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
diff --git a/yarn-project/bb-prover/package.json b/yarn-project/bb-prover/package.json
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
diff --git a/yarn-project/bot/package.json b/yarn-project/bot/package.json
@@ -60,7 +60,7 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/noir-test-contracts.js": "workspace:^",
diff --git a/yarn-project/cli-wallet/package.json b/yarn-project/cli-wallet/package.json
@@ -69,7 +69,7 @@
   "dependencies": {
     "@aztec/accounts": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
-    "@aztec/bb.js": "workspace:^",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/cli": "workspace:^",
     "@aztec/entrypoints": "workspace:^",
     "@aztec/ethereum": "workspace:^",
diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json
@@ -84,7 +84,7 @@
     "@aztec/entrypoints": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/node-keystore": "workspace:^",
     "@aztec/node-lib": "workspace:^",
     "@aztec/p2p": "workspace:^",
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
@@ -35,7 +35,7 @@
     "@aztec/aztec-node": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
     "@aztec/bb-prover": "workspace:^",
-    "@aztec/bb.js": "workspace:^",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/blob-client": "workspace:^",
     "@aztec/blob-lib": "workspace:^",
     "@aztec/bot": "workspace:^",
@@ -46,7 +46,7 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/node-keystore": "workspace:^",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
diff --git a/yarn-project/epoch-cache/package.json b/yarn-project/epoch-cache/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@aztec/ethereum": "workspace:*",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/stdlib": "workspace:*",
     "dotenv": "^16.0.3",
     "get-port": "^7.1.0",
diff --git a/yarn-project/ethereum/package.json b/yarn-project/ethereum/package.json
@@ -52,7 +52,7 @@
     "@aztec/blob-lib": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",
     "lodash.pickby": "^4.5.0",
diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json
@@ -146,7 +146,7 @@
     "testEnvironment": "../../foundation/src/jest/env.mjs"
   },
   "dependencies": {
-    "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@koa/cors": "^5.0.0",
     "@noble/curves": "=1.7.0",
     "@noble/hashes": "^1.6.1",
diff --git a/yarn-project/ivc-integration/package.json b/yarn-project/ivc-integration/package.json
@@ -59,7 +59,7 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/noir-noir_codegen": "portal:../../noir/packages/noir_codegen",
diff --git a/yarn-project/native/package.json b/yarn-project/native/package.json
@@ -15,7 +15,7 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/bb.js": "workspace:^",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/foundation": "workspace:^",
     "msgpackr": "^1.11.2"
   },
diff --git a/yarn-project/package.json b/yarn-project/package.json
@@ -91,6 +91,7 @@
     "@aztec/bb-avm-sim-linux-x64": "portal:../barretenberg/ts/bb-avm-sim/packages/bb-avm-sim-linux-x64",
     "@aztec/bb.js": "portal:../barretenberg/ts/bb.js",
     "@aztec/ipc-runtime": "portal:../ipc-runtime/ts",
+    "@aztec/l1-artifacts": "portal:../l1-contracts/l1-artifacts",
     "@aztec/wsdb": "portal:../wsdb/ts",
     "@aztec/wsdb-darwin-arm64": "portal:../wsdb/ts/packages/wsdb-darwin-arm64",
     "@aztec/wsdb-darwin-x64": "portal:../wsdb/ts/packages/wsdb-darwin-x64",
diff --git a/yarn-project/prover-node/package.json b/yarn-project/prover-node/package.json
@@ -58,15 +58,15 @@
   "dependencies": {
     "@aztec/archiver": "workspace:^",
     "@aztec/bb-prover": "workspace:^",
-    "@aztec/bb.js": "workspace:^",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/blob-client": "workspace:^",
     "@aztec/blob-lib": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/epoch-cache": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/native": "workspace:^",
     "@aztec/node-keystore": "workspace:^",
     "@aztec/node-lib": "workspace:^",
diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@aztec/bb-prover": "workspace:^",
-    "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/builder": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/ethereum": "workspace:^",
diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
@@ -35,7 +35,7 @@
     "@aztec/epoch-cache": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/node-keystore": "workspace:^",
     "@aztec/noir-acvm_js": "portal:../../noir/packages/acvm_js",
     "@aztec/noir-contracts.js": "workspace:^",
diff --git a/yarn-project/slasher/package.json b/yarn-project/slasher/package.json
@@ -60,7 +60,7 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "source-map-support": "^0.5.21",
diff --git a/yarn-project/stdlib/package.json b/yarn-project/stdlib/package.json
@@ -92,12 +92,12 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/blob-lib": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-artifacts": "portal:../../l1-contracts/l1-artifacts",
+    "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.15.1",
diff --git a/yarn-project/txe/package.json b/yarn-project/txe/package.json
@@ -74,7 +74,7 @@
     "@aztec/aztec-node": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
     "@aztec/bb-prover": "workspace:^",
-    "@aztec/bb.js": "workspace:^",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/key-store": "workspace:^",
diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json
@@ -64,7 +64,7 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "workspace:^",
+    "@aztec/bb.js": "0.1.0-dummy",
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@`
`70`	`70`	`]`
`71`	`71`	`},`
`72`	`72`	`"dependencies": {`
`73`		`- "@aztec/bb.js": "portal:../../barretenberg/ts/bb.js",`
	`73`	`+ "@aztec/bb.js": "0.1.0-dummy",`
`74`	`74`	`"@aztec/constants": "workspace:^",`
`75`	`75`	`"@aztec/foundation": "workspace:^",`
`76`	`76`	`"@aztec/noir-noirc_abi": "portal:../../noir/packages/noirc_abi",`