Merge pull request #58 from AztecProtocol/jc/0.77.0

update to 0.77.1

Author: critesjosh

.github/scripts/update-readme-version.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
 
 // Read Nargo.toml
 const nargoContent = readFileSync('Nargo.toml', 'utf8');
-const versionMatch = nargoContent.match(/tag\s*=\s*"aztec-packages-v([^"]+)"/);
+const versionMatch = nargoContent.match(/tag\s*=\s*"v([^"]+)"/);
 const version = versionMatch ? versionMatch[1] : null;
 
 if (!version) {

.github/workflows/tests.yaml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Set Aztec version and start sandbox
         run: |
-          VERSION=0.76.4 aztec-up
+          VERSION=0.77.1 aztec-up
           aztec start --sandbox &
 
       - name: Install project dependencies
@@ -40,5 +40,8 @@ jobs:
       - name: Codegen
         run: script -e -c "aztec codegen target --outdir src/artifacts"
 
+      - name: Change ownership # to get around Docker issues
+        run: sudo chown -R $(whoami) ~/nargo && sudo chown -R $(whoami) ~/nargo/github.com
+
       - name: Run tests
         run: script -e -c "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json && aztec test"

Nargo.toml

@@ -5,4 +5,4 @@ authors = [ "" ]
 compiler_version = ">=0.18.0"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "aztec-packages-v0.76.4", directory = "noir-projects/aztec-nr/aztec" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v0.77.1", directory = "noir-projects/aztec-nr/aztec" }

README.md

@@ -27,7 +27,7 @@ The corresponding tutorial can be found in the [Aztec docs here](https://docs.az
 
 ## 🚀 **Getting Started**
 
-Use **Node.js version 18**.
+Use **Node.js version 20.18.1**.
 
 [Start your codespace from the codespace dropdown](https://docs.github.com/en/codespaces/getting-started/quickstart).
 
@@ -40,7 +40,7 @@ bash -i <(curl -s https://install.aztec.network)
 Install the correct version of the toolkit with:
 
 ```bash
-aztec-up 0.76.4
+aztec-up 0.77.1
 ```
 
 Start the sandbox with:
@@ -99,6 +99,8 @@ yarn test
 
 Testing will run the **TypeScript tests** defined in `index.test.ts` inside `./src/test`, as well as the [Aztec Testing eXecution Environment (TXE)](https://docs.aztec.network/guides/developer_guides/smart_contracts/testing) tests defined in [`first.nr`](./src/test/first.nr) (imported in the contract file with `mod test;`).
 
+Note: The Typescript tests spawn an instance of the sandbox to test against, and close it once once the TS tests are complete.
+
 ---
 
 ## ❗ **Error Resolution**

package.json

@@ -16,13 +16,14 @@
     "test": "yarn test:js && yarn test:nr",
     "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json",
     "test:nr": "aztec test",
-    "update": "aztec update --contract . && ./.github/scripts/update_contract.sh $(grep -oP 'tag\\s*=\\s*\"\\K[^\"]+' \"Nargo.toml\" | head -1) && yarn && yarn update-readme-version",
+    "update": "./.github/scripts/update_contract.sh $(grep -oP 'tag\\s*=\\s*\"\\K[^\"]+' \"Nargo.toml\" | head -1) && yarn && yarn update-readme-version",
     "update-readme-version": "node ./.github/scripts/update-readme-version.js"
   },
   "dependencies": {
-    "@aztec/accounts": "0.76.4",
-    "@aztec/aztec.js": "0.76.4",
-    "@aztec/noir-contracts.js": "0.76.4",
+    "@aztec/accounts": "0.77.1",
+    "@aztec/aztec.js": "0.77.1",
+    "@aztec/noir-contracts.js": "0.77.1",
+    "@aztec/stdlib": "0.77.1",
     "@types/node": "^22.5.1"
   },
   "devDependencies": {

scripts/deploy.ts

@@ -1,7 +1,7 @@
 import { EasyPrivateVotingContract } from "../src/artifacts/EasyPrivateVoting.js"
 import { AccountWallet, CompleteAddress, createLogger, Fr, PXE, waitForPXE, createPXEClient, Logger } from "@aztec/aztec.js";
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { deriveSigningKey } from '@aztec/circuits.js';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { getInitialTestAccountsWallets } from "@aztec/accounts/testing";
 import { TokenContract } from "@aztec/noir-contracts.js/Token"
 
@@ -28,7 +28,7 @@ async function main() {
     let salt = Fr.random();
 
     let schnorrAccount = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
-    const { address, publicKeys, partialAddress } = await schnorrAccount.getCompleteAddress();
+    const { address, publicKeys, partialAddress } = await schnorrAccount.getCompleteAddress()
     let tx = await schnorrAccount.deploy().wait();
     let wallet = await schnorrAccount.getWallet();
 

scripts/getBlock.ts

@@ -14,7 +14,7 @@ async function main() {
 
     let block = await pxe.getBlock(1);
     console.log(block)
-    console.log(block?.hash())
+    console.log(await block?.hash())
 }
 
 main();

src/main.nr

@@ -8,6 +8,8 @@ pub contract EasyPrivateVoting {
         macros::{functions::{initializer, internal, private, public}, storage::storage},
     };
     use dep::aztec::prelude::{AztecAddress, Map, PublicImmutable, PublicMutable};
+    use dep::aztec::protocol_types::traits::{Hash, ToField};
+
     #[storage]
     struct Storage<Context> {
         admin: PublicMutable<AztecAddress, Context>, // admin can end vote

src/test/index.test.ts

@@ -1,21 +1,29 @@
 import { EasyPrivateVotingContractArtifact, EasyPrivateVotingContract } from "../artifacts/EasyPrivateVoting.js"
 import { AccountWallet, CompleteAddress, ContractDeployer, createLogger, Fr, PXE, waitForPXE, TxStatus, createPXEClient, getContractInstanceFromDeployParams, Logger } from "@aztec/aztec.js";
 import { getInitialTestAccountsWallets } from "@aztec/accounts/testing"
+import { spawn } from 'child_process';
 
 const setupSandbox = async () => {
     const { PXE_URL = 'http://localhost:8080' } = process.env;
     const pxe = createPXEClient(PXE_URL);
     await waitForPXE(pxe);
     return pxe;
 };
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
 describe("Voting", () => {
     let pxe: PXE;
     let wallets: AccountWallet[] = [];
     let accounts: CompleteAddress[] = [];
     let logger: Logger;
+    let sandboxInstance;
 
     beforeAll(async () => {
+        sandboxInstance = spawn("aztec", ["start", "--sandbox"], {
+            detached: true,
+            stdio: 'ignore'
+        })
+        sleep(15000)
         logger = createLogger('aztec:aztec-starter');
         logger.info("Aztec-Starter tests running.")
 
@@ -25,6 +33,10 @@ describe("Voting", () => {
         accounts = wallets.map(w => w.getCompleteAddress())
     })
 
+    afterAll(async () => {
+        sandboxInstance!.kill();
+    })
+
     it("Deploys the contract", async () => {
         const salt = Fr.random();
         const VotingContractArtifact = EasyPrivateVotingContractArtifact
@@ -72,16 +84,18 @@ describe("Voting", () => {
     it("It should fail when trying to vote twice", async () => {
         const candidate = new Fr(1)
 
-        const contract = await EasyPrivateVotingContract.deploy(wallets[0], accounts[0].address).send().deployed();
-        await contract.methods.cast_vote(candidate).send().wait();
+        const votingContract = await EasyPrivateVotingContract.deploy(wallets[0], accounts[0].address).send().deployed();
+        await votingContract.methods.cast_vote(candidate).send().wait();
+        expect(await votingContract.methods.get_vote(candidate).simulate()).toBe(1n);
 
         // We try voting again, but our TX is dropped due to trying to emit duplicate nullifiers
         // first confirm that it fails simulation
-        await expect(contract.methods.cast_vote(candidate).send().wait()).rejects.toThrow(/Nullifier collision/);
-        // if we skip simulation, tx is dropped
+        await expect(votingContract.methods.cast_vote(candidate).send().wait()).rejects.toThrow(/Nullifier collision/);
+        // if we skip simulation before submitting the tx,
+        // tx will be included in a block but with app logic reverted
         await expect(
-            contract.methods.cast_vote(candidate).send({ skipPublicSimulation: true }).wait(),
-        ).rejects.toThrow('Reason: Tx dropped by P2P node.');
+            votingContract.methods.cast_vote(candidate).send({ skipPublicSimulation: true }).wait(),
+        ).rejects.toThrow(TxStatus.APP_LOGIC_REVERTED);
 
     }, 300_000)