feat: Check initialization arguments in constructors

noir-projects/aztec-nr/aztec/src/context/interface.nr

@@ -9,5 +9,6 @@ trait ContextInterface {
     fn chain_id(self) -> Field;
     fn version(self) -> Field;
     fn selector(self) -> FunctionSelector;
+    fn get_args_hash(self) -> Field;
     fn get_header(self) -> Header;
 }

noir-projects/aztec-nr/aztec/src/context/private_context.nr

@@ -92,6 +92,10 @@ impl ContextInterface for PrivateContext {
         self.inputs.call_context.function_selector
     }
 
+    fn get_args_hash(self) -> Field {
+        self.args_hash
+    }
+
     // Returns the header of a block whose state is used during private execution (not the block the transaction is
     // included in).
     pub fn get_header(self) -> Header {

noir-projects/aztec-nr/aztec/src/context/public_context.nr

@@ -74,6 +74,10 @@ impl ContextInterface for PublicContext {
         self.inputs.call_context.function_selector
     }
 
+    fn get_args_hash(self) -> Field {
+        self.args_hash
+    }
+
     fn get_header(self) -> Header {
         self.historical_header
     }

noir-projects/aztec-nr/aztec/src/initializer.nr

@@ -1,6 +1,14 @@
-use dep::protocol_types::hash::silo_nullifier;
-use crate::context::{PrivateContext, PublicContext, ContextInterface};
-use crate::history::nullifier_inclusion::prove_nullifier_inclusion;
+use dep::protocol_types::{
+    hash::{silo_nullifier, pedersen_hash},
+    constants::GENERATOR_INDEX__CONSTRUCTOR,
+    abis::function_selector::FunctionSelector,
+};
+
+use crate::{
+    context::{PrivateContext, PublicContext, ContextInterface},
+    oracle::get_contract_instance::get_contract_instance,
+    history::nullifier_inclusion::prove_nullifier_inclusion,
+};
 
 pub fn mark_as_initialized<TContext>(context: &mut TContext) where TContext: ContextInterface {
     let init_nullifier = compute_unsiloed_contract_initialization_nullifier(*context);
@@ -23,3 +31,14 @@ pub fn compute_contract_initialization_nullifier<TContext>(context: TContext) ->
 pub fn compute_unsiloed_contract_initialization_nullifier<TContext>(context: TContext) -> Field where TContext: ContextInterface {
     context.this_address().to_field()
 }
+
+pub fn assert_initialization_args_match_address_preimage<TContext>(context: TContext) where TContext: ContextInterface {
+    let address = context.this_address(); 
+    let instance = get_contract_instance(address);
+    let expected_init = compute_initialization_hash(context.selector(), context.get_args_hash());
+    assert(instance.initialization_hash == expected_init, "Initialization hash does not match");
+}
+
+pub fn compute_initialization_hash(init_selector: FunctionSelector, init_args_hash: Field) -> Field {
+    pedersen_hash([init_selector.to_field(), init_args_hash], GENERATOR_INDEX__CONSTRUCTOR)
+}

noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr

@@ -5,7 +5,7 @@ contract StatefulTest {
     use dep::aztec::{
         deploy::{deploy_contract as aztec_deploy_contract}, context::{PublicContext, Context},
         oracle::get_contract_instance::get_contract_instance,
-        initializer::{mark_as_initialized, assert_is_initialized}
+        initializer::assert_is_initialized,
     };
 
     struct Storage {

noir/noir-repo/aztec_macros/src/transforms/functions.rs

@@ -48,6 +48,12 @@ pub fn transform_function(
         func.def.body.0.insert(0, init_check);
     }
 
+    // Add assertion for initialization arguments
+    if is_initializer {
+        let assert_init_args = create_assert_init_args();
+        func.def.body.0.insert(0, assert_init_args);
+    }
+
     // Add access to the storage struct
     if storage_defined {
         let storage_def = abstract_storage(&ty.to_lowercase(), false);
@@ -205,6 +211,23 @@ fn create_internal_check(fname: &str) -> Statement {
     )))
 }
 
+/// Creates a call to assert_initialization_args_match_address_preimage to ensure
+/// the initialization arguments used in the init call match the address preimage.
+///
+/// ```noir
+/// assert_initialization_args_match_address_preimage(context);
+/// ```
+fn create_assert_init_args() -> Statement {
+    make_statement(StatementKind::Expression(call(
+        variable_path(chained_dep!(
+            "aztec",
+            "initializer",
+            "assert_initialization_args_match_address_preimage"
+        )),
+        vec![variable("context")],
+    )))
+}
+
 /// Creates the private context object to be accessed within the function, the parameters need to be extracted to be
 /// appended into the args hash object.
 ///

yarn-project/aztec.js/src/account_manager/index.ts

@@ -1,5 +1,5 @@
 import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/circuit-types';
-import { EthAddress, PublicKey, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
+import { PublicKey, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 
@@ -77,14 +77,11 @@ export class AccountManager {
   public getInstance(): ContractInstanceWithAddress {
     if (!this.instance) {
       const encryptionPublicKey = generatePublicKey(this.encryptionPrivateKey);
-      const portalAddress = EthAddress.ZERO;
-      this.instance = getContractInstanceFromDeployParams(
-        this.accountContract.getContractArtifact(),
-        this.accountContract.getDeploymentArgs(),
-        this.salt,
-        encryptionPublicKey,
-        portalAddress,
-      );
+      this.instance = getContractInstanceFromDeployParams(this.accountContract.getContractArtifact(), {
+        constructorArgs: this.accountContract.getDeploymentArgs(),
+        salt: this.salt,
+        publicKey: encryptionPublicKey,
+      });
     }
     return this.instance;
   }

yarn-project/aztec.js/src/contract/deploy_method.ts

@@ -163,10 +163,13 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   public getInstance(options: DeployOptions = {}): ContractInstanceWithAddress {
     if (!this.instance) {
-      const portalContract = options.portalContract ?? EthAddress.ZERO;
-      const contractAddressSalt = options.contractAddressSalt ?? Fr.random();
-      const deployParams = [this.artifact, this.args, contractAddressSalt, this.publicKey, portalContract] as const;
-      this.instance = getContractInstanceFromDeployParams(...deployParams);
+      this.instance = getContractInstanceFromDeployParams(this.artifact, {
+        constructorArgs: this.args,
+        salt: options.contractAddressSalt,
+        portalAddress: options.portalContract,
+        publicKey: this.publicKey,
+        constructorName: this.constructorArtifact.name,
+      });
     }
     return this.instance;
   }

yarn-project/circuits.js/src/contract/contract_instance.ts

@@ -11,27 +11,32 @@ import {
   computeInitializationHash,
   computePublicKeysHash,
 } from './contract_address.js';
-import { isConstructor } from './contract_tree/contract_tree.js';
 
 /**
  * Generates a Contract Instance from the deployment params.
  * @param artifact - The account contract build artifact.
- * @param args - The args to the account contract constructor
- * @param contractAddressSalt - The salt to be used in the contract address derivation
- * @param publicKey - The account public key
- * @param portalContractAddress - The portal contract address
+ * @param opts - Options for the deployment.
  * @returns - The contract instance
  */
 export function getContractInstanceFromDeployParams(
   artifact: ContractArtifact,
-  args: any[] = [],
-  contractAddressSalt: Fr = Fr.random(),
-  publicKey: PublicKey = Point.ZERO,
-  portalContractAddress: EthAddress = EthAddress.ZERO,
+  opts: {
+    constructorName?: string;
+    constructorArgs?: any[];
+    salt?: Fr;
+    publicKey?: PublicKey;
+    portalAddress?: EthAddress;
+  },
 ): ContractInstanceWithAddress {
-  const constructorArtifact = artifact.functions.find(isConstructor);
+  const args = opts.constructorArgs ?? [];
+  const salt = opts.salt ?? Fr.random();
+  const publicKey = opts.publicKey ?? Point.ZERO;
+  const portalContractAddress = opts.portalAddress ?? EthAddress.ZERO;
+  const constructorName = opts.constructorName ?? 'constructor';
+
+  const constructorArtifact = artifact.functions.find(fn => fn.name === constructorName);
   if (!constructorArtifact) {
-    throw new Error('Cannot find constructor in the artifact.');
+    throw new Error(`Cannot find constructor with name ${constructorName} in the artifact.`);
   }
   if (!constructorArtifact.verificationKey) {
     throw new Error('Missing verification key for the constructor.');
@@ -47,7 +52,7 @@ export function getContractInstanceFromDeployParams(
     initializationHash,
     portalContractAddress,
     publicKeysHash,
-    salt: contractAddressSalt,
+    salt,
     version: 1,
   };
 

yarn-project/circuits.js/src/contract/contract_tree/contract_tree.ts

@@ -20,7 +20,7 @@ export function hashVKStr(vk: string) {
  * Determine if the given function is a constructor.
  * This utility function checks if the 'name' property of the input object is "constructor".
  * Returns true if the function is a constructor, false otherwise.
- *
+ * TODO(palla/purge-old-contract-deploy): Remove me
  * @param Object - An object containing a 'name' property.
  * @returns Boolean indicating if the function is a constructor.
  */

yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts

@@ -14,7 +14,7 @@ import {
   generatePublicKey,
   getContractInstanceFromDeployParams,
 } from '@aztec/aztec.js';
-import { EthAddress, computePartialAddress } from '@aztec/circuits.js';
+import { computePartialAddress } from '@aztec/circuits.js';
 import { InclusionProofsContract } from '@aztec/noir-contracts.js';
 import { ClaimContract } from '@aztec/noir-contracts.js/Claim';
 import { CrowdfundingContract, CrowdfundingContractArtifact } from '@aztec/noir-contracts.js/Crowdfunding';
@@ -108,13 +108,11 @@ describe('e2e_crowdfunding_and_claim', () => {
     const salt = Fr.random();
 
     const args = [donationToken.address, operatorWallet.getAddress(), deadline];
-    const deployInfo = getContractInstanceFromDeployParams(
-      CrowdfundingContractArtifact,
-      args,
+    const deployInfo = getContractInstanceFromDeployParams(CrowdfundingContractArtifact, {
+      constructorArgs: args,
       salt,
-      crowdfundingPublicKey,
-      EthAddress.ZERO,
-    );
+      publicKey: crowdfundingPublicKey,
+    });
     await pxe.registerAccount(crowdfundingPrivateKey, computePartialAddress(deployInfo));
 
     crowdfundingContract = await CrowdfundingContract.deployWithPublicKey(