Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

avm-transpiler/Cargo.lock

@@ -65,7 +65,7 @@
 |----------------------|---------|---------|---------------|--------------|
 | propose              | 334,960 | 352,320 |         4,580 |       73,280 |
 | submitEpochRootProof | 895,025 | 933,081 |         6,308 |      100,928 |
-| aggregate3           | 373,091 | 390,443 |             - |            - |
+| aggregate3           | 373,092 | 390,455 |             - |            - |
 | setupEpoch           |  49,728 | 542,190 |             - |            - |
 
 **Avg Gas Cost per Second**: 10,901.5 gas/second

l1-contracts/gas_benchmark.md

@@ -55,9 +55,9 @@
       },
       "aggregate3": {
         "calls": 100,
-        "min": 239389,
+        "min": 239377,
         "mean": 245657,
-        "median": 245991,
+        "median": 245997,
         "max": 265021
       }
     }
@@ -118,10 +118,10 @@
       },
       "aggregate3": {
         "calls": 100,
-        "min": 357506,
-        "mean": 373091,
-        "median": 373535,
-        "max": 390443
+        "min": 357518,
+        "mean": 373092,
+        "median": 373541,
+        "max": 390455
       }
     }
   }

l1-contracts/gas_benchmark_results.json

@@ -661,8 +661,9 @@ contract GSE is IGSE, GSECore {
   /**
    * @notice  Get the effective balance of the attester at the instance.
    *
-   *          The effective balance is the balance of the attester at the instance,
-   *          plus the balance of the attester at the bonus instance if the instance is the latest rollup.
+   *          The effective balance is the balance of the attester at the specific instance or at the bonus if the
+   *          instance is the latest rollup and he was not at the specific. We can do this as an `or` since the
+   *          attester may only be active at one of them.
    *
    * @param _instance   - The instance to look at
    * @param _attester   - The attester to look at
@@ -671,8 +672,8 @@ contract GSE is IGSE, GSECore {
    */
   function effectiveBalanceOf(address _instance, address _attester) external view override(IGSE) returns (uint256) {
     uint256 balance = delegation.getBalanceOf(_instance, _attester);
-    if (getLatestRollup() == _instance) {
-      balance += delegation.getBalanceOf(BONUS_INSTANCE_ADDRESS, _attester);
+    if (balance == 0 && getLatestRollup() == _instance) {
+      return delegation.getBalanceOf(BONUS_INSTANCE_ADDRESS, _attester);
     }
     return balance;
   }

l1-contracts/src/governance/GSE.sol

@@ -227,7 +227,7 @@ function bump_noir_repo_ref {
   git add noir-repo-ref
 
   # Update the Cargo.lock file in the transpiler to match the new ref.
-  cargo check --manifest-path="../avm-transpiler/Cargo.toml"
+  cargo update --workspace --manifest-path="../avm-transpiler/Cargo.toml"
 
   # Build nargo and run formatter on `noir-projects`
   build_native

noir/bootstrap.sh

@@ -1 +1 @@
-nightly-2025-08-15
+nightly-2025-08-20

noir/noir-repo-ref

@@ -1,7 +1,7 @@
-From e17834fb9768e2d5cfc053e4ce8c82da0586a099 Mon Sep 17 00:00:00 2001
+From 32263211e56ad073710fba5553d1d297e0d31f93 Mon Sep 17 00:00:00 2001
 From: TomAFrench <tom@tomfren.ch>
 Date: Sat, 15 Mar 2025 15:36:12 +0000
-Subject: [PATCH 1/2] chore: turn on `skipLibCheck`
+Subject: [PATCH 1/3] chore: turn on `skipLibCheck`
 
 ---
  tooling/noir_codegen/tsconfig.json | 1 +
@@ -19,5 +19,57 @@ index 30dd2a7ee..a2712fd73 100644
    },
    "include": [
      "src/**/*.ts"
---
+-- 
 2.43.0
+
+From 7e03e95028ef37f86d7fd0d99a534fcea50f4708 Mon Sep 17 00:00:00 2001
+From: Tom French <15848336+TomAFrench@users.noreply.github.com>
+Date: Wed, 20 Aug 2025 14:10:23 +0000
+Subject: [PATCH 3/3] chore: fix acvm_js test
+
+---
+ acvm-repo/acvm_js/test/node/build_info.test.ts | 5 ++---
+ acvm-repo/acvm_js/tsconfig.json                | 6 +++---
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/acvm-repo/acvm_js/test/node/build_info.test.ts b/acvm-repo/acvm_js/test/node/build_info.test.ts
+index 362fd91af..8b4c7f2eb 100644
+--- a/acvm-repo/acvm_js/test/node/build_info.test.ts
++++ b/acvm-repo/acvm_js/test/node/build_info.test.ts
+@@ -1,9 +1,8 @@
+ import { expect } from 'chai';
+-import acvm_js from '@noir-lang/acvm_js';
+-const { buildInfo } = acvm_js;
++import { buildInfo } from '@noir-lang/acvm_js';
+ 
+ import child_process from 'child_process';
+-import pkg from '../../package.json' with { type: 'json' };
++import pkg from '../../package.json';
+ 
+ it('returns the correct build info', () => {
+   let revision: string;
+diff --git a/acvm-repo/acvm_js/tsconfig.json b/acvm-repo/acvm_js/tsconfig.json
+index 4fd8e50df..791d6527a 100644
+--- a/acvm-repo/acvm_js/tsconfig.json
++++ b/acvm-repo/acvm_js/tsconfig.json
+@@ -2,8 +2,8 @@
+   "compilerOptions": {
+     "moduleResolution": "node",
+     "outDir": "lib",
+-    "target": "ESNext",
+-    "module": "ESNext",
++    "target": "esnext",
++    "module": "esnext",
+     "strict": true,
+     "experimentalDecorators": true,
+     "esModuleInterop": true,
+@@ -13,4 +13,4 @@
+     "sourceMap": true,
+     "resolveJsonModule": true,
+   }
+-}
+\ No newline at end of file
++}
+-- 
+2.43.0
+