Skip to content

Commit

Permalink
Merge pull request #12 from AztecProtocol/jc/57
Browse files Browse the repository at this point in the history
update to 0.57
  • Loading branch information
critesjosh authored Oct 9, 2024
2 parents 5b82894 + e0d44fd commit 0f192bf
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion Nargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ authors = [ "" ]
compiler_version = ">=0.18.0"

[dependencies]
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "aztec-packages-v0.56.0", directory = "noir-projects/aztec-nr/aztec" }
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "aztec-packages-v0.57.0", directory = "noir-projects/aztec-nr/aztec" }
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"update": "aztec update --contract . && ./.github/scripts/update_contract.sh $(grep -oP 'tag\\s*=\\s*\"\\K[^\"]+' \"Nargo.toml\" | head -1)"
},
"dependencies": {
"@aztec/aztec.js": "0.56.0",
"@aztec/noir-contracts.js": "0.56.0",
"@aztec/aztec.js": "0.57.0",
"@aztec/noir-contracts.js": "0.57.0",
"@types/node": "^22.5.1"
},
"devDependencies": {
"@aztec/accounts": "0.56.0",
"@aztec/accounts": "0.57.0",
"@types/jest": "^29.5.11",
"@types/mocha": "^10.0.6",
"@types/node": "^22.5.1",
Expand Down
2 changes: 1 addition & 1 deletion src/test/first.nr
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use dep::aztec::note::note_getter::{MAX_NOTES_PER_PAGE, view_notes};
use dep::aztec::note::note_viewer_options::NoteViewerOptions;
use dep::aztec::hash::compute_secret_hash;

use dep::aztec::{oracle::{execution::{get_block_number, get_contract_address}, unsafe_rand::unsafe_rand, storage::storage_read}};
use dep::aztec::{oracle::{execution::{get_block_number, get_contract_address}, storage::storage_read}};

use crate::EasyPrivateVoting;

Expand Down
6 changes: 3 additions & 3 deletions src/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe("Voting", () => {
const candidate = new Fr(1)

const contract = await EasyPrivateVotingContract.deploy(wallets[0], accounts[0].address).send().deployed();
const tx = await contract.methods.cast_vote(candidate, new Fr(1)).send().wait();
const tx = await contract.methods.cast_vote(candidate).send().wait();
let count = await contract.methods.get_vote(candidate).simulate();
expect(count).toBe(1n);
}, 300_000)
Expand All @@ -74,9 +74,9 @@ describe("Voting", () => {
const candidate = new Fr(1)

const contract = await EasyPrivateVotingContract.deploy(wallets[0], accounts[0].address).send().deployed();
await contract.methods.cast_vote(candidate, new Fr(1)).send().wait();
await contract.methods.cast_vote(candidate).send().wait();

const secondVoteReceipt = await contract.methods.cast_vote(candidate, new Fr(1)).send().getReceipt();
const secondVoteReceipt = await contract.methods.cast_vote(candidate).send().getReceipt();
expect(secondVoteReceipt).toEqual(
expect.objectContaining({
status: TxStatus.DROPPED,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"skipLibCheck": true,
"jsx": "react-jsx"
},
"include": ["src", "scripts/**/*", "src/**/*.json", "src/artifacts/*"]
"include": ["src", "scripts/**/*", "src/**/*.json", "src/artifacts/*", "target/**/*"]
}
168 changes: 84 additions & 84 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,101 +15,101 @@
"@jridgewell/gen-mapping" "^0.3.5"
"@jridgewell/trace-mapping" "^0.3.24"

"@aztec/accounts@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/accounts/-/accounts-0.56.0.tgz#f6f6c59648a247673e73400aec8a2aa97d9b81be"
integrity sha512-jaWrja2LzRuvcEneCwk2+fZgfMby8wdqVw6bCGu4q5p8UoXcNDnt5E5Y8tcEQkW7gPG42EXnccWV0D7kH6v1zw==
dependencies:
"@aztec/aztec.js" "0.56.0"
"@aztec/circuit-types" "0.56.0"
"@aztec/circuits.js" "0.56.0"
"@aztec/entrypoints" "0.56.0"
"@aztec/ethereum" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/types" "0.56.0"
"@aztec/accounts@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/accounts/-/accounts-0.57.0.tgz#ac6df18280a62e6cdb0639a387908005ca51843e"
integrity sha512-n+RdoaI5UUrGTdojGLlXtc81WfBLNLnTYOUv7o5P9G3MIn5skBT1ed6vkTCks3L/9rV/St+osl2eWavCKhaIqg==
dependencies:
"@aztec/aztec.js" "0.57.0"
"@aztec/circuit-types" "0.57.0"
"@aztec/circuits.js" "0.57.0"
"@aztec/entrypoints" "0.57.0"
"@aztec/ethereum" "0.57.0"
"@aztec/foundation" "0.57.0"
"@aztec/types" "0.57.0"
tslib "^2.4.0"

"@aztec/aztec.js@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/aztec.js/-/aztec.js-0.56.0.tgz#de95cacb25307925b0d54e3d6964f3119059d5e5"
integrity sha512-RDa3+SsaQqLbEAkWuNOrtNR7KIc7JmY/v0tTK0SodDAcLMIvx/Iojv6X2sIJScNmtu/YvKxdGnod3mtzgF/2lQ==
dependencies:
"@aztec/circuit-types" "0.56.0"
"@aztec/circuits.js" "0.56.0"
"@aztec/ethereum" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/l1-artifacts" "0.56.0"
"@aztec/protocol-contracts" "0.56.0"
"@aztec/types" "0.56.0"
"@aztec/aztec.js@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/aztec.js/-/aztec.js-0.57.0.tgz#46a2a94637eafcf972dc627f67817ace05dc9514"
integrity sha512-IywIWQEEdfiY7xQe3iUJXgKm8aV7isYXteouUmCz8OX1JRHzPb34TtMlu/Im91Ax+fiuadHRsILICKP7Y7vcbQ==
dependencies:
"@aztec/circuit-types" "0.57.0"
"@aztec/circuits.js" "0.57.0"
"@aztec/ethereum" "0.57.0"
"@aztec/foundation" "0.57.0"
"@aztec/l1-artifacts" "0.57.0"
"@aztec/protocol-contracts" "0.57.0"
"@aztec/types" "0.57.0"
axios "^1.7.2"
tslib "^2.4.0"
viem "^2.7.15"

"@aztec/bb.js@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/bb.js/-/bb.js-0.56.0.tgz#c1946f7fb23d6c3f2f2b8d6af1b1a3c1ea290122"
integrity sha512-NRuIH9kub99o7Ddx4wLIW1x0Ow0hemP036fL9vBhqTBeNGi6BusMlSVygrUPKAjQrVGihJJPqdndwblypZY2ew==
"@aztec/bb.js@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/bb.js/-/bb.js-0.57.0.tgz#0d3238aee14d0bd873e88405b577399595899354"
integrity sha512-6chgqPKfD21HCWkHLo/nsOAZ5t+IQh2jBqiVJZQazLO7UMZuTX5V6tFOCOpbbiroLriQqvB6D40+U6kRYGK0Ww==
dependencies:
comlink "^4.4.1"
commander "^10.0.1"
debug "^4.3.4"
tslib "^2.4.0"

"@aztec/circuit-types@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/circuit-types/-/circuit-types-0.56.0.tgz#96488b90f35160f7672c2cc12bfc6cd3029be880"
integrity sha512-EgFr7alYNMdukwf3yg3j2ugmGwPPXuPGsNj1jDX7USgmuJdpSVopeOg8WwnKkWTOlKNBG3voabVDXhGPczYzxw==
"@aztec/circuit-types@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/circuit-types/-/circuit-types-0.57.0.tgz#b20441c2b4a5da743877efc7a8f11ddc72564073"
integrity sha512-FDFrBhOlVr1PIuYYVKCYOM28/TBEGpFYkTZ3EGZEILgS9lh3eJajmNlLzBeohh67eYEapj8em2xKM2nzQrbF5Q==
dependencies:
"@aztec/circuits.js" "0.56.0"
"@aztec/ethereum" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/types" "0.56.0"
"@aztec/circuits.js" "0.57.0"
"@aztec/ethereum" "0.57.0"
"@aztec/foundation" "0.57.0"
"@aztec/types" "0.57.0"
browserify-cipher "^1.0.1"
lodash.clonedeep "^4.5.0"
lodash.isequal "^4.5.0"
lodash.times "^4.3.2"
tslib "^2.5.0"

"@aztec/circuits.js@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/circuits.js/-/circuits.js-0.56.0.tgz#296386570e790dc93d2265fcddb6c498349c9abd"
integrity sha512-Xbb9tRsJMmtzpswnED3PU2qmRaDCBcxCvsk0FGqCCjGR01IEMl3UVfbqLC/3okalCtWSubaC1KRKSf8F9qoSNQ==
"@aztec/circuits.js@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/circuits.js/-/circuits.js-0.57.0.tgz#1eb00dfdb158bf4b9f5cdbcc5f98d78cc055e017"
integrity sha512-cHY+35RyUcVIjR8itQuu0mHVkaXV9InkwNiHNW16m7+jAFXO0NLWXU5faleniWrpG/0hTnuFYfYzX5zzPj5mvA==
dependencies:
"@aztec/bb.js" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/types" "0.56.0"
"@aztec/bb.js" "0.57.0"
"@aztec/foundation" "0.57.0"
"@aztec/types" "0.57.0"
eslint "^8.35.0"
lodash.chunk "^4.2.0"
tslib "^2.4.0"

"@aztec/entrypoints@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/entrypoints/-/entrypoints-0.56.0.tgz#ae4566869aa3f55e8702a0690751c439ce46443a"
integrity sha512-7pwhvF/zSXo/eFTGAywWB3GcjMiR+RptMmpcdZ8IEuTabjAtGWysYP+fbnEz3Kohvto6AnS/rz3NJoL/QddRmA==
"@aztec/entrypoints@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/entrypoints/-/entrypoints-0.57.0.tgz#67bb1687ee6e4fe5a5a0348cc38cb09fc0cc8000"
integrity sha512-smu/u0RsOOGeo56gJ2ydMQogEoc/r4jWg/QAmheqnM47pClOrFrjhpWHxIIzAU6P7ZZzQCZeS1T1hyN2bRFdoA==
dependencies:
"@aztec/aztec.js" "0.56.0"
"@aztec/circuit-types" "0.56.0"
"@aztec/circuits.js" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/protocol-contracts" "0.56.0"
"@aztec/aztec.js" "0.57.0"
"@aztec/circuit-types" "0.57.0"
"@aztec/circuits.js" "0.57.0"
"@aztec/foundation" "0.57.0"
"@aztec/protocol-contracts" "0.57.0"
tslib "^2.4.0"

"@aztec/ethereum@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/ethereum/-/ethereum-0.56.0.tgz#c32b26822a5d24aac20c15887ac058c481f7f272"
integrity sha512-wZUpeKrr6j/Ixbww9wuqheeDSw/oR7LN4AdV5NEuFpxM95350ZCrqhn8wSzGRJYPBtTDj2r3E5gWvM9iZwjHKg==
"@aztec/ethereum@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/ethereum/-/ethereum-0.57.0.tgz#7564a30ae4fc65cc6f7f8c12f46be1be33301f51"
integrity sha512-uR7MGGmvUANW6RAHsVXfwVKMls27ko1WJIzenbcCXDEADU2OGvp+xLJ4OLiP7YSRCnbv/WDck+O3UTdtP5YOsQ==
dependencies:
"@aztec/foundation" "0.56.0"
"@aztec/foundation" "0.57.0"
dotenv "^16.0.3"
tslib "^2.4.0"
viem "^2.7.15"

"@aztec/foundation@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/foundation/-/foundation-0.56.0.tgz#0eb996e850f79e9359cbe8a364973c11cfa7a62c"
integrity sha512-TNYCnh/hoQb1Mjt6VaBIf4Z4oCJvV2G4QPM6tJYjqM8N/h2Oddp+ayuV2G6iZzMum/Xio2WNxRFMmK4wXHR60Q==
"@aztec/foundation@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/foundation/-/foundation-0.57.0.tgz#50cec5d06722fa5fc611fb5dd4898ef212f9e8b3"
integrity sha512-wgaluyOyG8zUmxohFIlrsPj1QmLGtkN68sbYvfcAO0bR3Bhy7jbtrkCc6I7mYkiZShg41Zlj+l/WReydzOCrZg==
dependencies:
"@aztec/bb.js" "0.56.0"
"@aztec/bb.js" "0.57.0"
"@koa/cors" "^5.0.0"
"@noble/curves" "^1.2.0"
bn.js "^5.2.1"
Expand All @@ -130,39 +130,39 @@
sha3 "^2.1.4"
zod "^3.22.4"

"@aztec/l1-artifacts@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/l1-artifacts/-/l1-artifacts-0.56.0.tgz#036c1947cb26894e2c85d3b9894944762334176e"
integrity sha512-A8aXt/tST2OqY977r8B02CIS3NDiREIDueBNzqX0lT5WsVKcvLKOQBnsqquS1UhxtS8TARsJZ42fozb9lrWnqA==
"@aztec/l1-artifacts@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/l1-artifacts/-/l1-artifacts-0.57.0.tgz#8d346671ee933d69ac082211e269bb5a408ea2df"
integrity sha512-fZokAEZug2NnKXr/sWuwWlSr5BKTZcs5vm2RBu9FiV8dpsnRkyYVtaI6JXPZKeeApIh+oqHA2X0WUgxU67d67g==
dependencies:
tslib "^2.4.0"

"@aztec/noir-contracts.js@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/noir-contracts.js/-/noir-contracts.js-0.56.0.tgz#d4fda1d405cd98634e216bf2e37bf8b1f21b1ad6"
integrity sha512-Y9MP0MQEeezqwx3px/VztYkF/e0R7ZQ4r0u8cHqXiy2qYfrit5boj1/yzbPQwlXOGt36vZgE5TlTI8gvP/jVWA==
"@aztec/noir-contracts.js@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/noir-contracts.js/-/noir-contracts.js-0.57.0.tgz#7a7705a40755e4928e420cd13ba314e371d1e342"
integrity sha512-jOz+Ze1QZmRKf/tjLrXxRt5ZZTQ6b+yZ2rDptLh+pcShTKGmj6xPdkVUHKCBCVye3dxiML3vXbPNKFqlO/HfVA==
dependencies:
"@aztec/aztec.js" "0.56.0"
"@aztec/aztec.js" "0.57.0"
tslib "^2.4.0"

"@aztec/protocol-contracts@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/protocol-contracts/-/protocol-contracts-0.56.0.tgz#61ec961cf31fabcdc26f9fd44cdbb1f8194eaf27"
integrity sha512-ft2ymSxDsWHPy8TdzOFGbFtR7k7ObT7UoMl8YUluhzDst487lOe3Le79sZghwT3yrY3S/UFo7sKiuFeZOcbNBQ==
"@aztec/protocol-contracts@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/protocol-contracts/-/protocol-contracts-0.57.0.tgz#1fc37470546f04bbf0dec23f01a714b7f2eced95"
integrity sha512-sSertpZyWIyBiFrfytpTFABiWNH5nYyyTnCmq84CsiUHBy47pTTeNmW+uqGB6o0lMtACwzKbS/YK58p7tPy7QA==
dependencies:
"@aztec/circuits.js" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/types" "0.56.0"
"@aztec/circuits.js" "0.57.0"
"@aztec/foundation" "0.57.0"
"@aztec/types" "0.57.0"
lodash.omit "^4.5.0"
tslib "^2.4.0"

"@aztec/types@0.56.0":
version "0.56.0"
resolved "https://registry.yarnpkg.com/@aztec/types/-/types-0.56.0.tgz#f3b69ce7a78ebc9cbe88f24d8ff60c73b44bd243"
integrity sha512-BdSdY/qxhlO2GEbvQ99oW1RHCWI/+Tmq5G7iU2Suy6j4MEv/wGhhgmz42BQ9rcw8F2XhvzMO2fHo7Du4M/SYCQ==
"@aztec/types@0.57.0":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@aztec/types/-/types-0.57.0.tgz#c0ebcb0b1738cb3c0a1b2e9bef55366878363548"
integrity sha512-7PtIJFg0gwnl4+A02OHpyCsLdSXcskgVHrcOqusEcQ0IWI69q39fabBf6S82vgUrdvaAlynae2erz3PErHDdmQ==
dependencies:
"@aztec/ethereum" "0.56.0"
"@aztec/foundation" "0.56.0"
"@aztec/ethereum" "0.57.0"
"@aztec/foundation" "0.57.0"

"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7":
version "7.24.7"
Expand Down

0 comments on commit 0f192bf

Please sign in to comment.