Skip to content

Commit 2ef46e8

Browse files
authored
Merge pull request #96 from AztecProtocol/jc/87.2
update to 87.2
2 parents 1ddf1a5 + a12973c commit 2ef46e8

File tree

9 files changed

+296
-274
lines changed

9 files changed

+296
-274
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM --platform=linux/amd64 node:lts-bookworm-slim
22
SHELL ["/bin/bash", "-c"]
33

44
ENV NVM_DIR=/root/.nvm
5-
ENV NODE_VERSION=18.19.0
5+
ENV NODE_VERSION=22.15.0
66

77
RUN apt update && apt install -y curl bash git tar gzip libc++-dev jq python3 build-essential
88

.github/workflows/tests.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ jobs:
1515
- name: Checkout repository
1616
uses: actions/checkout@v3
1717

18+
- name: Set up Node.js
19+
uses: actions/setup-node@v3
20+
with:
21+
node-version: '22'
22+
cache: 'yarn' # Optional: cache dependencies for faster builds
23+
1824
- name: Set up Docker
1925
uses: docker/setup-buildx-action@v2
2026

@@ -28,7 +34,7 @@ jobs:
2834

2935
- name: Set Aztec version and start sandbox
3036
run: |
31-
VERSION=0.86.0 aztec-up
37+
VERSION=0.87.2 aztec-up
3238
aztec start --sandbox &
3339
3440
- name: Install project dependencies

Nargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ authors = [ "" ]
55
compiler_version = ">=0.18.0"
66

77
[dependencies]
8-
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v0.86.0", directory = "noir-projects/aztec-nr/aztec" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v0.87.2", directory = "noir-projects/aztec-nr/aztec" }

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If you are interested in trying out this repo with the testnet, try the [testnet
3434

3535
## 🚀 **Getting Started**
3636

37-
Use **Node.js version 18.19.0**.
37+
Use **Node.js version 22.15.0**.
3838

3939
[Start your codespace from the codespace dropdown](https://docs.github.com/en/codespaces/getting-started/quickstart).
4040

@@ -47,7 +47,7 @@ bash -i <(curl -s https://install.aztec.network)
4747
Install the correct version of the toolkit with:
4848

4949
```bash
50-
aztec-up 0.86.0
50+
aztec-up 0.87.2
5151
```
5252

5353
Start the sandbox with:
@@ -60,10 +60,9 @@ aztec start --sandbox
6060

6161
## 📦 **Install Packages**
6262

63-
We need to ignore node version warnings (a temporary fix):
6463

6564
```bash
66-
YARN_IGNORE_ENGINES=true yarn install
65+
yarn install
6766
```
6867

6968
---

package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,17 @@
2424
"update-readme-version": "node ./.github/scripts/update-readme-version.js"
2525
},
2626
"dependencies": {
27-
"@aztec/accounts": "0.86.0",
28-
"@aztec/aztec.js": "0.86.0",
29-
"@aztec/noir-contracts.js": "0.86.0",
30-
"@aztec/protocol-contracts": "0.86.0",
31-
"@aztec/pxe": "0.86.0",
32-
"@aztec/stdlib": "0.86.0",
33-
"@types/node": "^22.5.1"
27+
"@aztec/accounts": "0.87.2",
28+
"@aztec/aztec.js": "0.87.2",
29+
"@aztec/noir-contracts.js": "0.87.2",
30+
"@aztec/protocol-contracts": "0.87.2",
31+
"@aztec/pxe": "0.87.2",
32+
"@aztec/stdlib": "0.87.2"
3433
},
3534
"devDependencies": {
3635
"@types/jest": "^29.5.11",
3736
"@types/mocha": "^10.0.6",
38-
"@types/node": "^22.5.1",
37+
"@types/node": "^22.15.1",
3938
"jest": "^29.7.0",
4039
"ts-jest": "^29.1.1",
4140
"ts-node": "^10.9.2",

scripts/multiple_pxe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ async function main() {
105105
wallet2
106106
)
107107

108-
await l2TokenContract.methods.sync_notes().simulate()
108+
await l2TokenContract.methods.sync_private_state().simulate()
109109

110110
const notes = await pxe2.getNotes({ txHash: private_mint_tx.txHash });
111111
console.log(notes)

src/test/e2e/index.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ describe("Voting", () => {
149149

150150
// We try voting again, but our TX is dropped due to trying to emit duplicate nullifiers
151151
// first confirm that it fails simulation
152-
await expect(votingContract.methods.cast_vote(candidate).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait()).rejects.toThrow(/Nullifier collision/);
152+
await expect(votingContract.methods.cast_vote(candidate).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait()).rejects.toThrow(/Existing nullifier/);
153153
// if we skip simulation before submitting the tx,
154154
// tx will be included in a block but with app logic reverted
155155
await expect(
156-
votingContract.methods.cast_vote(candidate).send({ fee: { paymentMethod: sponsoredPaymentMethod }, skipPublicSimulation: true }).wait(),
156+
votingContract.methods.cast_vote(candidate).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait(),
157157
).rejects.toThrow(/Existing nullifier/);
158158

159159
})

src/test/utils.nr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ pub unconstrained fn setup() -> (&mut TestEnvironment, AztecAddress, AztecAddres
99

1010
let initializer_call_interface = EasyPrivateVoting::interface().constructor(admin);
1111
let voting_contract = env.deploy_self("EasyPrivateVoting").with_public_void_initializer(
12+
admin,
1213
initializer_call_interface,
1314
);
1415

1516
env.advance_block_by(1);
1617
(&mut env, voting_contract.to_address(), admin)
17-
}
18+
}

0 commit comments

Comments
 (0)