Merge branch 'next' into merge-train/barretenberg

AztecBot · AztecBot · commit 2e18548261ac · 2025-08-29T14:52:33.000Z
diff --git a/boxes/boxes/vanilla/app/main.ts b/boxes/boxes/vanilla/app/main.ts
@@ -6,7 +6,7 @@ import {
   type AccountWallet,
 } from '@aztec/aztec.js';
 import { EmbeddedWallet } from './embedded-wallet';
-import { EasyPrivateVotingContract } from '../artifacts/EasyPrivateVoting';
+import { PrivateVotingContract } from '../artifacts/PrivateVoting';
 
 // DOM Elements
 const createAccountButton =
@@ -45,7 +45,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     // Register voting contract with wallet/PXE
     displayStatusMessage('Registering contracts...');
     await wallet.registerContract(
-      EasyPrivateVotingContract.artifact,
+      PrivateVotingContract.artifact,
       AztecAddress.fromString(deployerAddress),
       Fr.fromString(deploymentSalt),
       [AztecAddress.fromString(deployerAddress)]
@@ -145,7 +145,7 @@ voteButton.addEventListener('click', async (e) => {
     }
 
     // Prepare contract interaction
-    const votingContract = await EasyPrivateVotingContract.at(
+    const votingContract = await PrivateVotingContract.at(
       AztecAddress.fromString(contractAddress),
       connectedAccount
     );
@@ -177,7 +177,7 @@ async function updateVoteTally(account: Wallet) {
   displayStatusMessage('Updating vote tally...');
 
   // Prepare contract interaction
-  const votingContract = await EasyPrivateVotingContract.at(
+  const votingContract = await PrivateVotingContract.at(
     AztecAddress.fromString(contractAddress),
     account
   );
diff --git a/boxes/boxes/vanilla/contracts/src/main.nr b/boxes/boxes/vanilla/contracts/src/main.nr
@@ -1,7 +1,7 @@
 use dep::aztec::macros::aztec;
 
 #[aztec]
-pub contract EasyPrivateVoting {
+pub contract PrivateVoting {
     use dep::aztec::keys::getters::get_public_keys;
     use dep::aztec::macros::{
         functions::{initializer, internal, private, public, utility},
@@ -33,7 +33,7 @@ pub contract EasyPrivateVoting {
         let secret = context.request_nsk_app(msg_sender_npk_m_hash); // get secret key of caller of function
         let nullifier = std::hash::pedersen_hash([context.msg_sender().to_field(), secret]); // derive nullifier from sender and secret
         context.push_nullifier(nullifier);
-        EasyPrivateVoting::at(context.this_address()).add_to_tally_public(candidate).enqueue(
+        PrivateVoting::at(context.this_address()).add_to_tally_public(candidate).enqueue(
             &mut context,
         );
     }
diff --git a/boxes/boxes/vanilla/scripts/deploy.ts b/boxes/boxes/vanilla/scripts/deploy.ts
@@ -18,7 +18,7 @@ import { getDefaultInitializer } from '@aztec/stdlib/abi';
 import { SponsoredFPCContractArtifact } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
 // @ts-ignore
-import { EasyPrivateVotingContract } from '../artifacts/EasyPrivateVoting.ts';
+import { PrivateVotingContract } from '../artifacts/PrivateVoting.ts';
 
 const AZTEC_NODE_URL = process.env.AZTEC_NODE_URL || 'http://localhost:8080';
 const PROVER_ENABLED = process.env.PROVER_ENABLED === 'false' ? false : true;
@@ -96,11 +96,11 @@ async function createAccount(pxe: PXE) {
 async function deployContract(pxe: PXE, deployer: Wallet) {
   const salt = Fr.random();
   const contract = await getContractInstanceFromInstantiationParams(
-    EasyPrivateVotingContract.artifact,
+    PrivateVotingContract.artifact,
     {
       publicKeys: PublicKeys.default(),
       constructorArtifact: getDefaultInitializer(
-        EasyPrivateVotingContract.artifact
+        PrivateVotingContract.artifact
       ),
       constructorArgs: [deployer.getAddress().toField()],
       deployer: deployer.getAddress(),
@@ -111,11 +111,11 @@ async function deployContract(pxe: PXE, deployer: Wallet) {
   const deployMethod = new DeployMethod(
     contract.publicKeys,
     deployer,
-    EasyPrivateVotingContract.artifact,
+    PrivateVotingContract.artifact,
     (address: AztecAddress, wallet: Wallet) =>
-      EasyPrivateVotingContract.at(address, wallet),
+      PrivateVotingContract.at(address, wallet),
     [deployer.getAddress().toField()],
-    getDefaultInitializer(EasyPrivateVotingContract.artifact)?.name
+    getDefaultInitializer(PrivateVotingContract.artifact)?.name
   );
 
   const sponsoredPFCContract = await getSponsoredPFCContract();
@@ -132,7 +132,7 @@ async function deployContract(pxe: PXE, deployer: Wallet) {
   await provenInteraction.send().wait({ timeout: 120 });
   await pxe.registerContract({
     instance: contract,
-    artifact: EasyPrivateVotingContract.artifact,
+    artifact: PrivateVotingContract.artifact,
   });
 
   return {
diff --git a/docs/docs/developers/guides/smart_contracts/profiling_transactions.md b/docs/docs/developers/guides/smart_contracts/profiling_transactions.md
@@ -92,15 +92,15 @@ For example, if you want to flamegraph the `cast_vote` function [aztec-starter](
 ```bash
 aztec-nargo compile        # generate contract artifacts
 aztec-postprocess-contract # transpile contract and generate verification keys
-aztec flamegraph target/easy_private_voting_contract-EasyPrivateVoting.json cast_vote
+aztec flamegraph target/private_voting_contract-PrivateVoting.json cast_vote
 ```
 
 This will generate a flamegraph of the `cast_vote` function and save the output svg to the `target` directory. You can open the svg file in your browser to visualize the flamegraph.
 
 You can also run the same command with `SERVE=1` to serve the flamegraph on a local server.
 
 ```bash
-SERVE=1 aztec flamegraph target/easy_private_voting_contract-EasyPrivateVoting.json cast_vote
+SERVE=1 aztec flamegraph target/private_voting_contract-PrivateVoting.json cast_vote
 ```
 
 This will serve the flamegraph on `http://localhost:8000`.
diff --git a/docs/docs/developers/guides/smart_contracts/writing_contracts/common_patterns/index.md b/docs/docs/developers/guides/smart_contracts/writing_contracts/common_patterns/index.md
@@ -151,4 +151,4 @@ E.g. for a voting contract, if your nullifier simply emits just the `user_addres
 
 Here is an example from the voting contract:
 
-#include_code cast_vote /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code cast_vote /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
diff --git a/docs/docs/developers/guides/smart_contracts/writing_contracts/index.mdx b/docs/docs/developers/guides/smart_contracts/writing_contracts/index.mdx
@@ -13,24 +13,24 @@ To write a contract:
 1. Import aztec.nr and declare your contract
 
 ```rust
-#include_code declaration /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr raw
+#include_code declaration /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr raw
 ```
 
 2. Define imports in your contract block
 
-#include_code imports /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code imports /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 3. Declare your contract storage below your imports
 
-#include_code storage_struct /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code storage_struct /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 4. Declare a constructor with `#[initializer]`. Constructors can be private or public functions.
 
-#include_code constructor /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code constructor /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 5. Declare your contract functions
 
-#include_code cast_vote /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code cast_vote /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 There is a lot more detail and nuance to writing contracts, but this should give you a good starting point.
 Read contents of this section for more details about authorizing contract to act on your behalf (authenticaion witnesses),
diff --git a/docs/docs/developers/reference/environment_reference/sandbox-reference.md b/docs/docs/developers/reference/environment_reference/sandbox-reference.md
@@ -119,7 +119,7 @@ CounterContractArtifact
 CrowdfundingContractArtifact
 DocsExampleContractArtifact
 EasyPrivateTokenContractArtifact
-EasyPrivateVotingContractArtifact
+PrivateVotingContractArtifact
 EcdsaAccountContractArtifact
 EscrowContractArtifact
 FPCContractArtifact
diff --git a/docs/docs/developers/tutorials/contract_tutorials/private_voting_contract.md b/docs/docs/developers/tutorials/contract_tutorials/private_voting_contract.md
@@ -59,15 +59,15 @@ aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_
 Go to `main.nr` and delete the sample code. Replace it with this contract initialization:
 
 ```rust
-#include_code declaration noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr raw
+#include_code declaration noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr raw
 }
 ```
 
 This defines a contract called `Voter`. Everything will sit inside this block.
 
 Inside this, paste these imports:
 
-#include_code imports noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code imports noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 We are using various utils within the Aztec `prelude` library:
 
@@ -93,7 +93,7 @@ We are using various utils within the Aztec `prelude` library:
 Under these imports, we need to set up our contract storage.
 Define the storage struct like so:
 
-#include_code storage_struct noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code storage_struct noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 In this contract, we will store three vars:
 
@@ -106,7 +106,7 @@ In this contract, we will store three vars:
 
 The next step is to initialize the contract with a constructor. The constructor will take an address as a parameter and set the admin.
 
-#include_code constructor noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code constructor noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 This function takes the admin argument and writes it to the storage. We are also using this function to set the `vote_ended` boolean as false in the same way.
 
@@ -122,7 +122,7 @@ To ensure someone only votes once, we will create a nullifier as part of the fun
 
 Create a private function called `cast_vote`:
 
-#include_code cast_vote noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code cast_vote noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 In this function, we do not create a nullifier with the address directly. This would leak privacy as it would be easy to reverse-engineer. We must add some randomness or some form of secret, like nullifier secrets.
 
@@ -132,7 +132,7 @@ After pushing the nullifier, we update the `tally` to reflect this vote. As we k
 
 Create this new public function like this:
 
-#include_code add_to_tally_public noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code add_to_tally_public noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 The first thing we do here is assert that the vote has not ended.
 
@@ -144,7 +144,7 @@ The code after the assertion will only run if the assertion is true. In this sni
 
 We will create a function that anyone can call that will return the number of votes at a given vote Id. Paste this in your contract:
 
-#include_code get_vote noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code get_vote noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 We set it as `utility` because we don't intend to call this as part of a transaction: we want to call it from our application code to e.g. display the result in a UI.
 
@@ -154,7 +154,7 @@ To ensure that only an `admin` can end a voting period, we can use another `asse
 
 Paste this function in your contract:
 
-#include_code end_vote noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code end_vote noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 Here, we are asserting that the `msg_sender()` is equal to the `admin` stored in public state.
 
diff --git a/noir-projects/noir-contracts/Nargo.toml b/noir-projects/noir-contracts/Nargo.toml
@@ -13,7 +13,7 @@ members = [
     "contracts/app/claim_contract",
     "contracts/app/crowdfunding_contract",
     "contracts/app/easy_private_token_contract",
-    "contracts/app/easy_private_voting_contract",
+    "contracts/app/private_voting_contract",
     "contracts/app/escrow_contract",
     "contracts/app/lending_contract",
     "contracts/app/nft_contract",
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/app/private_voting_contract/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "easy_private_voting_contract"
+name = "private_voting_contract"
 authors = [""]
 compiler_version = ">=0.25.0"
 type = "contract"
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr
@@ -3,7 +3,7 @@ mod test;
 use dep::aztec::macros::aztec;
 
 #[aztec]
-pub contract EasyPrivateVoting {
+pub contract PrivateVoting {
     // docs:end:declaration
     // docs:start:imports
     use dep::aztec::{
@@ -44,7 +44,7 @@ pub contract EasyPrivateVoting {
         let secret = context.request_nsk_app(msg_sender_npk_m_hash); // get secret key of caller of function
         let nullifier = std::hash::pedersen_hash([context.msg_sender().to_field(), secret]); // derive nullifier from sender and secret
         context.push_nullifier(nullifier);
-        EasyPrivateVoting::at(context.this_address()).add_to_tally_public(candidate).enqueue(
+        PrivateVoting::at(context.this_address()).add_to_tally_public(candidate).enqueue(
             &mut context,
         );
     }
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/first.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/first.nr
@@ -1,14 +1,14 @@
 use crate::test::utils;
 use dep::aztec::protocol_types::storage::map::derive_storage_slot_in_map;
 
-use crate::EasyPrivateVoting;
+use crate::PrivateVoting;
 
 #[test]
 unconstrained fn test_initializer() {
     let (mut env, voting_contract_address, admin) = utils::setup();
 
     env.public_context_at(voting_contract_address, |context| {
-        let current_admin = context.storage_read(EasyPrivateVoting::storage_layout().admin.slot);
+        let current_admin = context.storage_read(PrivateVoting::storage_layout().admin.slot);
         assert_eq(current_admin, admin);
     });
 }
@@ -18,7 +18,7 @@ unconstrained fn test_check_vote_status() {
     let (mut env, voting_contract_address, _) = utils::setup();
 
     env.public_context_at(voting_contract_address, |context| {
-        let vote_ended = context.storage_read(EasyPrivateVoting::storage_layout().vote_ended.slot);
+        let vote_ended = context.storage_read(PrivateVoting::storage_layout().vote_ended.slot);
         assert_eq(vote_ended, false);
     });
 }
@@ -27,10 +27,10 @@ unconstrained fn test_check_vote_status() {
 unconstrained fn test_end_vote() {
     let (env, voting_contract_address, admin) = utils::setup();
 
-    env.call_public(admin, EasyPrivateVoting::at(voting_contract_address).end_vote());
+    env.call_public(admin, PrivateVoting::at(voting_contract_address).end_vote());
 
     env.public_context_at(voting_contract_address, |context| {
-        let vote_ended = context.storage_read(EasyPrivateVoting::storage_layout().vote_ended.slot);
+        let vote_ended = context.storage_read(PrivateVoting::storage_layout().vote_ended.slot);
         assert_eq(vote_ended, true);
     });
 }
@@ -40,7 +40,7 @@ unconstrained fn test_fail_end_vote_by_non_admin() {
     let (mut env, voting_contract_address, _) = utils::setup();
     let alice = env.create_light_account();
 
-    env.call_public(alice, EasyPrivateVoting::at(voting_contract_address).end_vote());
+    env.call_public(alice, PrivateVoting::at(voting_contract_address).end_vote());
 }
 
 #[test]
@@ -49,11 +49,11 @@ unconstrained fn test_cast_vote() {
     let alice = env.create_light_account();
 
     let candidate = 1;
-    env.call_private(alice, EasyPrivateVoting::at(voting_contract_address).cast_vote(candidate));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(candidate));
 
     env.public_context_at(voting_contract_address, |context| {
         let vote_count = context.storage_read(derive_storage_slot_in_map(
-            EasyPrivateVoting::storage_layout().tally.slot,
+            PrivateVoting::storage_layout().tally.slot,
             candidate,
         ));
         assert_eq(vote_count, 1);
@@ -68,14 +68,13 @@ unconstrained fn test_cast_vote_with_separate_accounts() {
 
     let candidate = 101;
 
-    env.call_private(alice, EasyPrivateVoting::at(voting_contract_address).cast_vote(candidate));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(candidate));
 
-    let _ =
-        env.call_private(bob, EasyPrivateVoting::at(voting_contract_address).cast_vote(candidate));
+    let _ = env.call_private(bob, PrivateVoting::at(voting_contract_address).cast_vote(candidate));
 
     env.public_context_at(voting_contract_address, |context| {
         let vote_count = context.storage_read(derive_storage_slot_in_map(
-            EasyPrivateVoting::storage_layout().tally.slot,
+            PrivateVoting::storage_layout().tally.slot,
             candidate,
         ));
         assert_eq(vote_count, 2);
@@ -89,7 +88,7 @@ unconstrained fn test_fail_vote_twice() {
 
     let candidate = 101;
 
-    env.call_private(alice, EasyPrivateVoting::at(voting_contract_address).cast_vote(candidate));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(candidate));
 
-    env.call_private(alice, EasyPrivateVoting::at(voting_contract_address).cast_vote(candidate));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(candidate));
 }
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/mod.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/mod.nr
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/utils.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/utils.nr
@@ -2,16 +2,16 @@ use dep::aztec::{
     protocol_types::address::AztecAddress, test::helpers::test_environment::TestEnvironment,
 };
 
-use crate::EasyPrivateVoting;
+use crate::PrivateVoting;
 
 pub unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddress) {
     let mut env = TestEnvironment::new();
 
     let admin = env.create_light_account();
 
-    let initializer_call_interface = EasyPrivateVoting::interface().constructor(admin);
+    let initializer_call_interface = PrivateVoting::interface().constructor(admin);
     let voting_contract_address =
-        env.deploy("EasyPrivateVoting").with_public_initializer(admin, initializer_call_interface);
+        env.deploy("PrivateVoting").with_public_initializer(admin, initializer_call_interface);
 
     (env, voting_contract_address, admin)
 }
diff --git a/playground/src/components/home/components/Landing.tsx b/playground/src/components/home/components/Landing.tsx
@@ -293,8 +293,8 @@ export function Landing() {
 
     switch (contractValue) {
       case PREDEFINED_CONTRACTS.SIMPLE_VOTING: {
-        ({ EasyPrivateVotingContractArtifact: contractArtifactJSON } = await import(
-          '@aztec/noir-contracts.js/EasyPrivateVoting'
+        ({ PrivateVotingContractArtifact: contractArtifactJSON } = await import(
+          '@aztec/noir-contracts.js/PrivateVoting'
         ));
 
         defaultContractCreationParams = {
diff --git a/playground/src/components/sidebar/components/ContractSelector.tsx b/playground/src/components/sidebar/components/ContractSelector.tsx
diff --git a/playground/src/utils/constants.ts b/playground/src/utils/constants.ts
diff --git a/yarn-project/end-to-end/src/bench/client_flows/deployments.test.ts b/yarn-project/end-to-end/src/bench/client_flows/deployments.test.ts
diff --git a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts

Original file line number	Diff line number	Diff line change
@@ -151,4 +151,4 @@ E.g. for a voting contract, if your nullifier simply emits just the `user_addres
`151`	`151`
`152`	`152`	`Here is an example from the voting contract:`
`153`	`153`
`154`		`-#include_code cast_vote /noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust`
	`154`	`+#include_code cast_vote /noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust`