Merge branch 'master' into revert-9996-revert-9961-ad/cache-disk-down…

…size
AztecProtocol · Nov 21, 2024 · 4dd708e · 4dd708e
2 parents 56f39ab + 570f70a
commit 4dd708e
Show file tree

Hide file tree

Showing 867 changed files with 83,980 additions and 44,881 deletions.
diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
@@ -699,10 +699,11 @@ function pollSpotStatus(config, ec2Client, ghClient) {
             }
             try {
                 core.info("Found ec2 instance, looking for runners.");
-                if (process.env.WAIT_FOR_RUNNERS === "false" || (yield ghClient.hasRunner([config.githubJobId]))) {
-                    // we have runners
-                    return instances[0].InstanceId;
-                }
+                // TODO find out whatever happened here but we seem to not be able to wait for runners
+                //if (process.env.WAIT_FOR_RUNNERS === "false" || await ghClient.hasRunner([config.githubJobId])) {
+                // we have runners
+                return instances[0].InstanceId;
+                //}
             }
             catch (err) { }
             // wait 10 seconds
@@ -835,12 +836,11 @@ function startWithGithubRunners(config) {
                 return false;
             }
             yield setupGithubRunners(ip, config);
-            if (instanceId)
-                yield ghClient.pollForRunnerCreation([config.githubJobId]);
-            else {
-                core.error("Instance failed to register with Github Actions");
-                throw Error("Instance failed to register with Github Actions");
-            }
+            // if (instanceId) await ghClient.pollForRunnerCreation([config.githubJobId]);
+            // else {
+            //  core.error("Instance failed to register with Github Actions");
+            //  throw Error("Instance failed to register with Github Actions");
+            // }
             core.info("Done setting up runner.");
         }
         // Export to github environment

diff --git a/.github/spot-runner-action/src/main.ts b/.github/spot-runner-action/src/main.ts
@@ -23,10 +23,11 @@ async function pollSpotStatus(
     }
     try {
       core.info("Found ec2 instance, looking for runners.");
-      if (process.env.WAIT_FOR_RUNNERS === "false" || await ghClient.hasRunner([config.githubJobId])) {
+      // TODO find out whatever happened here but we seem to not be able to wait for runners
+      //if (process.env.WAIT_FOR_RUNNERS === "false" || await ghClient.hasRunner([config.githubJobId])) {
         // we have runners
         return instances[0].InstanceId!;
-      }
+      //}
     } catch (err) {}
     // wait 10 seconds
     await new Promise((r) => setTimeout(r, 10000));
@@ -174,11 +175,11 @@ async function startWithGithubRunners(config: ActionConfig) {
       return false;
     }
     await setupGithubRunners(ip, config);
-    if (instanceId) await ghClient.pollForRunnerCreation([config.githubJobId]);
-    else {
-      core.error("Instance failed to register with Github Actions");
-      throw Error("Instance failed to register with Github Actions");
-    }
+    // if (instanceId) await ghClient.pollForRunnerCreation([config.githubJobId]);
+    // else {
+    //  core.error("Instance failed to register with Github Actions");
+    //  throw Error("Instance failed to register with Github Actions");
+    // }
     core.info("Done setting up runner.")
   }
   // Export to github environment

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -385,7 +385,7 @@ jobs:
         run: earthly-ci --no-output ./+test
 
   noir-build-acir-tests:
-    needs: [build, configure]
+    needs: [build-images, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -399,7 +399,7 @@ jobs:
         run: earthly-ci --no-output ./noir/+build-acir-tests
 
   bb-acir-tests-bb:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -414,7 +414,7 @@ jobs:
         run: earthly-ci --no-output ./+barretenberg-acir-tests-bb
 
   bb-acir-tests-bb-ultra-plonk:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -429,7 +429,7 @@ jobs:
         run: earthly-ci --no-output ./+barretenberg-acir-tests-bb-ultra-plonk
 
   bb-acir-tests-bb-ultra-honk:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -444,7 +444,7 @@ jobs:
         run: earthly-ci --no-output ./+barretenberg-acir-tests-bb-ultra-honk
 
   bb-acir-tests-bb-mega-honk:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -459,7 +459,7 @@ jobs:
         run: earthly-ci --no-output ./+barretenberg-acir-tests-bb-mega-honk
 
   bb-acir-tests-sol:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -474,7 +474,7 @@ jobs:
         run: earthly-ci --no-output ./+barretenberg-acir-tests-sol
 
   bb-acir-tests-sol-honk:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -489,7 +489,7 @@ jobs:
         run: earthly-ci --no-output ./+barretenberg-acir-tests-sol-honk
 
   bb-acir-tests-bb-js:
-    needs: [noir-build-acir-tests, configure]
+    needs: [noir-build-acir-tests, build, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
     steps:
@@ -715,6 +715,10 @@ jobs:
             values: 16-validators
             runner_type: 16core-tester-x86
             timeout: 60
+          - test: gating-passive.test.ts
+            values: 16-validators
+            runner_type: 16core-tester-x86
+            timeout: 60
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -752,7 +756,7 @@ jobs:
           path: network-test.log
 
   l1-contracts-test:
-    needs: [build, configure]
+    needs: [build-images, configure]
     runs-on: ${{ needs.configure.outputs.username }}-x86
     if: needs.configure.outputs.l1-contracts == 'true'
     steps:

diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml
@@ -275,6 +275,19 @@ jobs:
         with:
           concurrency_key: publish-npm
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
+
+      - name: Publish bb.js NPM package
+        run: |
+          DEPLOY_TAG=${{ env.DEPLOY_TAG }}
+          VERSION=${DEPLOY_TAG#aztec-packages-v}
+          earthly-ci \
+            --no-output \
+            --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
+            ./barretenberg/ts+publish-npm \
+            --DIST_TAG=latest \
+            --VERSION=$VERSION \
+            --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
+
       - name: Publish yarn-project NPM packages
         run: |
           DEPLOY_TAG=${{ env.DEPLOY_TAG }}
@@ -287,14 +300,14 @@ jobs:
             --VERSION=$VERSION \
             --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
 
-      - name: Publish bb.js NPM package
+      - name: Publish l1-contracts NPM package
         run: |
           DEPLOY_TAG=${{ env.DEPLOY_TAG }}
           VERSION=${DEPLOY_TAG#aztec-packages-v}
           earthly-ci \
             --no-output \
             --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
-            ./barretenberg/ts+publish-npm \
+            ./l1-contracts+publish-npm \
             --DIST_TAG=latest \
             --VERSION=$VERSION \
             --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}

diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-13856a121125b1ccca15919942081a5d157d280e
+68c32b4ffd9b069fe4b119327dbf4018c17ab9d4
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.62.0",
+  ".": "0.63.1",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.62.0",
-  "barretenberg": "0.62.0",
-  "barretenberg/ts": "0.62.0"
+  "yarn-project/aztec": "0.63.1",
+  "barretenberg": "0.63.1",
+  "barretenberg/ts": "0.63.1"
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		13856a121125b1ccca15919942081a5d157d280e
		68c32b4ffd9b069fe4b119327dbf4018c17ab9d4