@aztec/aztec.js 0.43.0 → 0.45.0

package/src/account/interface.ts

@@ -1,44 +1,25 @@
-import { type AuthWitness, type CompleteAddress, type FunctionCall } from '@aztec/circuit-types';
+import { type AuthWitness, type CompleteAddress } from '@aztec/circuit-types';
 import { type AztecAddress } from '@aztec/circuits.js';
 import { type Fq, type Fr } from '@aztec/foundation/fields';
 
-import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 import { type EntrypointInterface } from '../entrypoint/entrypoint.js';
 
 // docs:start:account-interface
 /** Creates authorization witnesses. */
 export interface AuthWitnessProvider {
   /**
-   * Computes an authentication witness from either a message hash or an intent (caller and an action).
-   * If a message hash is provided, it will create a witness for that directly.
-   * Otherwise, it will compute the message hash using the caller and the action of the intent.
-   * @param messageHashOrIntent - The message hash or the intent (caller and action) to approve
-   * @param chainId - The chain id for the message, will default to the current chain id
-   * @param version - The version for the message, will default to the current protocol version
+   * Computes an authentication witness from either a message hash
+   * @param messageHash - The message hash to approve
    * @returns The authentication witness
    */
-  createAuthWit(
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
-  ): Promise<AuthWitness>;
+  createAuthWit(messageHash: Fr | Buffer): Promise<AuthWitness>;
 }
 
 /**
  * Handler for interfacing with an account. Knows how to create transaction execution
  * requests and authorize actions for its corresponding account.
  */
-export interface AccountInterface extends AuthWitnessProvider, EntrypointInterface {
+export interface AccountInterface extends EntrypointInterface, AuthWitnessProvider {
   /** Returns the complete address for this account. */
   getCompleteAddress(): CompleteAddress;
 

package/src/account/wallet.ts

@@ -1,8 +1,13 @@
-import { type PXE } from '@aztec/circuit-types';
+import { type AuthWitness, type PXE } from '@aztec/circuit-types';
 
+import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js';
 import { type AccountInterface, type AccountKeyRotationInterface } from './interface.js';
 
 /**
  * The wallet interface.
  */
-export type Wallet = AccountInterface & PXE & AccountKeyRotationInterface;
+export type Wallet = AccountInterface &
+  PXE &
+  AccountKeyRotationInterface & {
+    createAuthWit(intent: IntentInnerHash | IntentAction): Promise<AuthWitness>;
+  };

package/src/api/abi.ts

@@ -1,3 +1,3 @@
-export { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
+export { type ContractArtifact, type FunctionArtifact, EventSelector, FunctionSelector } from '@aztec/foundation/abi';
 export { loadContractArtifact, contractArtifactToBuffer, contractArtifactFromBuffer } from '@aztec/types/abi';
 export { type NoirCompiledContract } from '@aztec/types/noir';

package/src/fee/private_fee_payment_method.ts

@@ -6,7 +6,6 @@ import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import { type Wallet } from '../account/wallet.js';
-import { computeAuthWitMessageHash } from '../utils/authwit.js';
 import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
@@ -55,11 +54,9 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
   async getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     const nonce = Fr.random();
     const maxFee = gasSettings.getFeeLimit();
-    const messageHash = computeAuthWitMessageHash(
-      this.paymentContract,
-      this.wallet.getChainId(),
-      this.wallet.getVersion(),
-      {
+    await this.wallet.createAuthWit({
+      caller: this.paymentContract,
+      action: {
         name: 'unshield',
         args: [this.wallet.getCompleteAddress().address, this.paymentContract, maxFee, nonce],
         selector: FunctionSelector.fromSignature('unshield((Field),(Field),Field,Field)'),
@@ -68,8 +65,7 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
         to: this.asset,
         returnTypes: [],
       },
-    );
-    await this.wallet.createAuthWit(messageHash);
+    });
 
     const secretHashForRebate = computeSecretHash(this.rebateSecret);
 

package/src/fee/public_fee_payment_method.ts

@@ -4,7 +4,6 @@ import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
-import { computeAuthWitMessageHash } from '../utils/authwit.js';
 import { type AccountWallet } from '../wallet/account_wallet.js';
 import { type FeePaymentMethod } from './fee_payment_method.js';
 
@@ -47,23 +46,25 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
   getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     const nonce = Fr.random();
     const maxFee = gasSettings.getFeeLimit();
-    const messageHash = computeAuthWitMessageHash(
-      this.paymentContract,
-      this.wallet.getChainId(),
-      this.wallet.getVersion(),
-      {
-        name: 'transfer_public',
-        args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
-        selector: FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
-        type: FunctionType.PUBLIC,
-        isStatic: false,
-        to: this.asset,
-        returnTypes: [],
-      },
-    );
 
     return Promise.resolve([
-      this.wallet.setPublicAuthWit(messageHash, true).request(),
+      this.wallet
+        .setPublicAuthWit(
+          {
+            caller: this.paymentContract,
+            action: {
+              name: 'transfer_public',
+              args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
+              selector: FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
+              type: FunctionType.PUBLIC,
+              isStatic: false,
+              to: this.asset,
+              returnTypes: [],
+            },
+          },
+          true,
+        )
+        .request(),
       {
         name: 'fee_entrypoint_public',
         to: this.paymentContract,

package/src/index.ts

@@ -41,16 +41,18 @@ export {
   CheatCodes,
   EthAddressLike,
   EthCheatCodes,
+  EventSelectorLike,
   FieldLike,
   FunctionSelectorLike,
   WrappedFieldLike,
   computeAuthWitMessageHash,
+  computeInnerAuthWitHashFromAction,
   computeInnerAuthWitHash,
-  computeOuterAuthWitHash,
   generatePublicKey,
   waitForAccountSynch,
   waitForPXE,
 } from './utils/index.js';
+export { NoteSelector } from '@aztec/foundation/abi';
 
 export { createPXEClient } from './rpc_clients/index.js';
 
@@ -97,6 +99,7 @@ export {
   EncryptedLogHeader,
   EncryptedNoteLogIncomingBody,
   EncryptedLogOutgoingBody,
+  EventType,
   ExtendedNote,
   FunctionCall,
   GrumpkinPrivateKey,

package/src/rpc_clients/pxe_client.ts

@@ -25,6 +25,7 @@ import {
   GrumpkinScalar,
   Point,
 } from '@aztec/circuits.js';
+import { NoteSelector } from '@aztec/foundation/abi';
 import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
 /**
@@ -53,6 +54,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       Point,
       TxExecutionRequest,
       TxHash,
+      NoteSelector,
     },
     { Tx, SimulatedTx, TxReceipt, EncryptedNoteL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
     false,

package/src/utils/abi_types.ts

@@ -1,4 +1,10 @@
-import { type AztecAddress, type EthAddress, type Fr, type FunctionSelector } from '@aztec/circuits.js';
+import {
+  type AztecAddress,
+  type EthAddress,
+  type EventSelector,
+  type Fr,
+  type FunctionSelector,
+} from '@aztec/circuits.js';
 
 /** Any type that can be converted into a field for a contract call. */
 export type FieldLike = Fr | Buffer | bigint | number | { /** Converts to field */ toField: () => Fr };
@@ -9,8 +15,11 @@ export type EthAddressLike = { /** Wrapped address */ address: FieldLike } | Eth
 /** Any type that can be converted into an AztecAddress Aztec.nr struct. */
 export type AztecAddressLike = { /** Wrapped address */ address: FieldLike } | AztecAddress;
 
-/** Any type that can be converted into an FunctionSelector Aztec.nr struct. */
+/** Any type that can be converted into a FunctionSelector Aztec.nr struct. */
 export type FunctionSelectorLike = FieldLike | FunctionSelector;
 
+/** Any type that can be converted into an EventSelector Aztec.nr struct. */
+export type EventSelectorLike = FieldLike | EventSelector;
+
 /** Any type that can be converted into a struct with a single `inner` field. */
 export type WrappedFieldLike = { /** Wrapped value */ inner: FieldLike } | FieldLike;

package/src/utils/authwit.ts

@@ -1,32 +1,77 @@
 import { type FunctionCall, PackedValues } from '@aztec/circuit-types';
-import { type AztecAddress, type Fr, GeneratorIndex } from '@aztec/circuits.js';
+import { type AztecAddress, Fr, GeneratorIndex } from '@aztec/circuits.js';
 import { pedersenHash } from '@aztec/foundation/crypto';
 
+import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+
+/** Metadata for the intent */
+export type IntentMetadata = {
+  /** The chain id to approve */
+  chainId: Fr;
+  /** The version to approve  */
+  version: Fr;
+};
+
+/** Intent with an inner hash */
+export type IntentInnerHash = {
+  /** The consumer   */
+  consumer: AztecAddress;
+  /** The action to approve */
+  innerHash: Buffer | Fr;
+};
+
+/** Intent with an action */
+export type IntentAction = {
+  /** The caller to approve  */
+  caller: AztecAddress;
+  /** The action to approve */
+  action: ContractFunctionInteraction | FunctionCall;
+};
+
 // docs:start:authwit_computeAuthWitMessageHash
 /**
- * Compute an authentication witness message hash from a caller and a request
- * H(target: AztecAddress, chainId: Field, version: Field, H(caller: AztecAddress, selector: Field, args_hash: Field))
- * Example usage would be `bob` authenticating `alice` to perform a transfer of `10`
- * tokens from his account to herself:
- * H(token, 1, 1, H(alice, transfer_selector, H(bob, alice, 10, nonce)))
- * `bob` then signs the message hash and gives it to `alice` who can then perform the
- * action.
- * @param caller - The caller approved to make the call
- * @param chainId - The chain id for the message
- * @param version - The version for the message
- * @param action - The request to be made (function call)
- * @returns The message hash for the witness
+ * Compute an authentication witness message hash from an intent and metadata
+ *
+ * If using the `IntentInnerHash`, the consumer is the address that can "consume" the authwit, for token approvals it is the token contract itself.
+ * The `innerHash` itself will be the message that a contract is allowed to execute.
+ * At the point of "approval checking", the validating contract (account for private and registry for public) will be computing the message hash
+ * (`H(consumer, chainid, version, inner_hash)`) where the all but the `inner_hash` is injected from the context (consumer = msg_sender),
+ * and use it for the authentication check.
+ * Therefore, any allowed `innerHash` will therefore also have information around where it can be spent (version, chainId) and who can spend it (consumer).
+ *
+ * If using the `IntentAction`, the caller is the address that is making the call, for a token approval from Alice to Bob, this would be Bob.
+ * The action is then used along with the `caller` to compute the `innerHash` and the consumer.
+ *
+ *
+ * @param intent - The intent to approve (consumer and innerHash or caller and action)
+ *                 The consumer is the address that can "consume" the authwit, for token approvals it is the token contract itself.
+ *                 The caller is the address that is making the call, for a token approval from Alice to Bob, this would be Bob.
+ *                 The caller becomes part of the `inner_hash` and is dealt with entirely in application logic.
+ * @param metadata - The metadata for the intent (chainId, version)
+ * @returns The message hash for the action
  */
-export const computeAuthWitMessageHash = (caller: AztecAddress, chainId: Fr, version: Fr, action: FunctionCall) => {
-  return computeOuterAuthWitHash(
-    action.to.toField(),
-    chainId,
-    version,
-    computeInnerAuthWitHash([caller.toField(), action.selector.toField(), PackedValues.fromValues(action.args).hash]),
-  );
+export const computeAuthWitMessageHash = (intent: IntentInnerHash | IntentAction, metadata: IntentMetadata) => {
+  const chainId = metadata.chainId;
+  const version = metadata.version;
+
+  if ('caller' in intent) {
+    const action = intent.action instanceof ContractFunctionInteraction ? intent.action.request() : intent.action;
+    return computeOuterAuthWitHash(
+      action.to.toField(),
+      chainId,
+      version,
+      computeInnerAuthWitHashFromAction(intent.caller, action),
+    );
+  } else {
+    const inner = Buffer.isBuffer(intent.innerHash) ? Fr.fromBuffer(intent.innerHash) : intent.innerHash;
+    return computeOuterAuthWitHash(intent.consumer, chainId, version, inner);
+  }
 };
 // docs:end:authwit_computeAuthWitMessageHash
 
+export const computeInnerAuthWitHashFromAction = (caller: AztecAddress, action: FunctionCall) =>
+  computeInnerAuthWitHash([caller.toField(), action.selector.toField(), PackedValues.fromValues(action.args).hash]);
+
 /**
  * Compute the inner hash for an authentication witness.
  * This is the "intent" of the message, before siloed with the consumer.
@@ -53,6 +98,6 @@ export const computeInnerAuthWitHash = (args: Fr[]) => {
  * @param innerHash - The inner hash for the witness
  * @returns The outer hash for the witness
  */
-export const computeOuterAuthWitHash = (consumer: AztecAddress, chainId: Fr, version: Fr, innerHash: Fr) => {
+const computeOuterAuthWitHash = (consumer: AztecAddress, chainId: Fr, version: Fr, innerHash: Fr) => {
   return pedersenHash([consumer.toField(), chainId, version, innerHash], GeneratorIndex.AUTHWIT_OUTER);
 };

package/src/wallet/account_wallet.ts

@@ -1,4 +1,4 @@
-import { type AuthWitness, type FunctionCall, type PXE, type TxExecutionRequest } from '@aztec/circuit-types';
+import { type AuthWitness, type PXE, type TxExecutionRequest } from '@aztec/circuit-types';
 import { AztecAddress, CANONICAL_KEY_REGISTRY_ADDRESS, Fq, Fr, derivePublicKeyFromSecretKey } from '@aztec/circuits.js';
 import { type ABIParameterVisibility, type FunctionAbi, FunctionType } from '@aztec/foundation/abi';
 import { AuthRegistryAddress } from '@aztec/protocol-contracts/auth-registry';
@@ -6,7 +6,12 @@ import { AuthRegistryAddress } from '@aztec/protocol-contracts/auth-registry';
 import { type AccountInterface } from '../account/interface.js';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
-import { computeAuthWitMessageHash } from '../utils/authwit.js';
+import {
+  type IntentAction,
+  type IntentInnerHash,
+  computeAuthWitMessageHash,
+  computeInnerAuthWitHashFromAction,
+} from '../utils/authwit.js';
 import { BaseWallet } from './base_wallet.js';
 
 /**
@@ -30,28 +35,25 @@ export class AccountWallet extends BaseWallet {
   }
 
   /**
-   * Computes an authentication witness from either a message or a caller and an action.
-   * If a message is provided, it will create a witness for the message directly.
-   * Otherwise, it will compute the message using the caller and the action.
-   * @param messageHashOrIntent - The message or the caller and action to approve
+   * Computes an authentication witness from either a message hash or an intent.
+   *
+   * If a message hash is provided, it will create a witness for the hash directly.
+   * Otherwise, it will compute the message hash using the intent, along with the
+   * chain id and the version values provided by the wallet.
+   *
+   * @param messageHashOrIntent - The message hash of the intent to approve
    * @returns The authentication witness
    */
-  async createAuthWit(
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
-  ): Promise<AuthWitness> {
-    const messageHash = this.getMessageHash(messageHashOrIntent);
+  async createAuthWit(messageHashOrIntent: Fr | Buffer | IntentAction | IntentInnerHash): Promise<AuthWitness> {
+    let messageHash: Fr;
+    if (Buffer.isBuffer(messageHashOrIntent)) {
+      messageHash = Fr.fromBuffer(messageHashOrIntent);
+    } else if (messageHashOrIntent instanceof Fr) {
+      messageHash = messageHashOrIntent;
+    } else {
+      messageHash = this.getMessageHash(messageHashOrIntent);
+    }
+
     const witness = await this.account.createAuthWit(messageHash);
     await this.pxe.addAuthWitness(witness);
     return witness;
@@ -59,129 +61,92 @@ export class AccountWallet extends BaseWallet {
 
   /**
    * Returns a function interaction to set a message hash as authorized or revoked in this account.
+   *
    * Public calls can then consume this authorization.
-   * @param messageHashOrIntent - The message or the caller and action to authorize/revoke
+   *
+   * @param messageHashOrIntent - The message hash or intent to authorize/revoke
    * @param authorized - True to authorize, false to revoke authorization.
    * @returns - A function interaction.
    */
   public setPublicAuthWit(
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
+    messageHashOrIntent: Fr | Buffer | IntentInnerHash | IntentAction,
     authorized: boolean,
   ): ContractFunctionInteraction {
-    const message = this.getMessageHash(messageHashOrIntent);
+    let messageHash: Fr;
+    if (Buffer.isBuffer(messageHashOrIntent)) {
+      messageHash = Fr.fromBuffer(messageHashOrIntent);
+    } else if (messageHashOrIntent instanceof Fr) {
+      messageHash = messageHashOrIntent;
+    } else {
+      messageHash = this.getMessageHash(messageHashOrIntent);
+    }
+
     return new ContractFunctionInteraction(this, AuthRegistryAddress, this.getSetAuthorizedAbi(), [
-      message,
+      messageHash,
       authorized,
     ]);
   }
 
-  /**
-   * Returns a function interaction to cancel a message hash as authorized or revoked.
-   * @param messageHashOrIntent - The message or the caller and action to revoke
-   * @returns - A function interaction.
-   */
-  public cancelPublicAuthWit(
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
-  ): ContractFunctionInteraction {
-    return this.setPublicAuthWit(messageHashOrIntent, false);
+  private getInnerHashAndConsumer(intent: IntentInnerHash | IntentAction): {
+    /** The inner hash */
+    innerHash: Fr;
+    /** The consumer of the authwit */
+    consumer: AztecAddress;
+  } {
+    if ('caller' in intent && 'action' in intent) {
+      const action = intent.action instanceof ContractFunctionInteraction ? intent.action.request() : intent.action;
+      return {
+        innerHash: computeInnerAuthWitHashFromAction(intent.caller, action),
+        consumer: action.to,
+      };
+    } else if (Buffer.isBuffer(intent.innerHash)) {
+      return { innerHash: Fr.fromBuffer(intent.innerHash), consumer: intent.consumer };
+    }
+    return { innerHash: intent.innerHash, consumer: intent.consumer };
   }
 
   /**
-   * Returns the message hash for the given message or authwit input.
-   * @param messageHashOrIntent - The message hash or the caller and action to authorize
+   * Returns the message hash for the given intent
+   *
+   * @param intent - A tuple of (consumer and inner hash) or (caller and action)
    * @returns The message hash
    */
-  private getMessageHash(
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
-  ): Fr {
-    if (Buffer.isBuffer(messageHashOrIntent)) {
-      return Fr.fromBuffer(messageHashOrIntent);
-    } else if (messageHashOrIntent instanceof Fr) {
-      return messageHashOrIntent;
-    } else {
-      return computeAuthWitMessageHash(
-        messageHashOrIntent.caller,
-        messageHashOrIntent.chainId || this.getChainId(),
-        messageHashOrIntent.version || this.getVersion(),
-        messageHashOrIntent.action instanceof ContractFunctionInteraction
-          ? messageHashOrIntent.action.request()
-          : messageHashOrIntent.action,
-      );
-    }
+  private getMessageHash(intent: IntentInnerHash | IntentAction): Fr {
+    const chainId = this.getChainId();
+    const version = this.getVersion();
+    return computeAuthWitMessageHash(intent, { chainId, version });
   }
 
   /**
    * Lookup the validity of an authwit in private and public contexts.
-   * If the authwit have been consumed already (nullifier spent), will return false in both contexts.
-   * @param target - The target contract address
-   * @param messageHashOrIntent - The message hash or the caller and action to authorize/revoke
+   *
+   * Uses the chain id and version of the wallet.
+   *
+   * @param onBehalfOf - The address of the "approver"
+   * @param intent - The consumer and inner hash or the caller and action to lookup
+   *
    * @returns - A struct containing the validity of the authwit in private and public contexts.
    */
   async lookupValidity(
-    target: AztecAddress,
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
+    onBehalfOf: AztecAddress,
+    intent: IntentInnerHash | IntentAction,
   ): Promise<{
     /** boolean flag indicating if the authwit is valid in private context */
     isValidInPrivate: boolean;
     /** boolean flag indicating if the authwit is valid in public context */
     isValidInPublic: boolean;
   }> {
-    const messageHash = this.getMessageHash(messageHashOrIntent);
+    const { innerHash, consumer } = this.getInnerHashAndConsumer(intent);
+
+    const messageHash = this.getMessageHash(intent);
     const results = { isValidInPrivate: false, isValidInPublic: false };
 
     // Check private
     const witness = await this.getAuthWitness(messageHash);
     if (witness !== undefined) {
-      results.isValidInPrivate = (await new ContractFunctionInteraction(this, target, this.getLookupValidityAbi(), [
-        messageHash,
+      results.isValidInPrivate = (await new ContractFunctionInteraction(this, onBehalfOf, this.getLookupValidityAbi(), [
+        consumer,
+        innerHash,
       ]).simulate()) as boolean;
     }
 
@@ -190,7 +155,7 @@ export class AccountWallet extends BaseWallet {
       this,
       AuthRegistryAddress,
       this.getIsConsumableAbi(),
-      [target, messageHash],
+      [onBehalfOf, messageHash],
     ).simulate()) as boolean;
 
     return results;
@@ -220,31 +185,6 @@ export class AccountWallet extends BaseWallet {
     await interaction.send().wait();
   }
 
-  /**
-   * Returns a function interaction to cancel a message hash as authorized in this account.
-   * @param messageHashOrIntent - The message or the caller and action to authorize/revoke
-   * @returns - A function interaction.
-   */
-  public cancelAuthWit(
-    messageHashOrIntent:
-      | Fr
-      | Buffer
-      | {
-          /** The caller to approve  */
-          caller: AztecAddress;
-          /** The action to approve */
-          action: ContractFunctionInteraction | FunctionCall;
-          /** The chain id to approve */
-          chainId?: Fr;
-          /** The version to approve  */
-          version?: Fr;
-        },
-  ): ContractFunctionInteraction {
-    const message = this.getMessageHash(messageHashOrIntent);
-    const args = [message];
-    return new ContractFunctionInteraction(this, this.getAddress(), this.getCancelAuthwitAbi(), args);
-  }
-
   /** Returns the complete address of the account that implements this wallet. */
   public getCompleteAddress() {
     return this.account.getCompleteAddress();
@@ -278,24 +218,6 @@ export class AccountWallet extends BaseWallet {
     };
   }
 
-  private getCancelAuthwitAbi(): FunctionAbi {
-    return {
-      name: 'cancel_authwit',
-      isInitializer: false,
-      functionType: FunctionType.PRIVATE,
-      isInternal: true,
-      isStatic: false,
-      parameters: [
-        {
-          name: 'message_hash',
-          type: { kind: 'field' },
-          visibility: 'private' as ABIParameterVisibility,
-        },
-      ],
-      returnTypes: [],
-    };
-  }
-
   private getLookupValidityAbi(): FunctionAbi {
     return {
       name: 'lookup_validity',