feat: upgrade to 2.0.3 (#19)

Author: xorsal

.github/workflows/benchmark.yml

@@ -103,21 +103,21 @@ jobs:
           VERSION=${{ steps.basever.outputs.ver }} aztec-up
 
       - name: Start sandbox (BASE, background)
-        run: aztec start --sandbox &
+        run: VERSION=${{ steps.basever.outputs.ver }} 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/ \
+          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-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-node-modules-${{ steps.basever.outputs.ver }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-node-modules-
+            ${{ runner.os }}-node-modules-${{ steps.basever.outputs.ver }}-
 
       - name: Install deps (BASE)
         run: yarn install --frozen-lockfile
@@ -129,15 +129,13 @@ jobs:
           path: |
             target/
             src/artifacts/
-          key: ${{ runner.os }}-noir-${{ env.AZTEC_VERSION }}-${{ hashFiles('src/nr/**/*', 'Nargo.toml') }}
+          key: ${{ runner.os }}-noir-${{ steps.basever.outputs.ver }}-${{ hashFiles('src/nr/**/*', 'Nargo.toml') }}
 
       - name: Compile contracts (BASE)
-        if: steps.cache-noir-base.outputs.cache-hit != 'true'
-        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
+        run: yarn compile
 
       - name: Codegen wrappers (BASE)
-        if: steps.cache-noir-base.outputs.cache-hit != 'true'
-        run: script -e -c "aztec codegen target --outdir src/artifacts --force"
+        run: yarn codegen
 
       - name: Benchmark (BASE)
         run: |
@@ -190,22 +188,27 @@ jobs:
 
       - name: Start sandbox (PR, background)
         if: steps.prver.outputs.ver_diff == 'true'
-        run: aztec start --sandbox &
+        run: |
+          VERSION=${{ steps.prver.outputs.ver }} aztec start --sandbox &
+          sleep 60
 
       - name: Start PXE node (PR, background)
         if: steps.prver.outputs.ver_diff == 'true'
         run: |
-          VERSION=${{ steps.prver.outputs.ver }} aztec \
-            start --port 8081 --pxe --pxe.nodeUrl=http://localhost:8080/ \
+          VERSION=${{ steps.prver.outputs.ver }} aztec start \
+            --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-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-node-modules-${{ steps.prver.outputs.ver }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-node-modules-
+            ${{ runner.os }}-node-modules-${{ steps.prver.outputs.ver }}-
 
       - name: Install deps (PR)
         run: yarn install --frozen-lockfile
@@ -217,15 +220,13 @@ jobs:
           path: |
             target/
             src/artifacts/
-          key: ${{ runner.os }}-noir-${{ env.AZTEC_VERSION }}-${{ hashFiles('src/nr/**/*', 'Nargo.toml') }}
+          key: ${{ runner.os }}-noir-${{ steps.prver.outputs.ver }}-${{ hashFiles('src/nr/**/*', 'Nargo.toml') }}
 
       - name: Compile contracts (PR)
-        if: steps.cache-noir-pr.outputs.cache-hit != 'true'
-        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
+        run: yarn compile
 
       - name: Codegen wrappers (PR)
-        if: steps.cache-noir-pr.outputs.cache-hit != 'true'
-        run: script -e -c "aztec codegen target --outdir src/artifacts --force"
+        run: yarn codegen
 
       # ──────────────────────────────────────────────────────────────
       # 3️⃣  DIFF &  UPLOAD ARTIFACTS

.github/workflows/tests.yml

@@ -61,11 +61,14 @@ jobs:
 
       - name: Compile contracts
         if: steps.cache-noir.outputs.cache-hit != 'true'
-        run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
+        run: yarn compile
 
       - name: Generate artifacts
         if: steps.cache-noir.outputs.cache-hit != 'true'
-        run: script -e -c "aztec codegen target --outdir src/artifacts"
+        run: yarn codegen -f
+
+      - name: Postprocess contracts
+        run: aztec-postprocess-contract
 
       - name: Run nr tests
         run: yarn test:nr

benchmarks/counter.benchmark.ts

@@ -5,8 +5,8 @@ import { getInitialTestAccountsWallets } from "@aztec/accounts/testing";
 import {
   Benchmark,
   type BenchmarkContext,
-  type BenchmarkedInteraction,
 } 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";
@@ -44,13 +44,16 @@ export default class CounterContractBenchmark extends Benchmark {
   /**
    * Returns the list of CounterContract methods to be benchmarked.
    */
-  getMethods(context: CounterBenchmarkContext): BenchmarkedInteraction[] {
+  getMethods(context: CounterBenchmarkContext): NamedBenchmarkedInteraction[] {
     const { counterContract, accounts } = context;
     const [alice] = accounts;
 
     const methods = [
-      counterContract.withWallet(alice).methods.increment(),
-    ] as BenchmarkedInteraction[];
+      {
+        interaction: counterContract.withWallet(alice).methods.increment(),
+        name: "increment",
+      },
+    ] as NamedBenchmarkedInteraction[];
 
     return methods.filter(Boolean);
   }

package.json

@@ -7,28 +7,31 @@
   "type": "module",
   "scripts": {
     "clean": "rm -rf ./src/artifacts ./target codegenCache.json",
-    "codegen": "aztec codegen target --outdir src/artifacts",
-    "compile": "aztec-nargo compile",
+    "codegen": "aztec codegen target --outdir src/artifacts -f",
+    "compile": "aztec-nargo compile && aztec-postprocess-contract",
     "test": "yarn test:nr && yarn test:js",
     "test:js": "vitest run",
     "test:nr": "aztec test",
     "lint:prettier": "prettier '**/*.{js,ts}' --write",
-    "build": "yarn compile && yarn codegen -f",
+    "ccc": "yarn clean && yarn compile && yarn codegen -f",
     "prepare": "husky"
   },
   "lint-staged": {
     "*.ts": "prettier --write -u"
   },
   "dependencies": {
-    "@aztec/accounts": "1.2.1",
-    "@aztec/aztec.js": "1.2.1",
-    "@aztec/noir-contracts.js": "1.2.1",
-    "@defi-wonderland/aztec-benchmark": "1.0.1"
+    "@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",
+    "@types/node": "22.5.1"
   },
   "devDependencies": {
-    "@types/node": "22.5.1",
     "@commitlint/cli": "19.8.1",
     "@commitlint/config-conventional": "19.8.1",
+    "@types/jest": "29.5.11",
+    "@types/mocha": "10.0.6",
+    "@types/node": "22.5.1",
     "husky": "9.1.7",
     "tsx": "4.20.4",
     "lint-staged": "16.1.5",
@@ -37,7 +40,7 @@
     "vitest": "3.2.4"
   },
   "config": {
-    "aztecVersion": "1.2.1"
+    "aztecVersion": "2.0.3"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "engines": {

src/nr/counter_contract/Nargo.toml

@@ -5,4 +5,4 @@ compiler_version = ">=1.0.0"
 authors = [""]
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v1.2.1", directory = "noir-projects/aztec-nr/aztec" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v2.0.3", directory = "noir-projects/aztec-nr/aztec" }

src/nr/counter_contract/src/main.nr

@@ -5,8 +5,9 @@ pub mod test;
 pub contract Counter {
     // aztec library imports
     use aztec::{
-        macros::{functions::{initializer, internal, private, public}, storage::storage},
-        prelude::{AztecAddress, PublicImmutable, PublicMutable},
+        macros::{functions::{initializer, internal, private, public, view}, storage::storage},
+        protocol_types::address::AztecAddress,
+        state_vars::{PublicImmutable, PublicMutable},
     };
 
     // @param owner The address of the owner
@@ -41,6 +42,7 @@ pub contract Counter {
     /// @dev Retrieves the counter value
     /// @return The current counter value
     #[public]
+    #[view]
     fn get_counter() -> u128 {
         storage.counter.read()
     }

src/nr/counter_contract/src/test/increment.nr

@@ -4,6 +4,25 @@ use crate::{Counter, test::utils};
 unconstrained fn increment_success() {
     let (env, contract_address, owner, _) = utils::setup_contract(false);
 
-    env.impersonate(owner);
-    Counter::at(contract_address).increment().call(&mut env.private());
+    env.call_private(owner, Counter::at(contract_address).increment());
+
+    let counter = env.view_public(Counter::at(contract_address).get_counter());
+    assert(counter == 1);
+}
+
+#[test]
+unconstrained fn does_it_fail_to_call_the_initializer() {
+    let mut env = aztec::test::helpers::test_environment::TestEnvironment::new();
+
+    let owner = env.create_light_account();
+
+    let initializer_call_interface = Counter::interface().constructor(owner);
+    let counter_deployer = env.deploy("@counter_contract/Counter");
+    let contract_address =
+        counter_deployer.with_public_initializer(owner, initializer_call_interface);
+
+    env.call_private(owner, Counter::at(contract_address).increment());
+
+    let counter = env.view_public(Counter::at(contract_address).get_counter());
+    assert(counter == 1);
 }

src/nr/counter_contract/src/test/utils.nr

@@ -1,7 +1,6 @@
 use crate::Counter;
 use aztec::{
-    prelude::AztecAddress, protocol_types::contract_instance::ContractInstance,
-    test::helpers::test_environment::TestEnvironment,
+    protocol_types::address::AztecAddress, test::helpers::test_environment::TestEnvironment,
 };
 
 pub unconstrained fn setup_contract(
@@ -10,29 +9,27 @@ pub unconstrained fn setup_contract(
     // Setup env, generate keys
     let mut env = TestEnvironment::new();
     let (owner, user) = if with_account_contracts {
-        let owner = env.create_account_contract(1);
-        let user = env.create_account_contract(2);
+        let owner = env.create_contract_account();
+        let user = env.create_contract_account();
         (owner, user)
     } else {
-        let owner = env.create_account(1);
-        let user = env.create_account(2);
+        let owner = env.create_light_account();
+        let user = env.create_light_account();
         (owner, user)
     };
 
-    let acontract = deploy_contract(&mut env, owner);
+    let contract_address = deploy_contract(&mut env, owner);
 
-    (&mut env, acontract.to_address(), owner, user)
+    (&mut env, contract_address, owner, user)
 }
 
 pub unconstrained fn deploy_contract(
     env: &mut TestEnvironment,
     owner: AztecAddress,
-) -> ContractInstance {
+) -> AztecAddress {
     let initializer_call_interface = Counter::interface().constructor(owner);
-    let contract_instance = env
-        .deploy("./@counter_contract", "Counter")
-        .with_public_void_initializer(owner, initializer_call_interface);
-    env.advance_block_by(1);
+    let contract_address =
+        env.deploy("Counter").with_public_initializer(owner, initializer_call_interface);
 
-    contract_instance
+    contract_address
 }

src/ts/counter.test.ts

@@ -39,13 +39,28 @@ describe("Counter Contract", () => {
   });
 
   it("e2e", async () => {
-    const owner = await counter.methods.get_owner().simulate();
+    const owner = await counter.methods.get_owner().simulate({
+      from: alice.getAddress(),
+    });
     expect(owner).toStrictEqual(alice.getAddress());
     // default counter's value is 0
-    expect(await counter.methods.get_counter().simulate()).toBe(0n);
+    expect(
+      await counter.methods.get_counter().simulate({
+        from: alice.getAddress(),
+      }),
+    ).toBe(0n);
     // call to `increment`
-    await counter.methods.increment().send().wait();
+    await counter.methods
+      .increment()
+      .send({
+        from: alice.getAddress(),
+      })
+      .wait();
     // now the counter should be incremented.
-    expect(await counter.methods.get_counter().simulate()).toBe(1n);
+    expect(
+      await counter.methods.get_counter().simulate({
+        from: alice.getAddress(),
+      }),
+    ).toBe(1n);
   });
 });

src/ts/utils.ts

@@ -38,7 +38,9 @@ export async function deployCounter(
     [owner],
     "constructor", // not actually needed since it's the default constructor
   )
-    .send()
+    .send({
+      from: deployer.getAddress(),
+    })
     .deployed();
   return contract as CounterContract;
 }