Merge pull request #84 from AztecProtocol/jc/0.85

update to 85

Author: critesjosh

.github/workflows/tests.yaml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Set Aztec version and start sandbox
         run: |
-          VERSION=0.84.0 aztec-up
+          VERSION=0.85.0 aztec-up
           aztec start --sandbox &
 
       - name: Install project dependencies

Nargo.toml

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

README.md

@@ -41,7 +41,7 @@ bash -i <(curl -s https://install.aztec.network)
 Install the correct version of the toolkit with:
 
 ```bash
-aztec-up 0.84.0
+aztec-up 0.85.0
 ```
 
 Start the sandbox with:

jest.integration.config.json

@@ -8,5 +8,5 @@
   },
   "testRegex": "./src/.*\\.test\\.ts$",
   "rootDir": "./src",
-  "testTimeout": 70000
+  "testTimeout": 100000
 }

package.json

@@ -22,10 +22,10 @@
     "update-readme-version": "node ./.github/scripts/update-readme-version.js"
   },
   "dependencies": {
-    "@aztec/accounts": "0.84.0",
-    "@aztec/aztec.js": "0.84.0",
-    "@aztec/noir-contracts.js": "0.84.0",
-    "@aztec/stdlib": "0.84.0",
+    "@aztec/accounts": "0.85.0",
+    "@aztec/aztec.js": "0.85.0",
+    "@aztec/noir-contracts.js": "0.85.0",
+    "@aztec/stdlib": "0.85.0",
     "@types/node": "^22.5.1"
   },
   "devDependencies": {

src/test/e2e/accounts.test.ts

@@ -54,7 +54,7 @@ describe("Accounts", () => {
 
         // generate random accounts
         randomAccountManagers = await Promise.all(
-            (await generateSchnorrAccounts(5)).map(
+            (await generateSchnorrAccounts(2)).map(
                 a => getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)
             )
         );
@@ -110,21 +110,15 @@ describe("Accounts", () => {
         let sentTxs = [];
         for (let i = 0; i < randomWallets.length; i++) {
             const paymentMethod = new FeeJuicePaymentMethodWithClaim(randomWallets[i], claims[i]);
-            sentTxs.push(randomAccountManagers[i].deploy({ fee: { paymentMethod } }));
+            await randomAccountManagers[i].deploy({ fee: { paymentMethod } }).wait();
         }
-        await Promise.all(sentTxs.map(stx => stx.wait()));
-
         // balance after deploy with claimed fee juice
-        balances = await Promise.all(randomAddresses.map(async a => getFeeJuiceBalance(a, pxe)));
+        balances = await Promise.all(randomAddresses.map(async a => await getFeeJuiceBalance(a, pxe)));
         const amountAfterDeploy = claimAmount - approxMaxDeployCost;
         balances.forEach(b => expect(b).toBeGreaterThanOrEqual(amountAfterDeploy));
 
     });
 
-    it("Deploys first unfunded account from first funded account", async () => {
-        const tx_acc = await randomAccountManagers[0].deploy({ deployWallet: wallets[0] });
-    });
-
     it("Sponsored contract deployment", async () => {
         const salt = Fr.random();
         const VotingContractArtifact = EasyPrivateVotingContractArtifact
@@ -138,7 +132,6 @@ describe("Accounts", () => {
         const daWallets = await Promise.all(accounts.map(a => a.getWallet()));
         const [deployerWallet, adminWallet] = daWallets;
         const [deployerAddress, adminAddress] = daWallets.map(w => w.getAddress());
-        // const adminAddress = adminWallet.getCompleteAddress().address;
 
         const deploymentData = await getContractInstanceFromDeployParams(VotingContractArtifact,
             {
@@ -151,12 +144,12 @@ describe("Accounts", () => {
             contractAddressSalt: salt,
             fee: { paymentMethod: sponsoredPaymentMethod } // without the sponsoredFPC the deployment fails, thus confirming it works
         })
+
         const receipt = await tx.getReceipt();
 
         expect(receipt).toEqual(
             expect.objectContaining({
                 status: TxStatus.PENDING,
-                error: ''
             }),
         );
 

src/test/e2e/index.test.ts

@@ -154,7 +154,7 @@ describe("Voting", () => {
         // tx will be included in a block but with app logic reverted
         await expect(
             votingContract.methods.cast_vote(candidate).send({ skipPublicSimulation: true }).wait(),
-        ).rejects.toThrow('Reason: Tx dropped by P2P node.');
+        ).rejects.toThrow(/Existing nullifier/);
 
     })