@aztec/aztec.js 0.0.1-commit.7cf39cb55 → 0.0.1-commit.808bf7f90

package/src/contract/protocol_contracts/auth-registry.ts

@@ -21,38 +21,33 @@ const AuthRegistryContractArtifact: ContractArtifact = {
   functions: [
     {
       ...{
-        functionType: FunctionType.PUBLIC,
-        name: 'public_dispatch',
+        functionType: FunctionType.PRIVATE,
+        name: 'set_authorized_private',
         isOnlySelf: false,
         isStatic: false,
         isInitializer: false,
-        parameters: [{ name: 'selector', type: { kind: 'field' }, visibility: 'private' }],
+        parameters: [
+          {
+            name: 'approver',
+            type: {
+              kind: 'struct',
+              fields: [{ name: 'inner', type: { kind: 'field' } }],
+              path: 'aztec::protocol_types::address::aztec_address::AztecAddress',
+            },
+            visibility: 'private',
+          },
+          { name: 'message_hash', type: { kind: 'field' }, visibility: 'private' },
+          { name: 'authorize', type: { kind: 'boolean' }, visibility: 'private' },
+        ],
         returnTypes: [],
         errorTypes: {
-          '361444214588792908': { error_kind: 'string', string: 'attempt to multiply with overflow' },
-          '1998584279744703196': { error_kind: 'string', string: 'attempt to subtract with overflow' },
-          '5525725861591553972': { error_kind: 'string', string: 'rejecting all' },
-          '11691217184967371519': {
-            error_kind: 'string',
-            string: 'Function is_reject_all can only be called statically',
-          },
-          '12511970388699677811': { error_kind: 'fmtstring', length: 27, item_types: [{ kind: 'field' }] },
-          '13455385521185560676': {
-            error_kind: 'string',
-            string: 'Storage slot 0 not allowed. Storage slots must start from 1.',
-          },
-          '13929691561421487185': {
-            error_kind: 'string',
-            string: 'Function _set_authorized can only be called by the same contract',
-          },
+          '7555607922535724711': { error_kind: 'string', string: 'Preimage mismatch' },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
+          '9894212961085021188': { error_kind: 'string', string: 'Message not authorized by account' },
+          '12327971061804302172': { error_kind: 'fmtstring', length: 98, item_types: [] },
           '14990209321349310352': { error_kind: 'string', string: 'attempt to add with overflow' },
           '15764276373176857197': { error_kind: 'string', string: 'Stack too deep' },
           '16431471497789672479': { error_kind: 'string', string: 'Index out of bounds' },
-          '17089945683942782951': { error_kind: 'string', string: 'unauthorized' },
-          '17312933876399746100': {
-            error_kind: 'string',
-            string: 'Function is_consumable can only be called statically',
-          },
         },
       },
       bytecode: Buffer.from([]),
@@ -60,14 +55,14 @@ const AuthRegistryContractArtifact: ContractArtifact = {
     },
     {
       ...{
-        functionType: FunctionType.PRIVATE,
-        name: 'set_authorized_private',
+        functionType: FunctionType.UTILITY,
+        name: 'utility_is_consumable',
         isOnlySelf: false,
         isStatic: false,
         isInitializer: false,
         parameters: [
           {
-            name: 'approver',
+            name: 'on_behalf_of',
             type: {
               kind: 'struct',
               fields: [{ name: 'inner', type: { kind: 'field' } }],
@@ -76,14 +71,18 @@ const AuthRegistryContractArtifact: ContractArtifact = {
             visibility: 'private',
           },
           { name: 'message_hash', type: { kind: 'field' }, visibility: 'private' },
-          { name: 'authorize', type: { kind: 'boolean' }, visibility: 'private' },
         ],
-        returnTypes: [],
+        returnTypes: [{ kind: 'boolean' }],
         errorTypes: {
-          '7555607922535724711': { error_kind: 'string', string: 'Preimage mismatch' },
-          '9894212961085021188': { error_kind: 'string', string: 'Message not authorized by account' },
+          '361444214588792908': { error_kind: 'string', string: 'attempt to multiply with overflow' },
+          '1998584279744703196': { error_kind: 'string', string: 'attempt to subtract with overflow' },
+          '13455385521185560676': {
+            error_kind: 'string',
+            string: 'Storage slot 0 not allowed. Storage slots must start from 1.',
+          },
           '14990209321349310352': { error_kind: 'string', string: 'attempt to add with overflow' },
           '15764276373176857197': { error_kind: 'string', string: 'Stack too deep' },
+          '16431471497789672479': { error_kind: 'string', string: 'Index out of bounds' },
         },
       },
       bytecode: Buffer.from([]),
@@ -92,33 +91,219 @@ const AuthRegistryContractArtifact: ContractArtifact = {
     {
       ...{
         functionType: FunctionType.UTILITY,
-        name: 'utility_is_consumable',
+        name: 'process_message',
         isOnlySelf: false,
         isStatic: false,
         isInitializer: false,
         parameters: [
           {
-            name: 'on_behalf_of',
+            name: 'message_ciphertext',
             type: {
               kind: 'struct',
-              fields: [{ name: 'inner', type: { kind: 'field' } }],
-              path: 'aztec::protocol_types::address::aztec_address::AztecAddress',
+              fields: [
+                { name: 'storage', type: { kind: 'array', length: 15, type: { kind: 'field' } } },
+                { name: 'len', type: { kind: 'integer', sign: 'unsigned', width: 32 } },
+              ],
+              path: 'std::collections::bounded_vec::BoundedVec',
+            },
+            visibility: 'private',
+          },
+          {
+            name: 'message_context',
+            type: {
+              kind: 'struct',
+              fields: [
+                { name: 'tx_hash', type: { kind: 'field' } },
+                {
+                  name: 'unique_note_hashes_in_tx',
+                  type: {
+                    kind: 'struct',
+                    fields: [
+                      { name: 'storage', type: { kind: 'array', length: 64, type: { kind: 'field' } } },
+                      { name: 'len', type: { kind: 'integer', sign: 'unsigned', width: 32 } },
+                    ],
+                    path: 'std::collections::bounded_vec::BoundedVec',
+                  },
+                },
+                { name: 'first_nullifier_in_tx', type: { kind: 'field' } },
+                {
+                  name: 'recipient',
+                  type: {
+                    kind: 'struct',
+                    fields: [{ name: 'inner', type: { kind: 'field' } }],
+                    path: 'aztec::protocol_types::address::aztec_address::AztecAddress',
+                  },
+                },
+              ],
+              path: 'aztec::messages::processing::message_context::MessageContext',
             },
             visibility: 'private',
           },
-          { name: 'message_hash', type: { kind: 'field' }, visibility: 'private' },
         ],
-        returnTypes: [{ kind: 'boolean' }],
+        returnTypes: [],
+        errorTypes: {
+          '361444214588792908': { error_kind: 'string', string: 'attempt to multiply with overflow' },
+          '992401946138144806': { error_kind: 'string', string: 'Attempted to read past end of BoundedVec' },
+          '1998584279744703196': { error_kind: 'string', string: 'attempt to subtract with overflow' },
+          '2967937905572420042': {
+            error_kind: 'fmtstring',
+            length: 61,
+            item_types: [{ kind: 'field' }, { kind: 'field' }],
+          },
+          '3330370348214585450': {
+            error_kind: 'fmtstring',
+            length: 48,
+            item_types: [{ kind: 'field' }, { kind: 'field' }],
+          },
+          '3670003311596808700': {
+            error_kind: 'fmtstring',
+            length: 77,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '4261968856572588300': { error_kind: 'string', string: 'Value does not fit in field' },
+          '4440399188109668273': { error_kind: 'string', string: 'Input length must be a multiple of 32' },
+          '5417577161503694006': { error_kind: 'fmtstring', length: 56, item_types: [{ kind: 'field' }] },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
+          '9791669845391776238': {
+            error_kind: 'string',
+            string: '0 has a square root; you cannot claim it is not square',
+          },
+          '10135509984888824963': { error_kind: 'fmtstring', length: 58, item_types: [{ kind: 'field' }] },
+          '10791800398362570014': { error_kind: 'string', string: 'extend_from_bounded_vec out of bounds' },
+          '11692359521570349358': { error_kind: 'fmtstring', length: 40, item_types: [] },
+          '12469291177396340830': { error_kind: 'string', string: 'call to assert_max_bit_size' },
+          '12913276134398371456': { error_kind: 'string', string: 'push out of bounds' },
+          '13557316507370296400': {
+            error_kind: 'fmtstring',
+            length: 130,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '14938672389828944159': {
+            error_kind: 'fmtstring',
+            length: 146,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '14990209321349310352': { error_kind: 'string', string: 'attempt to add with overflow' },
+          '15764276373176857197': { error_kind: 'string', string: 'Stack too deep' },
+          '16431471497789672479': { error_kind: 'string', string: 'Index out of bounds' },
+          '17531474008201752295': {
+            error_kind: 'fmtstring',
+            length: 133,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+        },
+      },
+      bytecode: Buffer.from([]),
+      debugSymbols: '',
+    },
+    {
+      ...{
+        functionType: FunctionType.PUBLIC,
+        name: 'public_dispatch',
+        isOnlySelf: false,
+        isStatic: false,
+        isInitializer: false,
+        parameters: [{ name: 'selector', type: { kind: 'field' }, visibility: 'private' }],
+        returnTypes: [],
         errorTypes: {
           '361444214588792908': { error_kind: 'string', string: 'attempt to multiply with overflow' },
           '1998584279744703196': { error_kind: 'string', string: 'attempt to subtract with overflow' },
+          '5525725861591553972': { error_kind: 'string', string: 'rejecting all' },
+          '11691217184967371519': {
+            error_kind: 'string',
+            string: 'Function is_reject_all can only be called statically',
+          },
+          '12511970388699677811': { error_kind: 'fmtstring', length: 27, item_types: [{ kind: 'field' }] },
           '13455385521185560676': {
             error_kind: 'string',
             string: 'Storage slot 0 not allowed. Storage slots must start from 1.',
           },
+          '13929691561421487185': {
+            error_kind: 'string',
+            string: 'Function _set_authorized can only be called by the same contract',
+          },
           '14990209321349310352': { error_kind: 'string', string: 'attempt to add with overflow' },
           '15764276373176857197': { error_kind: 'string', string: 'Stack too deep' },
           '16431471497789672479': { error_kind: 'string', string: 'Index out of bounds' },
+          '17089945683942782951': { error_kind: 'string', string: 'unauthorized' },
+          '17312933876399746100': {
+            error_kind: 'string',
+            string: 'Function is_consumable can only be called statically',
+          },
+        },
+      },
+      bytecode: Buffer.from([]),
+      debugSymbols: '',
+    },
+    {
+      ...{
+        functionType: FunctionType.UTILITY,
+        name: 'sync_state',
+        isOnlySelf: false,
+        isStatic: false,
+        isInitializer: false,
+        parameters: [],
+        returnTypes: [],
+        errorTypes: {
+          '361444214588792908': { error_kind: 'string', string: 'attempt to multiply with overflow' },
+          '992401946138144806': { error_kind: 'string', string: 'Attempted to read past end of BoundedVec' },
+          '1998584279744703196': { error_kind: 'string', string: 'attempt to subtract with overflow' },
+          '2967937905572420042': {
+            error_kind: 'fmtstring',
+            length: 61,
+            item_types: [{ kind: 'field' }, { kind: 'field' }],
+          },
+          '3330370348214585450': {
+            error_kind: 'fmtstring',
+            length: 48,
+            item_types: [{ kind: 'field' }, { kind: 'field' }],
+          },
+          '3670003311596808700': {
+            error_kind: 'fmtstring',
+            length: 77,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '4261968856572588300': { error_kind: 'string', string: 'Value does not fit in field' },
+          '4440399188109668273': { error_kind: 'string', string: 'Input length must be a multiple of 32' },
+          '5417577161503694006': { error_kind: 'fmtstring', length: 56, item_types: [{ kind: 'field' }] },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
+          '9791669845391776238': {
+            error_kind: 'string',
+            string: '0 has a square root; you cannot claim it is not square',
+          },
+          '9885968605480832328': {
+            error_kind: 'string',
+            string: 'Attempted to read past the length of a CapsuleArray',
+          },
+          '10135509984888824963': { error_kind: 'fmtstring', length: 58, item_types: [{ kind: 'field' }] },
+          '10791800398362570014': { error_kind: 'string', string: 'extend_from_bounded_vec out of bounds' },
+          '11021520179822076911': {
+            error_kind: 'string',
+            string: 'Attempted to delete past the length of a CapsuleArray',
+          },
+          '11692359521570349358': { error_kind: 'fmtstring', length: 40, item_types: [] },
+          '12327971061804302172': { error_kind: 'fmtstring', length: 98, item_types: [] },
+          '12469291177396340830': { error_kind: 'string', string: 'call to assert_max_bit_size' },
+          '12913276134398371456': { error_kind: 'string', string: 'push out of bounds' },
+          '13557316507370296400': {
+            error_kind: 'fmtstring',
+            length: 130,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '14938672389828944159': {
+            error_kind: 'fmtstring',
+            length: 146,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '14990209321349310352': { error_kind: 'string', string: 'attempt to add with overflow' },
+          '15764276373176857197': { error_kind: 'string', string: 'Stack too deep' },
+          '16431471497789672479': { error_kind: 'string', string: 'Index out of bounds' },
+          '17531474008201752295': {
+            error_kind: 'fmtstring',
+            length: 133,
+            item_types: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+          },
+          '17655676068928457687': { error_kind: 'string', string: 'Reader did not read all data' },
         },
       },
       bytecode: Buffer.from([]),
@@ -326,6 +511,18 @@ export class AuthRegistryContract extends ContractBase {
     /** is_reject_all(on_behalf_of: struct) */
     is_reject_all: ((on_behalf_of: AztecAddressLike) => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
 
+    /** process_message(message_ciphertext: struct, message_context: struct) */
+    process_message: ((
+      message_ciphertext: FieldLike[],
+      message_context: {
+        tx_hash: FieldLike;
+        unique_note_hashes_in_tx: FieldLike[];
+        first_nullifier_in_tx: FieldLike;
+        recipient: AztecAddressLike;
+      },
+    ) => ContractFunctionInteraction) &
+      Pick<ContractMethod, 'selector'>;
+
     /** public_dispatch(selector: field) */
     public_dispatch: ((selector: FieldLike) => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
 
@@ -344,6 +541,9 @@ export class AuthRegistryContract extends ContractBase {
     /** set_reject_all(reject: boolean) */
     set_reject_all: ((reject: boolean) => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
 
+    /** sync_state() */
+    sync_state: (() => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
+
     /** utility_is_consumable(on_behalf_of: struct, message_hash: field) */
     utility_is_consumable: ((on_behalf_of: AztecAddressLike, message_hash: FieldLike) => ContractFunctionInteraction) &
       Pick<ContractMethod, 'selector'>;

package/src/contract/protocol_contracts/multi-call-entrypoint.ts

@@ -99,7 +99,7 @@ const MultiCallEntrypointContractArtifact: ContractArtifact = {
             type: {
               kind: 'struct',
               fields: [
-                { name: 'storage', type: { kind: 'array', length: 17, type: { kind: 'field' } } },
+                { name: 'storage', type: { kind: 'array', length: 15, type: { kind: 'field' } } },
                 { name: 'len', type: { kind: 'integer', sign: 'unsigned', width: 32 } },
               ],
               path: 'std::collections::bounded_vec::BoundedVec',
@@ -161,6 +161,7 @@ const MultiCallEntrypointContractArtifact: ContractArtifact = {
           '4261968856572588300': { error_kind: 'string', string: 'Value does not fit in field' },
           '4440399188109668273': { error_kind: 'string', string: 'Input length must be a multiple of 32' },
           '5417577161503694006': { error_kind: 'fmtstring', length: 56, item_types: [{ kind: 'field' }] },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
           '9791669845391776238': {
             error_kind: 'string',
             string: '0 has a square root; you cannot claim it is not square',
@@ -224,6 +225,7 @@ const MultiCallEntrypointContractArtifact: ContractArtifact = {
           '4261968856572588300': { error_kind: 'string', string: 'Value does not fit in field' },
           '4440399188109668273': { error_kind: 'string', string: 'Input length must be a multiple of 32' },
           '5417577161503694006': { error_kind: 'fmtstring', length: 56, item_types: [{ kind: 'field' }] },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
           '9791669845391776238': {
             error_kind: 'string',
             string: '0 has a square root; you cannot claim it is not square',

package/src/contract/protocol_contracts/public-checks.ts

@@ -32,7 +32,7 @@ const PublicChecksContractArtifact: ContractArtifact = {
             type: {
               kind: 'struct',
               fields: [
-                { name: 'storage', type: { kind: 'array', length: 17, type: { kind: 'field' } } },
+                { name: 'storage', type: { kind: 'array', length: 15, type: { kind: 'field' } } },
                 { name: 'len', type: { kind: 'integer', sign: 'unsigned', width: 32 } },
               ],
               path: 'std::collections::bounded_vec::BoundedVec',
@@ -94,6 +94,7 @@ const PublicChecksContractArtifact: ContractArtifact = {
           '4261968856572588300': { error_kind: 'string', string: 'Value does not fit in field' },
           '4440399188109668273': { error_kind: 'string', string: 'Input length must be a multiple of 32' },
           '5417577161503694006': { error_kind: 'fmtstring', length: 56, item_types: [{ kind: 'field' }] },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
           '9791669845391776238': {
             error_kind: 'string',
             string: '0 has a square root; you cannot claim it is not square',
@@ -185,6 +186,7 @@ const PublicChecksContractArtifact: ContractArtifact = {
           '4261968856572588300': { error_kind: 'string', string: 'Value does not fit in field' },
           '4440399188109668273': { error_kind: 'string', string: 'Input length must be a multiple of 32' },
           '5417577161503694006': { error_kind: 'fmtstring', length: 56, item_types: [{ kind: 'field' }] },
+          '9530675838293881722': { error_kind: 'string', string: 'Writer did not write all data' },
           '9791669845391776238': {
             error_kind: 'string',
             string: '0 has a square root; you cannot claim it is not square',

package/src/wallet/capabilities.ts

@@ -32,6 +32,15 @@ export interface ContractFunctionPattern {
 
   /** Function name or '*' for any function */
   function: string;
+
+  /**
+   * Additional addresses whose private state and keys are accessible
+   * when calling this function, beyond the sender's.
+   * - undefined: No additional scopes allowed
+   * - AztecAddress[]: Only these specific addresses allowed as additional scopes
+   * - '*': All known address allowed as an additional scope
+   */
+  additionalScopes?: AztecAddress[] | '*';
 }
 
 /**
@@ -180,11 +189,11 @@ export interface ContractClassesCapability {
 export interface GrantedContractClassesCapability extends ContractClassesCapability {}
 
 /**
- * Transaction simulation capability - for simulating transactions and utilities.
+ * Transaction simulation capability - for simulating transactions and executing utilities.
  *
  * Maps to wallet methods:
  * - simulateTx (when transactions scope specified)
- * - simulateUtility (when utilities scope specified)
+ * - executeUtility (when utilities scope specified)
  * - profileTx (when transactions scope specified)
  *
  * @example
@@ -200,7 +209,7 @@ export interface GrantedContractClassesCapability extends ContractClassesCapabil
  * \}
  *
  * @example
- * // Simulate any transaction and utility call
+ * // Simulate any transaction and execute any utility call
  * \{
  *   type: 'simulation',
  *   transactions: \{ scope: '*' \},
@@ -221,7 +230,7 @@ export interface SimulationCapability {
     scope: '*' | ContractFunctionPattern[];
   };
 
-  /** Utility simulation scope (unconstrained calls). Maps to: simulateUtility */
+  /** Utility execution scope (unconstrained calls). Maps to: executeUtility */
   utilities?: {
     /**
      * Which contracts/functions to allow:

package/src/wallet/deploy_account_method.ts

@@ -9,15 +9,22 @@ import type { Account } from '../account/account.js';
 import type { Contract } from '../contract/contract.js';
 import type { ContractBase } from '../contract/contract_base.js';
 import {
+  type DeployInteractionWaitOptions,
   DeployMethod,
+  type DeployOptions,
   type DeployOptionsWithoutWait,
   type RequestDeployOptions,
   type SimulateDeployOptions,
 } from '../contract/deploy_method.js';
-import type { FeePaymentMethodOption, InteractionWaitOptions } from '../contract/interaction_options.js';
+import type {
+  FeePaymentMethodOption,
+  InteractionWaitOptions,
+  ProfileInteractionOptions,
+} from '../contract/interaction_options.js';
+import type { WaitOpts } from '../contract/wait_opts.js';
 import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
 import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_payment_method.js';
-import type { Wallet } from './index.js';
+import type { ProfileOptions, SendOptions, SimulateOptions, Wallet } from './index.js';
 
 /**
  * Extended fee payment method option for account deployments that includes entrypoint wrapping options
@@ -147,4 +154,34 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
       deployer: options.from,
     };
   }
+
+  protected override convertDeployOptionsToSendOptions<W extends DeployInteractionWaitOptions>(
+    options: DeployOptions<W>,
+    // eslint-disable-next-line jsdoc/require-jsdoc
+  ): SendOptions<W extends { returnReceipt: true } ? WaitOpts : W> {
+    return super.convertDeployOptionsToSendOptions(this.injectContractAddressIntoScopes(options));
+  }
+
+  protected override convertDeployOptionsToSimulateOptions(options: SimulateDeployOptions): SimulateOptions {
+    return super.convertDeployOptionsToSimulateOptions(this.injectContractAddressIntoScopes(options));
+  }
+
+  protected override convertDeployOptionsToProfileOptions(
+    options: DeployOptionsWithoutWait & ProfileInteractionOptions,
+  ): ProfileOptions {
+    return super.convertDeployOptionsToProfileOptions(this.injectContractAddressIntoScopes(options));
+  }
+
+  /**
+   * Injects the contract's own address into scopes so the constructor can access its own keys.
+   * @param options - The deploy options to augment with the contract address.
+   */
+  // eslint-disable-next-line jsdoc/require-jsdoc
+  private injectContractAddressIntoScopes<T extends { additionalScopes?: AztecAddress[] }>(options: T): T {
+    if (!this.address) {
+      throw new Error('Instance not yet constructed. This is a bug!');
+    }
+    const existing = options.additionalScopes ?? [];
+    return { ...options, additionalScopes: [...existing, this.address] };
+  }
 }

package/src/wallet/wallet.ts

@@ -22,7 +22,7 @@ import {
   TxProfileResult,
   TxReceipt,
   TxSimulationResult,
-  UtilitySimulationResult,
+  UtilityExecutionResult,
   inTxSchema,
 } from '@aztec/stdlib/tx';
 
@@ -226,10 +226,10 @@ export type ContractClassMetadata = {
 };
 
 /**
- * Options for simulating a utility function call.
+ * Options for executing a utility function call.
  */
-export type SimulateUtilityOptions = {
-  /** The scope for the utility simulation (determines which notes and keys are visible). */
+export type ExecuteUtilityOptions = {
+  /** The scope for the utility execution (determines which notes and keys are visible). */
   scope: AztecAddress;
   /** Optional auth witnesses to use during execution. */
   authWitnesses?: AuthWitness[];
@@ -255,7 +255,7 @@ export type Wallet = {
     secretKey?: Fr,
   ): Promise<ContractInstanceWithAddress>;
   simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult>;
-  simulateUtility(call: FunctionCall, opts: SimulateUtilityOptions): Promise<UtilitySimulationResult>;
+  executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
   profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
   sendTx<W extends InteractionWaitOptions = undefined>(
     exec: ExecutionPayload,
@@ -303,6 +303,7 @@ export const SendOptionsSchema = z.object({
   capsules: optional(z.array(Capsule.schema)),
   fee: optional(GasSettingsOptionSchema),
   wait: optional(z.union([z.literal(NO_WAIT), WaitOptsSchema])),
+  additionalScopes: optional(z.array(schemas.AztecAddress)),
 });
 
 export const SimulateOptionsSchema = z.object({
@@ -313,6 +314,7 @@ export const SimulateOptionsSchema = z.object({
   skipTxValidation: optional(z.boolean()),
   skipFeeEnforcement: optional(z.boolean()),
   includeMetadata: optional(z.boolean()),
+  additionalScopes: optional(z.array(schemas.AztecAddress)),
 });
 
 export const ProfileOptionsSchema = SimulateOptionsSchema.extend({
@@ -379,6 +381,7 @@ export const ContractClassMetadataSchema = z.object({
 export const ContractFunctionPatternSchema = z.object({
   contract: z.union([schemas.AztecAddress, z.literal('*')]),
   function: z.union([z.string(), z.literal('*')]),
+  additionalScopes: optional(z.union([z.array(schemas.AztecAddress), z.literal('*')])),
 });
 
 export const AccountsCapabilitySchema = z.object({
@@ -518,7 +521,7 @@ const WalletMethodSchemas = {
     .args(ContractInstanceWithAddressSchema, optional(ContractArtifactSchema), optional(schemas.Fr))
     .returns(ContractInstanceWithAddressSchema),
   simulateTx: z.function().args(ExecutionPayloadSchema, SimulateOptionsSchema).returns(TxSimulationResult.schema),
-  simulateUtility: z
+  executeUtility: z
     .function()
     .args(
       FunctionCall.schema,
@@ -527,7 +530,7 @@ const WalletMethodSchemas = {
         authWitnesses: optional(z.array(AuthWitness.schema)),
       }),
     )
-    .returns(UtilitySimulationResult.schema),
+    .returns(UtilityExecutionResult.schema),
   profileTx: z.function().args(ExecutionPayloadSchema, ProfileOptionsSchema).returns(TxProfileResult.schema),
   sendTx: z
     .function()