Merge pull request #231 from AztecProtocol/fix-old-references-to-private-voting

fix old references to private voting

Author: sklppy88

.env.example

@@ -1,8 +1,7 @@
-VOTING_CONTRACT_ADDRESS="0x2320c9938b3e87feb4e475413456d028572f3367e18d61e7d198d342b557f297"
+POD_RACING_CONTRACT_ADDRESS="0x2320c9938b3e87feb4e475413456d028572f3367e18d61e7d198d342b557f297"
 SECRET="0x29aa7f43021f964fe46527ff4df0e9211de94274f54eff12ec81070ee3e16300"
 SALT="0x23c46f2dd4450fb881f0b0e70c3974f84dfa9d199493001b3fe8eb136dc612cd"
 AZTEC_ENV=sandbox
-VOTING_CONTRACT_ADDRESS="0x0407e827124a8ce742a4e63250f4f508a8b5043746dcedae8312bd32ea24154d"
 CONTRACT_SALT="0x2d7e8a973f9039f0e2c7771376e131f8ca1c18bd337ee8fa5c6d89db0198645e"
 CONTRACT_DEPLOYER="0x2e34557bae428d3c489f67e9aa326b41a09faf03f619969b883e413cbec7bc1c"
 CONTRACT_PK_NULLIFIER="0x01498945581e0eb9f8427ad6021184c700ef091d570892c437d12c7d90364bbd170ae506787c5c43d6ca9255d571c10fa9ffa9d141666e290c347c5c9ab7e344"

.github/workflows/devnet.yaml

@@ -108,12 +108,12 @@ jobs:
 
           cat "$TEMP_OUTPUT"
 
-          VOTING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
+          POD_RACING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
 
           rm "$TEMP_OUTPUT"
 
-          if [ -n "$VOTING_CONTRACT_ADDRESS" ]; then
-            echo "VOTING_CONTRACT_ADDRESS=\"$VOTING_CONTRACT_ADDRESS\"" >> .env
+          if [ -n "$POD_RACING_CONTRACT_ADDRESS" ]; then
+            echo "POD_RACING_CONTRACT_ADDRESS=\"$POD_RACING_CONTRACT_ADDRESS\"" >> .env
             echo "📋 Saved contract address to .env file"
           else
             echo "⚠️ Warning: Could not extract contract address"

.github/workflows/sandbox.yaml

@@ -124,7 +124,7 @@ jobs:
           cat "$TEMP_OUTPUT"
 
           # Extract contract address
-          VOTING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
+          POD_RACING_CONTRACT_ADDRESS=$(grep -o "Contract address: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Contract address: //' || echo "")
 
           # Extract salt
           CONTRACT_SALT=$(grep -o "Salt: 0x[a-fA-F0-9]*" "$TEMP_OUTPUT" | head -1 | sed 's/Salt: //' || echo "")
@@ -144,8 +144,8 @@ jobs:
           rm "$TEMP_OUTPUT"
 
           # Save all data to .env
-          if [ -n "$VOTING_CONTRACT_ADDRESS" ]; then
-            echo "VOTING_CONTRACT_ADDRESS=\"$VOTING_CONTRACT_ADDRESS\"" >> .env
+          if [ -n "$POD_RACING_CONTRACT_ADDRESS" ]; then
+            echo "POD_RACING_CONTRACT_ADDRESS=\"$POD_RACING_CONTRACT_ADDRESS\"" >> .env
             echo "📋 Saved contract address to .env file"
           fi
 

README.md

@@ -10,7 +10,9 @@
 
 This repo is meant to be a starting point for learning to write Aztec contracts and tests on the Aztec sandbox (local development environment). It includes an example contract, useful commands in `package.json` and helpful scripts in `./scripts`.
 
-You can find the **Easy Private Voting contract** in `./src/main.nr`. A simple integration test is in `./src/test/e2e/index.test.ts`.
+You can find the **Pod Racing Game contract** in `./src/main.nr`. A simple integration test is in `./src/test/e2e/index.test.ts`.
+
+The Pod Racing contract is a two-player competitive game where players allocate points across 5 tracks over multiple rounds. The game demonstrates Aztec's private state capabilities - round choices remain private until players reveal their final scores.
 
 ## Devnet
 
@@ -176,7 +178,7 @@ You can find a handful of scripts in the `./scripts` folder.
 - `./scripts/fees.ts` is an example of how to pay for a contract deployment using various fee payment methods.
 - `./scripts/multiple_wallet.ts` is an example of how to deploy a contract from one wallet instance and interact with it from another.
 - `./scripts/profile_deploy.ts` shows how to profile a transaction and print the results.
-- `./scripts/interaction_existing_contract.ts` demonstrates how to interact with an already deployed voting contract, including casting votes and checking vote counts.
+- `./scripts/interaction_existing_contract.ts` demonstrates how to interact with an already deployed pod racing contract, including creating games.
 - `./scripts/get_block.ts` is an example of how to retrieve and display block information from the Aztec node.
 
 ### Utility Functions

package.json

@@ -2,7 +2,7 @@
   "name": "pod_racing_codespace",
   "version": "1.0.0",
   "main": "index.js",
-  "repository": "https://github.com/critesjosh/private_voting_codespace.git",
+  "repository": "https://github.com/AztecProtocol/aztec-starter.git",
   "author": "Josh Crites <[email protected]>",
   "license": "MIT",
   "private": true,

scripts/deploy_contract.ts

@@ -1,4 +1,4 @@
-import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
+import { PodRacingContract } from "../src/artifacts/PodRacing.js"
 import { Logger, createLogger } from "@aztec/aztec.js/log";
 import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
 import { Fr } from "@aztec/aztec.js/fields";
@@ -38,38 +38,28 @@ async function main() {
     const address = accountManager.address;
     logger.info(`✅ Account deployed successfully at: ${address}`);
 
-    // Deploy voting contract
-    logger.info('🗳️  Starting voting contract deployment...');
-    logger.info(`📋 Admin address for voting contract: ${address}`);
+    // Deploy pod racing contract
+    logger.info('🏎️  Starting pod racing contract deployment...');
+    logger.info(`📋 Admin address for pod racing contract: ${address}`);
 
-    const deployTx = PrivateVotingContract.deploy(wallet, address).send({
+    const deployTx = PodRacingContract.deploy(wallet, address).send({
         from: address,
         fee: { paymentMethod: sponsoredPaymentMethod }
     });
 
     logger.info('⏳ Waiting for deployment transaction to be mined...');
-    const votingContract = await deployTx.deployed({ timeout: timeouts.deployTimeout });
+    const podRacingContract = await deployTx.deployed({ timeout: timeouts.deployTimeout });
 
-    logger.info(`🎉 Voting Contract deployed successfully!`);
-    logger.info(`📍 Contract address: ${votingContract.address}`);
+    logger.info(`🎉 Pod Racing Contract deployed successfully!`);
+    logger.info(`📍 Contract address: ${podRacingContract.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({
-            from: address
-        });
-        logger.info(`📊 Initial vote count for candidate 1: ${initialVoteCount}`);
-
-    } catch (error) {
-        logger.error(`❌ Contract verification failed: ${error}`);
-    }
+    logger.info('✅ Contract deployed and ready for game creation');
 
     // Get contract instance for instantiation data
-    const instance = votingContract.instance;
+    const instance = podRacingContract.instance;
     if (instance) {
         logger.info('📦 Contract instantiation data:');
         logger.info(`Salt: ${instance.salt}`);
@@ -85,7 +75,7 @@ async function main() {
 
     logger.info('🏁 Deployment process completed successfully!');
     logger.info(`📋 Summary:`);
-    logger.info(`   - Contract Address: ${votingContract.address}`);
+    logger.info(`   - Contract Address: ${podRacingContract.address}`);
     logger.info(`   - Admin Address: ${address}`);
     logger.info(`   - Sponsored FPC: ${sponsoredFPC.address}`);
 }

scripts/fees.ts

@@ -6,7 +6,7 @@ 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 { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
+import { PodRacingContract } from "../src/artifacts/PodRacing.js"
 import { TokenContract } from "@aztec/noir-contracts.js/Token";
 import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee/testing'
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
@@ -69,7 +69,7 @@ async function main() {
     const paymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
 
     // Two arbitrary txs to make the L1 message available on L2
-    const votingContract = await PrivateVotingContract.deploy(wallet, account1.address).send({
+    const podRacingContract = await PodRacingContract.deploy(wallet, account1.address).send({
         from: account1.address,
         fee: { paymentMethod }
     }).deployed();
@@ -86,11 +86,12 @@ async function main() {
 
     // Pay fees yourself
 
-    // Create a new voting contract instance, interacting from the newWallet
-    await votingContract.methods.cast_vote(account1.address).send({
+    // Create a new game on the pod racing contract, interacting from the newWallet
+    const gameId = Fr.random();
+    await podRacingContract.methods.create_game(gameId).send({
         from: account2.address,
     }).wait()
-    logger.info(`Vote cast from new account, paying fees via newWallet.`)
+    logger.info(`Game created from new account, paying fees via newWallet.`)
 
     // Private Fee Payments via FPC
 

scripts/interaction_existing_contract.ts

@@ -2,7 +2,7 @@ import { Logger, createLogger } from "@aztec/aztec.js/log";
 import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
 import { Fr } from "@aztec/aztec.js/fields";
 import { AztecAddress } from "@aztec/stdlib/aztec-address";
-import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js";
+import { PodRacingContract } from "../src/artifacts/PodRacing.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 import { setupWallet } from "../src/utils/setup_wallet.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
@@ -12,7 +12,7 @@ import { getContractInstanceFromInstantiationParams } from "@aztec/aztec.js/cont
 
 async function main() {
     let logger: Logger;
-    logger = createLogger('aztec:voting-operations-existing');
+    logger = createLogger('aztec:pod-racing-operations-existing');
 
     const timeouts = getTimeouts();
 
@@ -28,14 +28,14 @@ async function main() {
     const accountManager = await getAccountFromEnv(wallet);
     const address = accountManager.address;
 
-    // Connect to existing voting contract (replace with your deployed contract address)
-    const contractAddress = process.env.VOTING_CONTRACT_ADDRESS;
+    // Connect to existing pod racing contract (replace with your deployed contract address)
+    const contractAddress = process.env.POD_RACING_CONTRACT_ADDRESS;
     if (!contractAddress) {
-        logger.error("Please set VOTING_CONTRACT_ADDRESS environment variable with your deployed contract address");
+        logger.error("Please set POD_RACING_CONTRACT_ADDRESS environment variable with your deployed contract address");
         return;
     }
 
-    logger.info(`Connecting to voting contract at: ${contractAddress}`);
+    logger.info(`Connecting to pod racing contract at: ${contractAddress}`);
     // Get instantiation parameters from environment variables
     const contractSalt = process.env.CONTRACT_SALT;
     const contractDeployer = process.env.CONTRACT_DEPLOYER;
@@ -47,7 +47,7 @@ async function main() {
         return;
     }
 
-    logger.info("📦 Reconstructing contract instance from environment variables...");
+    logger.info("Reconstructing contract instance from environment variables...");
 
     // Parse constructor args
     let constructorArgs;
@@ -65,9 +65,9 @@ async function main() {
     }
 
     // Reconstruct contract instance
-    const votingContractAddress = AztecAddress.fromString(contractAddress);
+    const podRacingContractAddress = AztecAddress.fromString(contractAddress);
 
-    const instance = await getContractInstanceFromInstantiationParams(PrivateVotingContract.artifact, {
+    const instance = await getContractInstanceFromInstantiationParams(PodRacingContract.artifact, {
         constructorArgs,
         salt: Fr.fromString(contractSalt),
         deployer: AztecAddress.fromString(contractDeployer)
@@ -76,47 +76,31 @@ async function main() {
     logger.info("✅ Contract instance reconstructed successfully");
 
     // Register the contract with the wallet
-    await wallet.registerContract({ instance, artifact: PrivateVotingContract.artifact });
-
+    await wallet.registerContract({ instance, artifact: PodRacingContract.artifact });
 
     // Get the contract instance from the PXE
-    const votingContract = await PrivateVotingContract.at(
-        votingContractAddress,
+    const podRacingContract = await PodRacingContract.at(
+        podRacingContractAddress,
         wallet
     );
 
+    // Create a new game
+    const gameId = Fr.random();
+    logger.info(`Creating new game with ID: ${gameId}`);
 
-    // Define a candidate to vote for (using a Field value)
-    const candidate = Fr.fromString("1"); // Voting for candidate "1"
-
-    // First get_vote call - check initial vote count
-    logger.info("Getting initial vote count...");
-    const initialVoteCount = await votingContract.methods.get_vote(candidate).simulate({
-        from: address
-    });
-    logger.info(`Initial vote count for candidate ${candidate}: ${initialVoteCount}`);
-
-    // Cast a vote
-    logger.info("Casting vote...");
-    await votingContract.methods.cast_vote(candidate)
+    await podRacingContract.methods.create_game(gameId)
         .send({
             from: address,
             fee: { paymentMethod: sponsoredPaymentMethod }
         })
         .wait({ timeout: timeouts.txTimeout });
-    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({
-        from: address
-    });
-    logger.info(`Updated vote count for candidate ${candidate}: ${updatedVoteCount}`);
+    logger.info("Game created successfully!");
 
-    logger.info(`Vote count increased from ${initialVoteCount} to ${updatedVoteCount}`);
+    logger.info(`Game ${gameId} is now waiting for a second player to join.`);
+    logger.info("To join this game, another player would call join_game with the same game ID.");
 }
 
 main().catch((error) => {
     console.error("Error:", error);
     process.exit(1);
-}); 
+});

scripts/profile_deploy.ts

@@ -1,4 +1,4 @@
-import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
+import { PodRacingContract } from "../src/artifacts/PodRacing.js"
 import { Logger, createLogger } from "@aztec/aztec.js/log";
 import { setupWallet } from "../src/utils/setup_wallet.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
@@ -19,7 +19,7 @@ async function main() {
     let accountManager = await deploySchnorrAccount(wallet);
     const address = accountManager.address;
 
-    const profileTx = await PrivateVotingContract.deploy(wallet, address).profile({ profileMode: "full", from: address });
+    const profileTx = await PodRacingContract.deploy(wallet, address).profile({ profileMode: "full", from: address });
     console.dir(profileTx, { depth: 2 });
 }
 

src/test/e2e/accounts.test.ts

@@ -1,4 +1,4 @@
-import { PrivateVotingContractArtifact, PrivateVotingContract } from "../../artifacts/PrivateVoting.js"
+import { PodRacingContractArtifact, PodRacingContract } from "../../artifacts/PodRacing.js"
 import { generateSchnorrAccounts } from "@aztec/accounts/testing"
 import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee/testing'
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
@@ -112,19 +112,19 @@ describe("Accounts", () => {
         console.log(`Total claims created: ${claims.length}`);
 
         // arbitrary transactions to progress 2 blocks, and have fee juice on Aztec ready to claim
-        console.log('Deploying first PrivateVotingContract to progress blocks...');
-        await PrivateVotingContract.deploy(wallet, ownerAccount.address).send({
+        console.log('Deploying first PodRacingContract to progress blocks...');
+        await PodRacingContract.deploy(wallet, ownerAccount.address).send({
             from: ownerAccount.address,
             fee: { paymentMethod: sponsoredPaymentMethod }
         }).deployed({ timeout: getTimeouts().deployTimeout }); // deploy contract with first funded wallet
-        console.log('First PrivateVotingContract deployed');
+        console.log('First PodRacingContract deployed');
 
-        console.log('Deploying second PrivateVotingContract to progress blocks...');
-        await PrivateVotingContract.deploy(wallet, ownerAccount.address).send({
+        console.log('Deploying second PodRacingContract to progress blocks...');
+        await PodRacingContract.deploy(wallet, ownerAccount.address).send({
             from: ownerAccount.address,
             fee: { paymentMethod: sponsoredPaymentMethod }
         }).deployed({ timeout: getTimeouts().deployTimeout }); // deploy contract with first funded wallet
-        console.log('Second PrivateVotingContract deployed');
+        console.log('Second PodRacingContract deployed');
 
         // Now deploy random accounts using FeeJuicePaymentMethodWithClaim (which claims and pays in one tx)
         console.log('Starting account deployments with FeeJuicePaymentMethodWithClaim...');
@@ -154,7 +154,7 @@ describe("Accounts", () => {
         logger.info('Starting "Sponsored contract deployment" test');
         const salt = Fr.random();
         logger.info(`Using salt: ${salt.toString()}`);
-        const VotingContractArtifact = PrivateVotingContractArtifact
+        const PodRacingArtifact = PodRacingContractArtifact
 
         logger.info('Generating 2 Schnorr accounts...');
         const accounts = await Promise.all(
@@ -177,13 +177,13 @@ describe("Accounts", () => {
         logger.info(`Deployer address: ${deployerAddress.toString()}`);
         logger.info(`Admin address: ${adminAddress.toString()}`);
 
-        const deploymentData = await getContractInstanceFromInstantiationParams(VotingContractArtifact,
+        const deploymentData = await getContractInstanceFromInstantiationParams(PodRacingArtifact,
             {
                 constructorArgs: [adminAddress],
                 salt,
                 deployer: deployerAccount.getAddress()
             });
-        const deployer = new ContractDeployer(VotingContractArtifact, wallet);
+        const deployer = new ContractDeployer(PodRacingArtifact, wallet);
         const tx = deployer.deploy(adminAddress).send({
             from: deployerAddress,
             contractAddressSalt: salt,