feat: update account contracts to pay fees on init

AztecProtocol · Apr 4, 2024 · 1bbdc57 · 1bbdc57
1 parent e405423
commit 1bbdc57
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr
@@ -29,6 +29,9 @@ contract EcdsaAccount {
         let this = context.this_address();
         let mut pub_key_note = EcdsaPublicKeyNote::new(signing_pub_key_x, signing_pub_key_y, this);
         storage.public_key.initialize(&mut pub_key_note, true);
+
+        let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+        actions.initialize_account_contract();
     }
 
     // Note: If you globally change the entrypoint signature don't forget to update default_entrypoint.ts

diff --git a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr
@@ -14,6 +14,13 @@ contract SchnorrHardcodedAccount {
 
     global ACCOUNT_ACTIONS_STORAGE_SLOT = 1;
 
+    #[aztec(private)]
+    #[aztec(initializer)]
+    fn constructor() {
+        let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+        actions.initialize_account_contract();
+    }
+
     // Note: If you globally change the entrypoint signature don't forget to update default_entrypoint.ts
     #[aztec(private)]
     fn entrypoint(app_payload: pub AppPayload, fee_payload: pub FeePayload) {

diff --git a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr
@@ -10,6 +10,13 @@ contract SchnorrSingleKeyAccount {
 
     global ACCOUNT_ACTIONS_STORAGE_SLOT = 1;
 
+    #[aztec(private)]
+    #[aztec(initializer)]
+    fn constructor() {
+        let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+        actions.initialize_account_contract();
+    }
+
     // Note: If you globally change the entrypoint signature don't forget to update default_entrypoint.ts
     #[aztec(private)]
     fn entrypoint(app_payload: pub AppPayload, fee_payload: pub FeePayload) {

diff --git a/yarn-project/accounts/src/single_key/account_contract.ts b/yarn-project/accounts/src/single_key/account_contract.ts
@@ -18,8 +18,8 @@ export class SingleKeyAccountContract extends DefaultAccountContract {
     super(SchnorrSingleKeyAccountContractArtifact as ContractArtifact);
   }
 
-  getDeploymentArgs(): undefined {
-    return undefined;
+  getDeploymentArgs(): Array<void> {
+    return [];
   }
 
   getAuthWitnessProvider({ partialAddress }: CompleteAddress): AuthWitnessProvider {