Merge branch 'master' into saleel/bb-gates

.test_patterns.yml

@@ -101,6 +101,10 @@ tests:
     owners:
       - "UKUMA5J7K" # charlie
 
+  - regex: "simple e2e_fees/private_payments"
+    owners:
+      - "U02G4KAD57Y" # phil
+
   # Summary of all failing tests
   #  FAIL  ./e2e_cheat_codes.test.ts
   #   ● e2e_cheat_codes › L1 cheatcodes › setNextBlockTimestamp
@@ -157,7 +161,12 @@ tests:
       - "U03E5SYLY3Z" # lasse
 
   # kind tests
-  - regex: "spartan/bootstrap.sh"
+  - regex: "spartan/bootstrap.sh test-kind"
+    owners:
+      - "UKUMA5J7K" # charlie
+      - "U04BM8H25NJ" # adam
+  - regex: "spartan/bootstrap.sh test-local"
+    skip: true
     owners:
       - "UKUMA5J7K" # charlie
       - "U04BM8H25NJ" # adam

barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts

@@ -6,7 +6,10 @@ export async function fetchCode(multithreaded: boolean, wasmPath?: string) {
   let url: string;
   if (wasmPath) {
     const suffix = multithreaded ? '-threads' : '';
-    url = `${wasmPath}/barretenberg${suffix}.wasm.gz`;
+    const filePath = wasmPath.split('/').slice(0, -1).join('/');
+    const fileNameWithExtensions = wasmPath.split('/').pop();
+    const [fileName, ...extensions] = fileNameWithExtensions!.split('.');
+    url = `${filePath}/${fileName}${suffix}.${extensions.join('.')}`;
   } else {
     url = multithreaded
       ? (await import(/* webpackIgnore: true */ './barretenberg-threads.js')).default

boxes/boxes/react/src/config.ts

@@ -1,5 +1,4 @@
 import { createPXEClient, PXE } from '@aztec/aztec.js';
-import { BoxReactContractArtifact } from '../artifacts/BoxReact';
 import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing/lazy';
 
 export class PrivateEnv {
@@ -22,6 +21,3 @@ export class PrivateEnv {
 }
 
 export const deployerEnv = await PrivateEnv.create(process.env.PXE_URL || 'http://localhost:8080');
-
-const IGNORE_FUNCTIONS = ['constructor'];
-export const filteredInterface = BoxReactContractArtifact.functions.filter(f => !IGNORE_FUNCTIONS.includes(f.name));

boxes/boxes/react/src/hooks/useContract.tsx

@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { deployerEnv } from '../config';
 
 import { Contract, Fr } from '@aztec/aztec.js';
-import { BoxReactContract } from '../../artifacts/BoxReact';
 import { toast } from 'react-toastify';
 
 export function useContract() {
@@ -16,11 +15,9 @@ export function useContract() {
     const wallet = await deployerEnv.getWallet();
     const salt = Fr.random();
 
-    const tx = await BoxReactContract.deploy(
-      wallet,
-      Fr.random(),
-      wallet.getCompleteAddress().address,
-    ).send({
+    const { BoxReactContract } = await import('../../artifacts/BoxReact');
+
+    const tx = await BoxReactContract.deploy(wallet, Fr.random(), wallet.getCompleteAddress().address).send({
       contractAddressSalt: salt,
     });
     const contract = await toast.promise(tx.deployed(), {

boxes/boxes/react/src/pages/contract.tsx

@@ -1,12 +1,15 @@
 import { useState } from 'react';
 import { Contract } from '@aztec/aztec.js';
 import { useNumber } from '../hooks/useNumber';
-import { filteredInterface } from '../config';
+
+const IGNORE_FUNCTIONS = ['constructor', 'process_log', 'sync_notes'];
 
 export function ContractComponent({ contract }: { contract: Contract }) {
   const [showInput, setShowInput] = useState(true);
   const { wait, getNumber, setNumber } = useNumber({ contract });
 
+  const filteredInterface = contract.artifact.functions.filter(f => !IGNORE_FUNCTIONS.includes(f.name));
+
   return (
     <div>
       <h1>Your Contract</h1>

boxes/boxes/vite/playwright.config.ts

@@ -5,7 +5,7 @@ export default defineConfig({
   testMatch: "**.spec.ts",
   fullyParallel: true,
   retries: 3,
-  workers: process.env.CI ? 1 : 3,
+  workers: 1,
   reporter: "list",
   use: {
     baseURL: "http://127.0.0.1:5173",

boxes/boxes/vite/src/config.ts

@@ -13,7 +13,6 @@ import { PXEServiceConfig, getPXEServiceConfig } from "@aztec/pxe/config";
 import { KVPxeDatabase } from "@aztec/pxe/database";
 import { PXEService } from "@aztec/pxe/service";
 import { WASMSimulator } from "@aztec/simulator/client";
-import { BoxReactContractArtifact } from "../artifacts/BoxReact";
 import { LazyProtocolContractsProvider } from "@aztec/protocol-contracts/providers/lazy";
 
 export class PrivateEnv {
@@ -31,7 +30,7 @@ export class PrivateEnv {
     const simulationProvider = new WASMSimulator();
     const proofCreator = new BBWASMLazyPrivateKernelProver(
       simulationProvider,
-      16
+      16,
     );
     const l1Contracts = await aztecNode.getL1ContractAddresses();
     const configWithContracts = {
@@ -42,7 +41,7 @@ export class PrivateEnv {
     const store = await createStore(
       "pxe_data",
       configWithContracts,
-      createLogger("pxe:data:idb")
+      createLogger("pxe:data:idb"),
     );
 
     const keyStore = new KeyStore(store);
@@ -60,15 +59,15 @@ export class PrivateEnv {
       proofCreator,
       simulationProvider,
       protocolContractsProvider,
-      config
+      config,
     );
     await this.pxe.init();
     const [accountData] = await getInitialTestAccounts();
     const account = await getSchnorrAccount(
       this.pxe,
       accountData.secret,
       accountData.signingKey,
-      accountData.salt
+      accountData.salt,
     );
     await account.register();
     this.wallet = await account.getWallet();
@@ -80,8 +79,3 @@ export class PrivateEnv {
 }
 
 export const deployerEnv = new PrivateEnv();
-
-const IGNORE_FUNCTIONS = ["constructor", "process_log", "sync_notes"];
-export const filteredInterface = BoxReactContractArtifact.functions.filter(
-  (f) => !IGNORE_FUNCTIONS.includes(f.name)
-);

boxes/boxes/vite/src/hooks/useContract.tsx

@@ -2,7 +2,6 @@ import { useState } from "react";
 import { deployerEnv } from "../config";
 
 import { Contract, Fr } from "@aztec/aztec.js";
-import { BoxReactContract } from "../../artifacts/BoxReact";
 import { toast } from "react-toastify";
 
 export function useContract() {
@@ -17,6 +16,8 @@ export function useContract() {
     const wallet = await deployerEnv.getWallet();
     const salt = Fr.random();
 
+    const { BoxReactContract } = await import("../../artifacts/BoxReact");
+
     const tx = await BoxReactContract.deploy(
       wallet,
       Fr.random(),

boxes/boxes/vite/src/pages/contract.tsx

@@ -1,12 +1,17 @@
-import { useState } from 'react';
-import { Contract } from '@aztec/aztec.js';
-import { useNumber } from '../hooks/useNumber';
-import { filteredInterface } from '../config';
+import { useState } from "react";
+import { Contract } from "@aztec/aztec.js";
+import { useNumber } from "../hooks/useNumber";
+
+const IGNORE_FUNCTIONS = ["constructor", "process_log", "sync_notes"];
 
 export function ContractComponent({ contract }: { contract: Contract }) {
   const [showInput, setShowInput] = useState(true);
   const { wait, getNumber, setNumber } = useNumber({ contract });
 
+  const filteredInterface = contract.artifact.functions.filter(
+    (f) => !IGNORE_FUNCTIONS.includes(f.name),
+  );
+
   return (
     <div>
       <h1>Your Contract</h1>
@@ -15,7 +20,7 @@ export function ContractComponent({ contract }: { contract: Contract }) {
         <select name="viewFunctions" id="viewFunctions">
           {filteredInterface.map(
             (fn, index) =>
-              fn.functionType === 'unconstrained' && (
+              fn.functionType === "unconstrained" && (
                 <option key={index} value={index}>
                   {fn.name}
                 </option>
@@ -29,17 +34,26 @@ export function ContractComponent({ contract }: { contract: Contract }) {
 
       <form onSubmit={setNumber}>
         <label htmlFor="functions">Functions:</label>
-        <select name="functions" id="functions" onChange={() => setShowInput(true)}>
+        <select
+          name="functions"
+          id="functions"
+          onChange={() => setShowInput(true)}
+        >
           {filteredInterface.map(
             (fn, index) =>
-              fn.functionType !== 'unconstrained' && (
+              fn.functionType !== "unconstrained" && (
                 <option key={index} value={index}>
                   {fn.name}
                 </option>
               ),
           )}
         </select>
-        <input type="number" name="numberToSet" id="numberToSet" hidden={!showInput} />
+        <input
+          type="number"
+          name="numberToSet"
+          id="numberToSet"
+          hidden={!showInput}
+        />
         <button type="submit" disabled={wait}>
           Write
         </button>

boxes/boxes/vite/vite.config.ts

@@ -24,7 +24,7 @@ const nodePolyfillsFix = (options?: PolyfillOptions | undefined): Plugin => {
 
 // https://vite.dev/config/
 export default defineConfig({
-  logLevel: "error",
+  //logLevel: "error",
   server: {
     // Headers needed for bb WASM to work in multithreaded mode
     headers: {

ci3/run_test_cmd

@@ -34,7 +34,7 @@ Command: $cmd
 Commit: https://github.com/AztecProtocol/aztec-packages/commit/$COMMIT_HASH
 Env: REF_NAME=$REF_NAME CURRENT_VERSION=$CURRENT_VERSION CI_FULL=$CI_FULL
 Date: $(date)
-Sys: ARCH=$(arch) CPUS=$(nproc) HOSTNAME=$(hostname)
+Sys: ARCH=$(arch) CPUS=$(nproc) MEM=$(free -h | awk '/^Mem:/{print $2}') HOSTNAME=$(hostname)
 
 EOF
 # Remove the tmp fail on exit.

l1-contracts/src/governance/Governance.sol

@@ -48,13 +48,13 @@ contract Governance is IGovernance {
 
     configuration = DataStructures.Configuration({
       proposeConfig: DataStructures.ProposeConfiguration({
-        lockDelay: Timestamp.wrap(3600),
+        lockDelay: Timestamp.wrap(60),
         lockAmount: 1000e18
       }),
-      votingDelay: Timestamp.wrap(3600),
-      votingDuration: Timestamp.wrap(3600),
-      executionDelay: Timestamp.wrap(3600),
-      gracePeriod: Timestamp.wrap(3600),
+      votingDelay: Timestamp.wrap(60),
+      votingDuration: Timestamp.wrap(60),
+      executionDelay: Timestamp.wrap(60),
+      gracePeriod: Timestamp.wrap(60),
       quorum: 0.1e18,
       voteDifferential: 0.04e18,
       minimumVotes: 1000e18

l1-contracts/src/governance/libraries/ConfigurationLib.sol

@@ -16,7 +16,7 @@ library ConfigurationLib {
 
   uint256 internal constant VOTES_LOWER = 1;
 
-  Timestamp internal constant TIME_LOWER = Timestamp.wrap(3600);
+  Timestamp internal constant TIME_LOWER = Timestamp.wrap(60);
   Timestamp internal constant TIME_UPPER = Timestamp.wrap(30 * 24 * 3600);
 
   function withdrawalDelay(DataStructures.Configuration storage _self)

l1-contracts/src/governance/libraries/DataStructures.sol

@@ -44,6 +44,7 @@ library DataStructures {
     uint256 nea;
   }
 
+  // @notice if this changes, please update the enum in governance.ts
   enum ProposalState {
     Pending,
     Active,

l1-contracts/test/governance/governance/finaliseWithdraw.t.sol

@@ -98,6 +98,9 @@ contract FinaliseWithdrawTest is GovernanceBase {
     uint256 withdrawalCount = governance.withdrawalCount();
     for (uint256 i = 0; i < withdrawalCount; i++) {
       DataStructures.Withdrawal memory withdrawal = governance.getWithdrawal(i);
+      if (Timestamp.unwrap(withdrawal.unlocksAt) <= block.timestamp) {
+        continue;
+      }
       assertGt(withdrawal.unlocksAt, block.timestamp);
 
       uint256 time =

noir-projects/aztec-nr/aztec/src/macros/dispatch/mod.nr

@@ -36,14 +36,15 @@ pub comptime fn generate_public_dispatch(m: Module) -> Quoted {
             }
         };
 
-        let mut parameter_index = 0;
+        let parameter_index = &mut 0;
         let reads = parameters.map(|param: (Quoted, Type)| {
-            let param_name = f"arg{parameter_index}".quoted_contents();
+            let parameter_index_value = *parameter_index;
+            let param_name = f"arg{parameter_index_value}".quoted_contents();
             let param_type = param.1;
             let read = quote {
                 let $param_name: $param_type = reader.read_struct(dep::aztec::protocol_types::traits::Deserialize::deserialize);
             };
-            parameter_index += 1;
+            *parameter_index += 1;
             quote { $read }
         });
         let read = reads.join(quote { });

noir-projects/precommit.sh

@@ -41,4 +41,4 @@ if [[ -n "$staged_nr_files" ]]; then
   echo "$staged_nr_files" | xargs -I {} git add "$repo_root/{}"
 fi
 
-# We just don't say anything if there are no staged nr files, because no one cares.
+# We just don't say anything if there are no staged nr files, because no one cares.

playground/.env

@@ -1,2 +1,4 @@
-VITE_AZTEC_NODE_URL=http://localhost:8080
-VITE_LOG_LEVEL=debug
+AZTEC_NODE_URL=http://localhost:8080
+LOG_LEVEL=verbose
+# Uncomment to provide a custom barretenberg.wasm file
+#BB_WASM_PATH='/assets/barretenberg.wasm.gz'

playground/package.json

@@ -46,6 +46,7 @@
     "typescript": "~5.7.3",
     "typescript-eslint": "^8.11.0",
     "vite": "^6.0.11",
-    "vite-plugin-node-polyfills": "^0.23.0"
+    "vite-plugin-node-polyfills": "^0.23.0",
+    "vite-plugin-static-copy": "^2.2.0"
   }
 }

playground/src/aztecEnv.ts

@@ -12,20 +12,12 @@ import { L2TipsStore } from "@aztec/kv-store/stores";
 import { createStore } from "@aztec/kv-store/indexeddb";
 import { BBWASMLazyPrivateKernelProver } from "@aztec/bb-prover/wasm/lazy";
 import { WASMSimulator } from "@aztec/simulator/client";
-import { debug } from "debug";
 import { createContext } from "react";
 import { NetworkDB, WalletDB } from "./utils/storage";
 import { type ContractFunctionInteractionTx } from "./utils/txs";
 import { type Logger, createLogger } from "@aztec/aztec.js/log";
 import { LazyProtocolContractsProvider } from "@aztec/protocol-contracts/providers/lazy";
 
-process.env = Object.keys(import.meta.env).reduce((acc, key) => {
-  acc[key.replace("VITE_", "")] = import.meta.env[key];
-  return acc;
-}, {});
-
-debug.enable("*");
-
 const logLevel = [
   "silent",
   "fatal",