diff --git a/Nargo.toml b/Nargo.toml index d2d20a5..79e57f7 100644 --- a/Nargo.toml +++ b/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.68.2", directory = "noir-projects/aztec-nr/aztec" } +aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "aztec-packages-v0.69.1", directory = "noir-projects/aztec-nr/aztec" } diff --git a/codegenCache.json b/codegenCache.json index a5df82e..843c90c 100644 --- a/codegenCache.json +++ b/codegenCache.json @@ -1,3 +1,6 @@ { - "easy_private_voting_contract-EasyPrivateVoting.json": "4662c1c3f60516d75a615dd7f04c52b2c8536e641e8ad3d3f25a052a48d7ed40" + "easy_private_voting_contract-EasyPrivateVoting.json": { + "contractName": "EasyPrivateVoting", + "hash": "e3d673e495baee1ae2e9880c8b24461819cce93ae968a4d72a4d76fae36b8f16" + } } \ No newline at end of file diff --git a/package.json b/package.json index 91a8be9..d1a03ba 100644 --- a/package.json +++ b/package.json @@ -13,13 +13,15 @@ "compile": "${AZTEC_NARGO:-aztec-nargo} compile", "deploy": "node --loader ts-node/esm scripts/deploy.ts", "get-block": "node --loader ts-node/esm scripts/getBlock.ts", - "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json && aztec test", + "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" }, "dependencies": { - "@aztec/accounts": "0.68.2", - "@aztec/aztec.js": "0.68.2", - "@aztec/noir-contracts.js": "0.68.2", + "@aztec/accounts": "0.69.1", + "@aztec/aztec.js": "0.69.1", + "@aztec/noir-contracts.js": "0.69.1", "@types/node": "^22.5.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index da4fabf..f01a025 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,40 +15,40 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aztec/accounts@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/accounts/-/accounts-0.68.2.tgz#a44b5efca50383ce205fbf9f83ece5470b2bbf21" - integrity sha512-gvltPX7lxQUGNnsgxBXWrAzbc9SjV0Aw7IqbxH1pSQ5IUexjsC8v5qpG1gDAnvtsEdTiD0VDhESpnJWVSBo+Lg== - dependencies: - "@aztec/aztec.js" "0.68.2" - "@aztec/circuit-types" "0.68.2" - "@aztec/circuits.js" "0.68.2" - "@aztec/entrypoints" "0.68.2" - "@aztec/ethereum" "0.68.2" - "@aztec/foundation" "0.68.2" - "@aztec/types" "0.68.2" +"@aztec/accounts@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/accounts/-/accounts-0.69.1.tgz#9a0ca99a514bfc04d75f20503882b934ad20d12f" + integrity sha512-eszCnQn0Bz1+dESZmdtrDOC3EJVKA93kvfj8tjyNX3Uo/qQXvKFdYsT2nhkAvU56f5Ni+Ux96sP6FFaQv9SA3w== + dependencies: + "@aztec/aztec.js" "0.69.1" + "@aztec/circuit-types" "0.69.1" + "@aztec/circuits.js" "0.69.1" + "@aztec/entrypoints" "0.69.1" + "@aztec/ethereum" "0.69.1" + "@aztec/foundation" "0.69.1" + "@aztec/types" "0.69.1" tslib "^2.4.0" -"@aztec/aztec.js@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/aztec.js/-/aztec.js-0.68.2.tgz#b715f678ebdd248784bf1756e7a883d94f0c049c" - integrity sha512-QuVnaMwPwtrx/a6XYjqXsRaEdikyA2TS2O/zwEyzDbDE5Y1yhFyWlzdq5MPAq3pK0akAgcL5CeP7vbHPNzeWTw== - dependencies: - "@aztec/circuit-types" "0.68.2" - "@aztec/circuits.js" "0.68.2" - "@aztec/ethereum" "0.68.2" - "@aztec/foundation" "0.68.2" - "@aztec/l1-artifacts" "0.68.2" - "@aztec/protocol-contracts" "0.68.2" - "@aztec/types" "0.68.2" +"@aztec/aztec.js@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/aztec.js/-/aztec.js-0.69.1.tgz#7cde50d5c2ad9116908c7e2d6215b8ef0cba92fa" + integrity sha512-t0GVQvkrkadleKK+Xwj+KEB2U0+YvCKhB9/WTwlGcA3Fk/zWWBGhrnl/ish/LCCShScUHGYGH2+EtywLixSzTA== + dependencies: + "@aztec/circuit-types" "0.69.1" + "@aztec/circuits.js" "0.69.1" + "@aztec/ethereum" "0.69.1" + "@aztec/foundation" "0.69.1" + "@aztec/l1-artifacts" "0.69.1" + "@aztec/protocol-contracts" "0.69.1" + "@aztec/types" "0.69.1" axios "^1.7.2" tslib "^2.4.0" viem "^2.7.15" -"@aztec/bb.js@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/bb.js/-/bb.js-0.68.2.tgz#282b308a9cc07d5a63231aecfe99def231fdf768" - integrity sha512-GEpOFy4yUsyga0R7Jo0tdqwsrLNAeAnKi3D7jK3FqV1G7x5VURp0Jx9Lcb6fpiBnS5gLRf1S8IRREqoh+obM9g== +"@aztec/bb.js@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/bb.js/-/bb.js-0.69.1.tgz#6616fb70ab1c681b87e5e0fb768deb07bef45213" + integrity sha512-arz++pPCDwJVKWeiI4RfxrLA6w+TQVL/MTononayv3Jm2j5vtXC0va3/nrQQukaJT0DUaKWLK7UuIFTSuOIKOA== dependencies: comlink "^4.4.1" commander "^12.1.0" @@ -57,15 +57,15 @@ pako "^2.1.0" tslib "^2.4.0" -"@aztec/circuit-types@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/circuit-types/-/circuit-types-0.68.2.tgz#7c31fd92e8537e420dd65c132afea93e9ccdf125" - integrity sha512-0h+GTL7wLk/RMxb0C4H+KFuslMJhB4DjC4FKD+0MuJbqey122n2Ynu/WdWmiK/HTuN5+Vpfwm/g7svqeOz3EPw== +"@aztec/circuit-types@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/circuit-types/-/circuit-types-0.69.1.tgz#b4b1ed12522be351a44fc69bdd8c8688a574f56e" + integrity sha512-wluhI+pj0SRJZiGTAEZvy5J7fpvEiagQDFd3rtGH7Lm0KJmh2nDa33o7mIMHL0JbLmdMm1KBWiCefJLMvYXdjQ== dependencies: - "@aztec/circuits.js" "0.68.2" - "@aztec/ethereum" "0.68.2" - "@aztec/foundation" "0.68.2" - "@aztec/types" "0.68.2" + "@aztec/circuits.js" "0.69.1" + "@aztec/ethereum" "0.69.1" + "@aztec/foundation" "0.69.1" + "@aztec/types" "0.69.1" browserify-cipher "^1.0.1" lodash.clonedeep "^4.5.0" lodash.isequal "^4.5.0" @@ -73,51 +73,50 @@ tslib "^2.5.0" zod "^3.23.8" -"@aztec/circuits.js@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/circuits.js/-/circuits.js-0.68.2.tgz#23893b765d04a073529fd112109a01c0b3c9299b" - integrity sha512-179Eq+/tnEaJ4pArtQvNY1WeAYyIONjMiaMwn1SIJTrFegeGEto5aXC1Kbw1E0QED8Fn7f+S5+wjQlZ5Q40KTw== +"@aztec/circuits.js@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/circuits.js/-/circuits.js-0.69.1.tgz#6423d922cfd62a9aa07e51d2e8f0dc4725218ebe" + integrity sha512-Vri/laVbsGG0O4vX2ObAyeZPrLFXbRMjvXwmuutv1VSbo2uaE3NFgpNqhXPECoYJluyKIvXvIB5cAatf5B5tfA== dependencies: - "@aztec/bb.js" "0.68.2" - "@aztec/ethereum" "0.68.2" - "@aztec/foundation" "0.68.2" - "@aztec/types" "0.68.2" + "@aztec/bb.js" "0.69.1" + "@aztec/ethereum" "0.69.1" + "@aztec/foundation" "0.69.1" + "@aztec/types" "0.69.1" eslint "^8.35.0" tslib "^2.4.0" zod "^3.23.8" -"@aztec/entrypoints@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/entrypoints/-/entrypoints-0.68.2.tgz#ac5e1a9c832baa62aca88009c91f608b5560c787" - integrity sha512-udRZ+7YXhmDWrcgroEzF0BJA2/f3Mv8QutSrKir6QT6TAh21aDdl1qQ7Thauz8lUGQjPekAnt+IMr6Xpk/RE3g== +"@aztec/entrypoints@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/entrypoints/-/entrypoints-0.69.1.tgz#634af620d6921923e5c78cb492df781c2cacaf5b" + integrity sha512-1PXvaF0JuAfVhO2ORgstDyjbLcIJeziPo0aRXvbHOsAupZew2u7ALr7Mxh/7q5W0jLm2/egW7McCjFoDzBu/CQ== dependencies: - "@aztec/aztec.js" "0.68.2" - "@aztec/circuit-types" "0.68.2" - "@aztec/circuits.js" "0.68.2" - "@aztec/foundation" "0.68.2" - "@aztec/protocol-contracts" "0.68.2" + "@aztec/aztec.js" "0.69.1" + "@aztec/circuit-types" "0.69.1" + "@aztec/circuits.js" "0.69.1" + "@aztec/foundation" "0.69.1" + "@aztec/protocol-contracts" "0.69.1" tslib "^2.4.0" -"@aztec/ethereum@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/ethereum/-/ethereum-0.68.2.tgz#78958ee03bfb25bf40537d8561b07ab5827f1c0e" - integrity sha512-uXVYaGZSDHpegE23AHnkzf04MACNhABISqKoQUbyvlBYJg8wCu93YR32C4ragVdXRLTxCSOhSPdyjvQYULRIKg== +"@aztec/ethereum@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/ethereum/-/ethereum-0.69.1.tgz#dbbd26335c0da7b3d4c1c5ab891d94d8250de218" + integrity sha512-FAsHtEf+Zl+4OyW8eXZ8hVFb1lffTySeavuzs/568xEqY8a/d1+FFbzDEwuzc7GVweawmIBRmHwY1cxANUDo4A== dependencies: - "@aztec/foundation" "0.68.2" - "@aztec/l1-artifacts" "0.68.2" + "@aztec/foundation" "0.69.1" + "@aztec/l1-artifacts" "0.69.1" "@viem/anvil" "^0.0.10" dotenv "^16.0.3" - get-port "^7.1.0" tslib "^2.4.0" viem "^2.7.15" zod "^3.23.8" -"@aztec/foundation@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/foundation/-/foundation-0.68.2.tgz#6210be15fccd2c1648a0bdb2ed38272eb622a05f" - integrity sha512-Cbe/fZEg7VPhrFKT+ba4grX3OZGY4V76Qd3H8v86czF91J8JUs3iVbqkqufeMLP3tJEqFwc0J7U9Pko64c2ftQ== +"@aztec/foundation@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/foundation/-/foundation-0.69.1.tgz#ecb4ceef3947881ff6915536d28a6f150dc533a9" + integrity sha512-+AWTZaNrefIXiBWcmnEf521iDSRB72CsXKj1ubUEE62B6/ba5I2ddT4m5DtGnb7YHrEGg/ESXnEqSVv7jrllmA== dependencies: - "@aztec/bb.js" "0.68.2" + "@aztec/bb.js" "0.69.1" "@koa/cors" "^5.0.0" "@noble/curves" "^1.2.0" bn.js "^5.2.1" @@ -142,40 +141,40 @@ sha3 "^2.1.4" zod "^3.23.8" -"@aztec/l1-artifacts@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/l1-artifacts/-/l1-artifacts-0.68.2.tgz#ef704671cbc53cbfd7b4ebad6eb6477c878513a1" - integrity sha512-8RmpCC5PiZY7fDXJb20mbhgPSADG/Q+bK/tMV4+U68Xfew7yTN+Lxv5+HJan7R+UOcGUN7pU8BrMgrABvYHuHw== +"@aztec/l1-artifacts@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/l1-artifacts/-/l1-artifacts-0.69.1.tgz#a10b1505931609b65a53306f6973fa588d120ded" + integrity sha512-DQZGPCBrz9+wZfN2MpbA9kDXxZQou36lNqE1OtZXKI556jrECJn8EwURO4eayALMvTMVTKBdOihwUWPIwi0pvA== dependencies: tslib "^2.4.0" -"@aztec/noir-contracts.js@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/noir-contracts.js/-/noir-contracts.js-0.68.2.tgz#9fd45932d236fd6379331c82e56962f398dba801" - integrity sha512-I9yv3CaDoa79xe/cV2+EUSF/AyDZ/TndHbEylaFr9+jVjG8aOOrCyoq6LwDPNT3nW5fyeDaBrfWa1CSmz/BXAw== +"@aztec/noir-contracts.js@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/noir-contracts.js/-/noir-contracts.js-0.69.1.tgz#dcfd880ef16d05b4c9080dc848bd6d6c80337568" + integrity sha512-c6DbsnmHKymV7Ru8qdy139UgZ0jhF6Muw0/FPJOZIBVFjW78wDedTK8/dQRdCiWWXAcrYvpUK4N85OzbLoVV0Q== dependencies: - "@aztec/aztec.js" "0.68.2" + "@aztec/aztec.js" "0.69.1" tslib "^2.4.0" -"@aztec/protocol-contracts@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/protocol-contracts/-/protocol-contracts-0.68.2.tgz#c5d701e7222cd09345e60d7a0f1ee1939932eaa7" - integrity sha512-fBqYCQDcfvJYQEw8rGWrei/DSqhIpT+PWern+H3VZ1bBPJK70JPFizKEP/bSKfE8UuAsOy8FnItUwQdMH+vQ8A== +"@aztec/protocol-contracts@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/protocol-contracts/-/protocol-contracts-0.69.1.tgz#7c1d0e88ea287e03da8c63547814730a11d9b384" + integrity sha512-zkusi+IlMb6F67A+DIfZxU/Gyqvtix5bPYlZ15yEyqGDZorO0rN6Ucp2f1jHS5kl32sXy15xaWxvUFYxu/bSAw== dependencies: - "@aztec/circuits.js" "0.68.2" - "@aztec/foundation" "0.68.2" - "@aztec/types" "0.68.2" + "@aztec/circuits.js" "0.69.1" + "@aztec/foundation" "0.69.1" + "@aztec/types" "0.69.1" lodash.chunk "^4.2.0" lodash.omit "^4.5.0" tslib "^2.4.0" -"@aztec/types@0.68.2": - version "0.68.2" - resolved "https://registry.yarnpkg.com/@aztec/types/-/types-0.68.2.tgz#ecbf4f85d6670b27a175595203abc2480e20ff21" - integrity sha512-wiOEiuoDjJuwBcoMUjUWD4aYA0CUIMXOsmBt7T0L2XOYuVUo5NcXS5hsXyubGMMwaUzkeATXr/kT6R7UU1xVuQ== +"@aztec/types@0.69.1": + version "0.69.1" + resolved "https://registry.yarnpkg.com/@aztec/types/-/types-0.69.1.tgz#8b84f20ff97dfe79edd5199ec21dbe4faf4a46d5" + integrity sha512-kFY1ttKvPSImhxHfw1TuaVKgkAG3resxAelfBOOcMOVQCmvfsxqwvWgUGk2D7VncJKu6CvgSuo1F3eGHw42nrw== dependencies: - "@aztec/ethereum" "0.68.2" - "@aztec/foundation" "0.68.2" + "@aztec/ethereum" "0.69.1" + "@aztec/foundation" "0.69.1" "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7": version "7.24.7" @@ -2119,11 +2118,6 @@ get-port@^6.1.2: resolved "https://registry.yarnpkg.com/get-port/-/get-port-6.1.2.tgz#c1228abb67ba0e17fb346da33b15187833b9c08a" integrity sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw== -get-port@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/get-port/-/get-port-7.1.0.tgz#d5a500ebfc7aa705294ec2b83cc38c5d0e364fec" - integrity sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw== - get-stream@^6.0.0, get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"