chore: v3 devnet.2 (#59)

Co-authored-by: shaito <shaito@defi.sucks>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: zkfrov <frov@wonderland.xyz>

Author: 4 people

.github/workflows/benchmark.yml

@@ -4,6 +4,15 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
 env:
   BENCH_DIR: ./benchmarks
 
@@ -69,11 +78,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install and cache yarn
+      - name: Setup Node.js
         uses: actions/setup-node@v5
         with:
-          node-version: '22'
-          cache: 'yarn'
+          node-version: '22.17.0'
 
       - name: Install Aztec CLI
         run: |
@@ -102,34 +110,21 @@ jobs:
         run: |
           VERSION=${{ steps.basever.outputs.ver }} aztec-up
 
+      - name: Manually tag the aztec version as `latest`
+        run: |
+          docker tag aztecprotocol/aztec:${{ steps.basever.outputs.ver }} aztecprotocol/aztec:latest
+
       - name: Start sandbox (BASE, background)
-        run: VERSION=${{ steps.basever.outputs.ver }} aztec start --sandbox &
+        run: aztec start --sandbox &
 
       - name: Start PXE node (BASE, background)
         run: |
           VERSION=${{ steps.basever.outputs.ver }} aztec start \
             --port 8081 --pxe --pxe.nodeUrl=http://localhost:8080/ \
             --pxe.proverEnabled false &
-      
-      - name: Cache node_modules (BASE)
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ steps.basever.outputs.ver }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-${{ steps.basever.outputs.ver }}-
 
       - name: Install deps (BASE)
-        run: yarn install --frozen-lockfile
-
-      - name: Cache Noir compilation artifacts (BASE)
-        id: cache-noir-base
-        uses: actions/cache@v4
-        with:
-          path: |
-            target/
-            src/artifacts/
-          key: ${{ runner.os }}-noir-${{ steps.basever.outputs.ver }}-${{ hashFiles('src/nr/**/*', 'Nargo.toml') }}
+        run: yarn --frozen-lockfile
 
       - name: Compile contracts (BASE)
         run: yarn compile
@@ -144,7 +139,7 @@ jobs:
       # This is required to avoid the benchmark results being removed by the Checkout PR step
       - name: Store base benchmark results
         run: |
-          mkdir -p ../benchmarks_base && mv ${{ env.BENCH_DIR }}/* ../benchmarks_base/
+          mkdir -p ../benchmarks_base && mv ${{ env.BENCH_DIR }}/*.json ../benchmarks_base/
 
       # ──────────────────────────────────────────────────────────────
       # 2️⃣  BENCHMARK PR HEAD  (github.event.pull_request.head.sha)
@@ -186,11 +181,13 @@ jobs:
         run: |
           VERSION=${{ steps.prver.outputs.ver }} aztec-up
 
+      - name: Manually tag the aztec version as `latest`
+        run: |
+          docker tag aztecprotocol/aztec:${{ steps.prver.outputs.ver }} aztecprotocol/aztec:latest
+
       - name: Start sandbox (PR, background)
         if: steps.prver.outputs.ver_diff == 'true'
-        run: |
-          VERSION=${{ steps.prver.outputs.ver }} aztec start --sandbox &
-          sleep 60
+        run: aztec start --sandbox &
 
       - name: Start PXE node (PR, background)
         if: steps.prver.outputs.ver_diff == 'true'
@@ -199,28 +196,11 @@ jobs:
             --port 8081 --pxe --pxe.nodeUrl=http://localhost:8080/ \
             --pxe.proverEnabled false &
 
-      - name: Clean project from BASE stage
-        run: rm -rf node_modules yarn.lock
-
-      - name: Cache node_modules (PR)
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ steps.prver.outputs.ver }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-${{ steps.prver.outputs.ver }}-
+      # - name: Clean project from BASE stage
+      #   run: rm -rf node_modules yarn.lock
 
       - name: Install deps (PR)
-        run: yarn install --frozen-lockfile
-
-      - name: Cache Noir compilation artifacts (PR)
-        id: cache-noir-pr
-        uses: actions/cache@v4
-        with:
-          path: |
-            target/
-            src/artifacts/
-          key: ${{ runner.os }}-noir-${{ steps.prver.outputs.ver }}-${{ hashFiles('src/nr/**/*', 'Nargo.toml') }}
+        run: yarn --frozen-lockfile
 
       - name: Compile contracts (PR)
         run: yarn compile

.github/workflows/tests.yml

@@ -73,5 +73,8 @@ jobs:
       - name: Run nr tests
         run: yarn test:nr
 
+      - name: Clear Vite/Vitest cache
+        run: rm -rf node_modules/.vite node_modules/.vitest
+
       - name: Run js tests
         run: yarn test:js

benchmarks/counter.benchmark.ts

@@ -1,21 +1,23 @@
-import { type AccountWallet, type PXE, createPXEClient } from "@aztec/aztec.js";
-import { getInitialTestAccountsWallets } from "@aztec/accounts/testing";
-
-// Import types from benchmark package
+import { type Wallet } from "@aztec/aztec.js/wallet";
+import { AztecAddress } from "@aztec/aztec.js/addresses";
+import { createAztecNodeClient, waitForNode } from "@aztec/aztec.js/node";
+import { type ContractFunctionInteractionCallIntent } from "@aztec/aztec.js/authorization";
+import {
+  registerInitialSandboxAccountsInWallet,
+  TestWallet,
+} from "@aztec/test-wallet/server";
 import {
   Benchmark,
   type BenchmarkContext,
 } from "@defi-wonderland/aztec-benchmark";
-import { NamedBenchmarkedInteraction } from "@defi-wonderland/aztec-benchmark/dist/types.js";
 
 import { CounterContract } from "../src/artifacts/Counter.js";
-import { deployCounter } from "../src/ts/utils.js";
 
 // Extend the BenchmarkContext from the new package
 interface CounterBenchmarkContext extends BenchmarkContext {
-  pxe: PXE;
-  deployer: AccountWallet;
-  accounts: AccountWallet[];
+  wallet: Wallet;
+  deployer: AztecAddress;
+  accounts: AztecAddress[];
   counterContract: CounterContract;
 }
 
@@ -26,35 +28,38 @@ export default class CounterContractBenchmark extends Benchmark {
    * Creates PXE client, gets accounts, and deploys the contract.
    */
   async setup(): Promise<CounterBenchmarkContext> {
-    const { BASE_PXE_URL = "http://localhost" } = process.env;
-    const pxe = createPXEClient(`${BASE_PXE_URL}:8080`);
-    const accounts = await getInitialTestAccountsWallets(pxe);
-    const deployer = accounts[0]!;
-    const deployedCounterContract = await deployCounter(
-      deployer,
-      deployer.getAddress(),
-    );
-    const counterContract = await CounterContract.at(
-      deployedCounterContract.address,
-      deployer,
-    );
-    return { pxe, deployer, accounts, counterContract };
+    const { NODE_URL = "http://localhost:8080" } = process.env;
+    const aztecNode = createAztecNodeClient(NODE_URL);
+    await waitForNode(aztecNode);
+
+    const wallet: TestWallet = await TestWallet.create(aztecNode);
+    const accounts: AztecAddress[] =
+      await registerInitialSandboxAccountsInWallet(wallet);
+
+    const [deployer] = accounts;
+
+    const counterContract = await CounterContract.deploy(wallet, deployer)
+      .send({ from: deployer })
+      .deployed();
+
+    return { wallet, deployer, accounts, counterContract };
   }
 
   /**
    * Returns the list of CounterContract methods to be benchmarked.
    */
-  getMethods(context: CounterBenchmarkContext): NamedBenchmarkedInteraction[] {
-    const { counterContract, accounts } = context;
-    const [alice] = accounts;
+  getMethods(
+    context: CounterBenchmarkContext,
+  ): ContractFunctionInteractionCallIntent[] {
+    const { counterContract, wallet, deployer } = context;
 
-    const methods = [
+    const methods: ContractFunctionInteractionCallIntent[] = [
       {
-        interaction: counterContract.withWallet(alice).methods.increment(),
-        name: "increment",
+        caller: deployer,
+        action: counterContract.withWallet(wallet).methods.increment(),
       },
-    ] as NamedBenchmarkedInteraction[];
+    ];
 
-    return methods.filter(Boolean);
+    return methods;
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aztec-boilerplate",
-  "version": "0.0.0",
+  "version": "3.0.0-devnet.2",
   "repository": "https://github.com/defi-wonderland/aztec-boilerplate.git",
   "author": "Wonderland",
   "license": "MIT",
@@ -21,32 +21,38 @@
     "*.{js,ts}": "prettier --write -u"
   },
   "dependencies": {
-    "@aztec/accounts": "2.0.3",
-    "@aztec/aztec.js": "2.0.3",
-    "@aztec/noir-contracts.js": "2.0.3",
-    "@defi-wonderland/aztec-benchmark": "2.0.0",
+    "@aztec/accounts": "3.0.0-devnet.2",
+    "@aztec/aztec.js": "3.0.0-devnet.2",
+    "@aztec/entrypoints": "3.0.0-devnet.2",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.2",
+    "@aztec/pxe": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
+    "@aztec/test-wallet": "3.0.0-devnet.2",
+    "@defi-wonderland/aztec-benchmark": "3.0.0-devnet.2",
     "@types/node": "22.5.1"
   },
   "devDependencies": {
-    "@types/jest": "30.0.0",
     "@commitlint/cli": "20.1.0",
     "@commitlint/config-conventional": "20.0.0",
+    "@types/jest": "30.0.0",
     "@types/mocha": "10.0.6",
     "@types/node": "22.5.1",
     "husky": "9.1.7",
-    "tsx": "4.20.4",
     "lint-staged": "16.2.3",
-    "tsx": "4.20.5",
     "prettier": "3.6.2",
+    "tsx": "4.9.3",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
   },
   "config": {
-    "aztecVersion": "2.0.3"
+    "aztecVersion": "3.0.0-devnet.2"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "engines": {
     "node": ">=22.0.0",
     "yarn": ">=1.22.0"
+  },
+  "resolutions": {
+    "@noble/hashes": "1.8.0"
   }
 }