Merge pull request #173 from AztecProtocol/chore/upgrade-aztec-2.0.2

updating to 2.0.2

Author: critesjosh

.github/workflows/tests.yaml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Set Aztec version and start sandbox
         run: |
-          VERSION=1.2.0 aztec-up
+          VERSION=2.0.2 aztec-up
           aztec start --sandbox &
 
       - name: Install project dependencies
@@ -46,15 +46,15 @@ jobs:
         run: script -e -c "${AZTEC_NARGO:-aztec-nargo} compile"
 
       - name: Codegen
-        run: script -e -c "aztec codegen target --outdir src/artifacts"
+        run: script -e -c "aztec codegen target --outdir src/artifacts && aztec-postprocess-contract"
 
       - 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"
 
-      - name: Deploy account and capture SECRET/SALT
+      - name: Deploy account and capture SECRET/SIGNING_KEY/SALT
         run: |
           script -e -c "yarn clear-store"
           # Create a temporary file to store the output
@@ -73,24 +73,27 @@ jobs:
           # Show the full output for debugging
           cat "$TEMP_OUTPUT"
 
-          # Extract SECRET and SALT from the output
+          # Extract SECRET, SIGNING_KEY, and SALT from the output
           SECRET_KEY=$(grep -o "🔑 Secret key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🔑 Secret key generated: //' || echo "")
+          SIGNING_KEY=$(grep -o "🖊️ Signing key generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🖊️ Signing key generated: //' || echo "")
           SALT_VALUE=$(grep -o "🧂 Salt generated: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/🧂 Salt generated: //' || echo "")
 
           # Clean up temp file
           rm "$TEMP_OUTPUT"
 
           # Validate and create .env file
-          if [ -n "$SECRET_KEY" ] && [ -n "$SALT_VALUE" ]; then
+          if [ -n "$SECRET_KEY" ] && [ -n "$SIGNING_KEY" ] && [ -n "$SALT_VALUE" ]; then
             
             # Create .env file with all necessary values
             echo "SECRET=\"$SECRET_KEY\"" >> .env
+            echo "SIGNING_KEY=\"$SIGNING_KEY\"" >> .env
             echo "SALT=\"$SALT_VALUE\"" >> .env
             echo "📋 Current .env file contents:"
             cat .env
           else
-            echo "❌ Failed to extract SECRET and/or SALT from deploy output"
+            echo "❌ Failed to extract SECRET, SIGNING_KEY and/or SALT from deploy output"
             echo "🔍 SECRET_KEY: '$SECRET_KEY'"
+            echo "🔍 SIGNING_KEY: '$SIGNING_KEY'"
             echo "🔍 SALT_VALUE: '$SALT_VALUE'"
             exit 1
           fi

Nargo.toml

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

README.md

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

package.json

@@ -12,7 +12,7 @@
     "clean": "rm -rf ./src/artifacts ./target",
     "clear-store": "rm -rf ./store",
     "codegen": "aztec codegen target --outdir src/artifacts",
-    "compile": "${AZTEC_NARGO:-aztec-nargo} compile",
+    "compile": "${AZTEC_NARGO:-aztec-nargo} compile && aztec-postprocess-contract",
     "deploy": "node --loader ts-node/esm scripts/deploy_contract.ts",
     "deploy-account": "node --loader ts-node/esm scripts/deploy_account.ts",
     "interaction-existing-contract": "node --loader ts-node/esm scripts/interaction_existing_contract.ts",
@@ -26,12 +26,12 @@
     "update-readme-version": "node ./.github/scripts/update-readme-version.js"
   },
   "dependencies": {
-    "@aztec/accounts": "1.2.0",
-    "@aztec/aztec.js": "1.2.0",
-    "@aztec/noir-contracts.js": "1.2.0",
-    "@aztec/protocol-contracts": "1.2.0",
-    "@aztec/pxe": "1.2.0",
-    "@aztec/stdlib": "1.2.0"
+    "@aztec/accounts": "2.0.2",
+    "@aztec/aztec.js": "2.0.2",
+    "@aztec/noir-contracts.js": "2.0.2",
+    "@aztec/protocol-contracts": "2.0.2",
+    "@aztec/pxe": "2.0.2",
+    "@aztec/stdlib": "2.0.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.11",

scripts/deploy_contract.ts

@@ -1,4 +1,4 @@
-import { EasyPrivateVotingContract } from "../src/artifacts/EasyPrivateVoting.js"
+import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
 import { createLogger, PXE, Logger, SponsoredFeePaymentMethod, Fr } from "@aztec/aztec.js";
 import { TokenContract } from "@aztec/noir-contracts.js/Token"
 import { setupPXE } from "../src/utils/setup_pxe.js";
@@ -23,7 +23,7 @@ async function main() {
     logger.info('💰 Setting up sponsored fee payment contract...');
     const sponsoredFPC = await getSponsoredFPCInstance();
     logger.info(`💰 Sponsored FPC instance obtained at: ${sponsoredFPC.address}`);
-    
+
     logger.info('📝 Registering sponsored FPC contract with PXE...');
     await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
     const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
@@ -39,30 +39,33 @@ async function main() {
     // Deploy voting contract
     logger.info('🗳️  Starting voting contract deployment...');
     logger.info(`📋 Admin address for voting contract: ${address}`);
-    
-    const deployTx = EasyPrivateVotingContract.deploy(wallet, address).send({ 
-        fee: { paymentMethod: sponsoredPaymentMethod } 
+
+    const deployTx = PrivateVotingContract.deploy(wallet, address).send({
+        from: wallet.getAddress(),
+        fee: { paymentMethod: sponsoredPaymentMethod }
     });
-    
+
     logger.info('⏳ Waiting for deployment transaction to be mined...');
     const votingContract = await deployTx.deployed({ timeout: 120000 });
-    
+
     logger.info(`🎉 Voting Contract deployed successfully!`);
     logger.info(`📍 Contract address: ${votingContract.address}`);
     logger.info(`👤 Admin address: ${address}`);
-    
+
     // Verify deployment
     logger.info('🔍 Verifying contract deployment...');
     try {
         // Test a read operation
         logger.info('🧪 Testing contract read operation...');
-        const initialVoteCount = await votingContract.methods.get_vote(Fr.fromString("1")).simulate();
+        const initialVoteCount = await votingContract.methods.get_vote(Fr.fromString("1")).simulate({
+            from: wallet.getAddress()
+        });
         logger.info(`📊 Initial vote count for candidate 1: ${initialVoteCount}`);
-        
+
     } catch (error) {
         logger.error(`❌ Contract verification failed: ${error}`);
     }
-    
+
     logger.info('🏁 Deployment process completed successfully!');
     logger.info(`📋 Summary:`);
     logger.info(`   - Contract Address: ${votingContract.address}`);
@@ -75,4 +78,4 @@ main().catch((error) => {
     logger.error(`❌ Deployment failed: ${error.message}`);
     logger.error(`📋 Error details: ${error.stack}`);
     process.exit(1);
-});
+});

scripts/fees.ts

@@ -6,22 +6,21 @@ import { foundry } from 'viem/chains'
 import { mnemonicToAccount } from 'viem/accounts';
 import { FeeJuiceContract } from "@aztec/noir-contracts.js/FeeJuice";
 import { FPCContract } from "@aztec/noir-contracts.js/FPC";
-import { EasyPrivateVotingContract } from "../src/artifacts/EasyPrivateVoting.js"
+import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
 import { TokenContract } from "@aztec/noir-contracts.js/Token";
 // TODO: replace with import from aztec.js when published
 import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee/testing'
 import { getDeployedSponsoredFPCAddress, getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
 import { createEthereumChain, createExtendedL1Client } from "@aztec/ethereum";
 import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
 import { setupPXE } from "../src/utils/setup_pxe.js";
-import { createLogger, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, Logger, PrivateFeePaymentMethod, PublicFeePaymentMethod, PXE } from '@aztec/aztec.js';
+import { createLogger, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, Fq, Fr, L1FeeJuicePortalManager, Logger, PrivateFeePaymentMethod, PublicFeePaymentMethod, PXE } from '@aztec/aztec.js';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
 
 const MNEMONIC = 'test test test test test test test test test test test junk';
-const FEE_FUNDING_FOR_TESTER_ACCOUNT = 1000000000000000000n;
+const FEE_FUNDING_FOR_TESTER_ACCOUNT = 1000000000000000000000n;
 
 async function main() {
 
@@ -43,8 +42,9 @@ async function main() {
     const wallet1 = await account1.getWallet();
 
     let secretKey = Fr.random();
+    let signingKey = Fq.random();
     let salt = Fr.random();
-    let account2 = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
+    let account2 = await getSchnorrAccount(pxe, secretKey, signingKey, salt);
     const wallet2 = await account2.getWallet();
     const feeJuiceRecipient = account2.getAddress();
 
@@ -67,8 +67,14 @@ async function main() {
     const paymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
 
     // Two arbitrary txs to make the L1 message available on L2
-    const votingContract = await EasyPrivateVotingContract.deploy(wallet1, wallet1.getAddress()).send({ fee: { paymentMethod } }).deployed();
-    const bananaCoin = await TokenContract.deploy(wallet1, wallet1.getAddress(), "bananaCoin", "BNC", 18).send({ fee: { paymentMethod } }).deployed()
+    const votingContract = await PrivateVotingContract.deploy(wallet1, wallet1.getAddress()).send({
+        from: wallet1.getAddress(),
+        fee: { paymentMethod }
+    }).deployed();
+    const bananaCoin = await TokenContract.deploy(wallet1, wallet1.getAddress(), "bananaCoin", "BNC", 18).send({
+        from: wallet1.getAddress(),
+        fee: { paymentMethod }
+    }).deployed()
 
     // Claim Fee Juice & Pay Fees yourself
 
@@ -80,7 +86,10 @@ async function main() {
 
     // Create a new voting contract instance, interacting from the newWallet
     const useFeeJuice = new FeeJuicePaymentMethod(account2.getAddress())
-    await votingContract.withWallet(wallet2).methods.cast_vote(wallet1.getAddress()).send({ fee: { paymentMethod: useFeeJuice } }).wait()
+    await votingContract.withWallet(wallet2).methods.cast_vote(wallet1.getAddress()).send({
+        from: wallet2.getAddress(),
+        fee: { paymentMethod: useFeeJuice }
+    }).wait()
     logger.info(`Vote cast from new account, paying fees via newWallet.`)
 
     // Private Fee Payments via FPC
@@ -89,40 +98,62 @@ async function main() {
     // Need to deploy an FPC to use Private Fee payment methods
 
     // This uses bananaCoin as the fee paying asset that will be exchanged for fee juice
-    const fpc = await FPCContract.deploy(wallet1, bananaCoin.address, wallet1.getAddress()).send({ fee: { paymentMethod } }).deployed()
+    const fpc = await FPCContract.deploy(wallet1, bananaCoin.address, wallet1.getAddress()).send({
+        from: wallet1.getAddress(),
+        fee: { paymentMethod }
+    }).deployed()
     const fpcClaim = await feeJuicePortalManager.bridgeTokensPublic(fpc.address, FEE_FUNDING_FOR_TESTER_ACCOUNT, true);
     // 2 public txs to make the bridged fee juice available
     // Mint some bananaCoin and send to the newWallet to pay fees privately
-    await bananaCoin.methods.mint_to_private(wallet1.getAddress(), wallet2.getAddress(), FEE_FUNDING_FOR_TESTER_ACCOUNT).send({ fee: { paymentMethod } }).wait()
+    await bananaCoin.methods.mint_to_private(wallet2.getAddress(), FEE_FUNDING_FOR_TESTER_ACCOUNT).send({
+        from: wallet1.getAddress(),
+        fee: { paymentMethod }
+    }).wait()
     // mint some public bananaCoin to the newWallet to pay fees publicly
-    await bananaCoin.methods.mint_to_public(wallet2.getAddress(), FEE_FUNDING_FOR_TESTER_ACCOUNT).send({ fee: { paymentMethod } }).wait()
-    const bananaBalance = await bananaCoin.withWallet(wallet2).methods.balance_of_private(wallet2.getAddress()).simulate()
+    await bananaCoin.methods.mint_to_public(wallet2.getAddress(), FEE_FUNDING_FOR_TESTER_ACCOUNT).send({
+        from: wallet1.getAddress(),
+        fee: { paymentMethod }
+    }).wait()
+    const bananaBalance = await bananaCoin.withWallet(wallet2).methods.balance_of_private(wallet2.getAddress()).simulate({
+        from: wallet2.getAddress()
+    })
 
     logger.info(`BananaCoin balance of newWallet is ${bananaBalance}`)
 
     const feeJuiceInstance = await getCanonicalFeeJuice();
     const feeJuice = await FeeJuiceContract.at(feeJuiceInstance.address, wallet2)
-    await feeJuice.methods.claim(fpc.address, fpcClaim.claimAmount, fpcClaim.claimSecret, fpcClaim.messageLeafIndex).send().wait()
+    await feeJuice.methods.claim(fpc.address, fpcClaim.claimAmount, fpcClaim.claimSecret, fpcClaim.messageLeafIndex).send({ from: wallet2.getAddress() }).wait()
 
-    logger.info(`Fpc fee juice balance ${await feeJuice.methods.balance_of_public(fpc.address).simulate()}`)
+    logger.info(`Fpc fee juice balance ${await feeJuice.methods.balance_of_public(fpc.address).simulate({
+        from: wallet2.getAddress()
+    })}`)
 
     const privateFee = new PrivateFeePaymentMethod(fpc.address, wallet2)
-    await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({ fee: { paymentMethod: privateFee } }).wait()
+    await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({
+        from: wallet2.getAddress(),
+        fee: { paymentMethod: privateFee }
+    }).wait()
 
     logger.info(`Transfer paid with fees via the FPC, privately.`)
 
     // Public Fee Payments via FPC
 
     const publicFee = new PublicFeePaymentMethod(fpc.address, wallet2)
-    await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({ fee: { paymentMethod: publicFee } }).wait()
+    await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({
+        from: wallet2.getAddress(),
+        fee: { paymentMethod: publicFee }
+    }).wait()
     logger.info(`Transfer paid with fees via the FPC, publicly.`)
 
     // Sponsored Fee Payment
 
     // This method will only work in environments where there is a sponsored fee contract deployed 
     const deployedSponsoredFPC = await getDeployedSponsoredFPCAddress(pxe);
     const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(deployedSponsoredFPC);
-    await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait()
+    await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({
+        from: wallet2.getAddress(),
+        fee: { paymentMethod: sponsoredPaymentMethod }
+    }).wait()
     logger.info(`Transfer paid with fees from Sponsored FPC.`)
 }
 
@@ -137,4 +168,3 @@ function getL1WalletClient(rpcUrl: string, index: number) {
         transport: http(rpcUrl),
     });
 }
-

scripts/interaction_existing_contract.ts

@@ -1,5 +1,5 @@
 import { createLogger, Logger, SponsoredFeePaymentMethod, Fr, AztecAddress } from "@aztec/aztec.js";
-import { EasyPrivateVotingContract } from "../src/artifacts/EasyPrivateVoting.js";
+import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 import { setupPXE } from "../src/utils/setup_pxe.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
@@ -29,7 +29,7 @@ async function main() {
     }
 
     logger.info(`Connecting to voting contract at: ${contractAddress}`);
-    const votingContract = await EasyPrivateVotingContract.at(
+    const votingContract = await PrivateVotingContract.at(
         AztecAddress.fromString(contractAddress),
         wallet
     );
@@ -39,19 +39,26 @@ async function main() {
 
     // First get_vote call - check initial vote count
     logger.info("Getting initial vote count...");
-    const initialVoteCount = await votingContract.methods.get_vote(candidate).simulate();
+    const initialVoteCount = await votingContract.methods.get_vote(candidate).simulate({
+        from: wallet.getAddress()
+    });
     logger.info(`Initial vote count for candidate ${candidate}: ${initialVoteCount}`);
 
     // Cast a vote
     logger.info("Casting vote...");
     await votingContract.methods.cast_vote(candidate)
-        .send({ fee: { paymentMethod: sponsoredPaymentMethod } })
+        .send({
+            from: wallet.getAddress(),
+            fee: { paymentMethod: sponsoredPaymentMethod }
+        })
         .wait({ timeout: 120000 });
     logger.info("Vote cast successfully!");
 
     // Second get_vote call - check updated vote count
     logger.info("Getting updated vote count...");
-    const updatedVoteCount = await votingContract.methods.get_vote(candidate).simulate();
+    const updatedVoteCount = await votingContract.methods.get_vote(candidate).simulate({
+        from: wallet.getAddress()
+    });
     logger.info(`Updated vote count for candidate ${candidate}: ${updatedVoteCount}`);
 
     logger.info(`Vote count increased from ${initialVoteCount} to ${updatedVoteCount}`);
@@ -60,4 +67,4 @@ async function main() {
 main().catch((error) => {
     console.error("Error:", error);
     process.exit(1);
-}); 
+});