@aztec/aztec.js 0.0.1-commit.b655e406 → 0.0.1-commit.bf2612ae

package/dest/scripts/generate_protocol_contract_types.js

@@ -0,0 +1,120 @@
+/**
+ * Generates type-safe contract wrappers for protocol contracts.
+ * These wrappers use a minimal artifact (without bytecode) since PXE already has the full artifacts registered.
+ */ import { generateTypescriptContractInterface } from '@aztec/builder/codegen';
+import { FunctionType, getAllFunctionAbis, loadContractArtifact } from '@aztec/stdlib/abi';
+import { promises as fs } from 'fs';
+import path from 'path';
+const log = console.log;
+const noirContractsRoot = path.join(import.meta.dirname, '../../../../noir-projects/noir-contracts');
+const srcPath = path.join(noirContractsRoot, 'target');
+const outputDir = path.join(import.meta.dirname, '../contract/protocol_contracts');
+function toKebabCase(str) {
+    return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+}
+function functionTypeToEnum(type) {
+    switch(type){
+        case FunctionType.PRIVATE:
+            return 'FunctionType.PRIVATE';
+        case FunctionType.PUBLIC:
+            return 'FunctionType.PUBLIC';
+        case FunctionType.UTILITY:
+            return 'FunctionType.UTILITY';
+    }
+}
+function generateFunctionAbiJson(abi) {
+    const baseObj = {
+        name: abi.name,
+        isOnlySelf: abi.isOnlySelf,
+        isStatic: abi.isStatic,
+        isInitializer: abi.isInitializer,
+        parameters: abi.parameters,
+        returnTypes: abi.returnTypes,
+        errorTypes: abi.errorTypes
+    };
+    const jsonStr = JSON.stringify(baseObj);
+    return jsonStr.replace('{', `{ functionType: ${functionTypeToEnum(abi.functionType)},`);
+}
+function generateProtocolContractArtifact(input) {
+    const allAbis = getAllFunctionAbis(input);
+    const functionAbis = input.functions.map((f)=>allAbis.find((abi)=>abi.name === f.name));
+    const nonDispatchAbis = input.nonDispatchPublicFunctions;
+    const functionsArray = functionAbis.map((abi)=>`{ ...${generateFunctionAbiJson(abi)}, bytecode: Buffer.from([]), debugSymbols: '' }`).join(',\n    ');
+    const nonDispatchArray = nonDispatchAbis.map((abi)=>generateFunctionAbiJson(abi)).join(',\n    ');
+    return `{
+  name: '${input.name}',
+  functions: [
+    ${functionsArray}
+  ],
+  nonDispatchPublicFunctions: [
+    ${nonDispatchArray}
+  ],
+  outputs: { structs: {}, globals: {} },
+  storageLayout: {},
+  fileMap: {},
+}`;
+}
+async function generateProtocolContractInterface(input, protocolContractName) {
+    const baseInterface = await generateTypescriptContractInterface(input);
+    // Match everything between "public declare methods: {" and the closing "};"
+    const methodsMatch = baseInterface.match(/public declare methods: \{([\s\S]*?)\n  \};/);
+    if (!methodsMatch) {
+        throw new Error('Could not extract methods from generated interface');
+    }
+    const artifactCode = generateProtocolContractArtifact(input);
+    const contractName = `${input.name}Contract`;
+    return `
+/* Autogenerated file, do not edit! */
+
+/* eslint-disable */
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { FunctionType } from '@aztec/stdlib/abi';
+
+import type { ContractArtifact } from '../../api/abi.js';
+import { PublicKeys } from '../../api/keys.js';
+import type { AztecAddressLike, EthAddressLike, FieldLike, FunctionSelectorLike, WrappedFieldLike } from '../../utils/abi_types.js';
+import { ContractBase, type ContractMethod } from '../contract_base.js';
+import { ContractFunctionInteraction } from '../contract_function_interaction.js';
+import type { Wallet } from '../../wallet/wallet.js';
+
+const ${contractName}Artifact: ContractArtifact = ${artifactCode};
+
+export class ${contractName} extends ContractBase {
+  private constructor(wallet: Wallet) {
+    super(ProtocolContractAddress.${protocolContractName}, ${contractName}Artifact, wallet);
+  }
+
+  public static at(wallet: Wallet): ${contractName} {
+    return new ${contractName}(wallet);
+  }
+
+  public declare methods: {${methodsMatch[1]}
+  };
+}
+`;
+}
+async function main() {
+    await fs.rm(outputDir, {
+        recursive: true,
+        force: true
+    });
+    await fs.mkdir(outputDir, {
+        recursive: true
+    });
+    const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
+    for (const srcName of srcNames){
+        // srcName is like "auth_registry_contract-AuthRegistry", split to get the contract name
+        const name = srcName.split('-')[1];
+        const artifactPath = path.join(srcPath, `${srcName}.json`);
+        const json = JSON.parse(await fs.readFile(artifactPath, 'utf8'));
+        const contractArtifact = loadContractArtifact(json);
+        const content = await generateProtocolContractInterface(contractArtifact, name);
+        const fileName = `${toKebabCase(name)}.ts`;
+        await fs.writeFile(path.join(outputDir, fileName), content);
+        log(`Generated ${fileName}`);
+    }
+}
+main().catch((err)=>{
+    console.error('Error generating protocol contract types:', err);
+    process.exit(1);
+});

package/dest/utils/abi_types.d.ts

@@ -1,5 +1,5 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
 import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 /** Any type that can be converted into a field for a contract call. */
@@ -24,4 +24,4 @@ export type U128Like = bigint | number;
 export type WrappedFieldLike = {
     inner: FieldLike;
 } | FieldLike;
-//# sourceMappingURL=abi_types.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJpX3R5cGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvYWJpX3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLHVFQUF1RTtBQUN2RSxNQUFNLE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxNQUFNLEdBQUcsTUFBTSxHQUFHLE1BQU0sR0FBRztJQUEyQixPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBRXZHLHlFQUF5RTtBQUN6RSxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQXlCLE9BQU8sRUFBRSxTQUFTLENBQUE7Q0FBRSxHQUFHLFVBQVUsQ0FBQztBQUV4RiwyRUFBMkU7QUFDM0UsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQXlCLE9BQU8sRUFBRSxTQUFTLENBQUE7Q0FBRSxHQUFHLFlBQVksQ0FBQztBQUU1Riw4RUFBOEU7QUFDOUUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQztBQUVoRSw0RUFBNEU7QUFDNUUsTUFBTSxNQUFNLGlCQUFpQixHQUFHLFNBQVMsR0FBRyxhQUFhLENBQUM7QUFFMUQsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxRQUFRLEdBQUcsTUFBTSxHQUFHLE1BQU0sQ0FBQztBQUV2QyxnRkFBZ0Y7QUFDaEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQXVCLEtBQUssRUFBRSxTQUFTLENBQUE7Q0FBRSxHQUFHLFNBQVMsQ0FBQyJ9

package/dest/utils/abi_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abi_types.d.ts","sourceRoot":"","sources":["../../src/utils/abi_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,uEAAuE;AACvE,MAAM,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG;IAA2B,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvG,yEAAyE;AACzE,MAAM,MAAM,cAAc,GAAG;IAAyB,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,UAAU,CAAC;AAExF,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG;IAAyB,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,YAAY,CAAC;AAE5F,8EAA8E;AAC9E,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAEhE,4EAA4E;AAC5E,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC;AAE1D,kDAAkD;AAClD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GAAG;IAAuB,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,SAAS,CAAC"}
+{"version":3,"file":"abi_types.d.ts","sourceRoot":"","sources":["../../src/utils/abi_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,uEAAuE;AACvE,MAAM,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG;IAA2B,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvG,yEAAyE;AACzE,MAAM,MAAM,cAAc,GAAG;IAAyB,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,UAAU,CAAC;AAExF,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG;IAAyB,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,YAAY,CAAC;AAE5F,8EAA8E;AAC9E,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAEhE,4EAA4E;AAC5E,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC;AAE1D,kDAAkD;AAClD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GAAG;IAAuB,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,SAAS,CAAC"}

package/dest/utils/authwit.d.ts

@@ -1,19 +1,18 @@
 import type { ChainInfo } from '@aztec/entrypoints/interfaces';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type FunctionCall } from '@aztec/stdlib/abi';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { TxProfileResult } from '@aztec/stdlib/tx';
+import type { TxProfileResult, TxReceipt } from '@aztec/stdlib/tx';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import type { ProfileInteractionOptions, SendInteractionOptions, SimulateInteractionOptions, SimulationReturn } from '../contract/interaction_options.js';
-import type { SentTx } from '../contract/sent_tx.js';
+import type { InteractionWaitOptions, ProfileInteractionOptions, SendInteractionOptions, SendInteractionOptionsWithoutWait, SendReturn, SimulateInteractionOptions, SimulationReturn } from '../contract/interaction_options.js';
 import type { Wallet } from '../wallet/index.js';
 /** Intent with an inner hash */
 export type IntentInnerHash = {
     /** The consumer   */
     consumer: AztecAddress;
     /** The action to approve */
-    innerHash: Buffer<ArrayBuffer> | Fr;
+    innerHash: Fr;
 };
 /** Intent with a call */
 export type CallIntent = {
@@ -29,6 +28,8 @@ export type ContractFunctionInteractionCallIntent = {
     /** The action to approve */
     action: ContractFunctionInteraction;
 };
+/** Identifies ContractFunctionInteractionCallIntents */
+export declare function isContractFunctionInteractionCallIntent(messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent): messageHashOrIntent is ContractFunctionInteractionCallIntent;
 /**
  * Compute an authentication witness message hash from an intent and metadata
  *
@@ -50,7 +51,7 @@ export type ContractFunctionInteractionCallIntent = {
  * @param metadata - The metadata for the intent (chainId, version)
  * @returns The message hash for the action
  */
-export declare const computeAuthWitMessageHash: (intent: IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, metadata: ChainInfo) => Promise<Fr>;
+export declare const computeAuthWitMessageHash: (intent: CallIntent | ContractFunctionInteractionCallIntent | IntentInnerHash, metadata: ChainInfo) => Promise<Fr>;
 /**
  * Compute an authentication witness message hash from an intent and metadata. This is just
  * a wrapper around computeAuthwitMessageHash that allows receiving an already computed messageHash as input
@@ -58,7 +59,7 @@ export declare const computeAuthWitMessageHash: (intent: IntentInnerHash | CallI
  * @param metadata - The metadata for the intent (chainId, version)
  * @returns The message hash for the intent
  */
-export declare function getMessageHashFromIntent(messageHashOrIntent: Fr | Buffer | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, chainInfo: ChainInfo): Promise<Fr>;
+export declare function getMessageHashFromIntent(messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, chainInfo: ChainInfo): Promise<Fr>;
 /**
  * Computes the inner authwitness hash for either a function call or an action, for it to later be combined with the metadata
  * required for the outer hash and eventually the full AuthWitness.
@@ -66,7 +67,7 @@ export declare function getMessageHashFromIntent(messageHashOrIntent: Fr | Buffe
  * @param action - The action to compute the inner hash from
  * @returns The inner hash for the action
  **/
-export declare const computeInnerAuthWitHashFromAction: (caller: AztecAddress, action: FunctionCall | ContractFunctionInteraction) => Promise<Fr>;
+export declare const computeInnerAuthWitHashFromAction: (caller: AztecAddress, action: ContractFunctionInteraction | FunctionCall) => Promise<Fr>;
 /**
  * Lookup the validity of an authwit in private and public contexts.
  *
@@ -90,7 +91,7 @@ export declare function lookupValidity(wallet: Wallet, onBehalfOf: AztecAddress,
 export declare class SetPublicAuthwitContractInteraction extends ContractFunctionInteraction {
     private from;
     private constructor();
-    static create(wallet: Wallet, from: AztecAddress, messageHashOrIntent: Fr | Buffer | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, authorized: boolean): Promise<SetPublicAuthwitContractInteraction>;
+    static create(wallet: Wallet, from: AztecAddress, messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, authorized: boolean): Promise<SetPublicAuthwitContractInteraction>;
     /**
      * Overrides the simulate method, adding the sender of the authwit (authorizer) as from
      * and preventing misuse
@@ -109,9 +110,10 @@ export declare class SetPublicAuthwitContractInteraction extends ContractFunctio
      * Overrides the send method, adding the sender of the authwit (authorizer) as from
      * and preventing misuse
      * @param options - An optional object containing 'fee' options information
-     * @returns A SentTx instance for tracking the transaction status and information.
+     * @returns A TxReceipt (if wait is true/undefined) or TxHash (if wait is false)
      */
-    send(options?: Omit<SendInteractionOptions, 'from'>): SentTx;
+    send(options?: Omit<SendInteractionOptionsWithoutWait, 'from'>): Promise<TxReceipt>;
+    send<W extends InteractionWaitOptions>(options?: Omit<SendInteractionOptions<W>, 'from'>): Promise<SendReturn<W>>;
     private static getSetAuthorizedAbi;
 }
-//# sourceMappingURL=authwit.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aHdpdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2F1dGh3aXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDL0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBaUQsS0FBSyxZQUFZLEVBQWdCLE1BQU0sbUJBQW1CLENBQUM7QUFDbkgsT0FBTyxFQUFFLFdBQVcsRUFBb0QsTUFBTSw0QkFBNEIsQ0FBQztBQUMzRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBVSxlQUFlLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFM0UsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sOENBQThDLENBQUM7QUFDM0YsT0FBTyxLQUFLLEVBQ1Ysc0JBQXNCLEVBQ3RCLHlCQUF5QixFQUN6QixzQkFBc0IsRUFDdEIsaUNBQWlDLEVBQ2pDLFVBQVUsRUFDViwwQkFBMEIsRUFDMUIsZ0JBQWdCLEVBQ2pCLE1BQU0sb0NBQW9DLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFakQsZ0NBQWdDO0FBQ2hDLE1BQU0sTUFBTSxlQUFlLEdBQUc7SUFDNUIscUJBQXFCO0lBQ3JCLFFBQVEsRUFBRSxZQUFZLENBQUM7SUFDdkIsNEJBQTRCO0lBQzVCLFNBQVMsRUFBRSxFQUFFLENBQUM7Q0FDZixDQUFDO0FBRUYseUJBQXlCO0FBQ3pCLE1BQU0sTUFBTSxVQUFVLEdBQUc7SUFDdkIsNkJBQTZCO0lBQzdCLE1BQU0sRUFBRSxZQUFZLENBQUM7SUFDckIsMEJBQTBCO0lBQzFCLElBQUksRUFBRSxZQUFZLENBQUM7Q0FDcEIsQ0FBQztBQUVGLGdEQUFnRDtBQUNoRCxNQUFNLE1BQU0scUNBQXFDLEdBQUc7SUFDbEQsNkJBQTZCO0lBQzdCLE1BQU0sRUFBRSxZQUFZLENBQUM7SUFDckIsNEJBQTRCO0lBQzVCLE1BQU0sRUFBRSwyQkFBMkIsQ0FBQztDQUNyQyxDQUFDO0FBRUYsd0RBQXdEO0FBQ3hELHdCQUFnQix1Q0FBdUMsQ0FDckQsbUJBQW1CLEVBQUUsRUFBRSxHQUFHLGVBQWUsR0FBRyxVQUFVLEdBQUcscUNBQXFDLEdBQzdGLG1CQUFtQixJQUFJLHFDQUFxQyxDQU05RDtBQUVEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQW9CRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsb0hBbUJyQyxDQUFDO0FBRUY7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLHdCQUF3QixDQUM1QyxtQkFBbUIsRUFBRSxFQUFFLEdBQUcsZUFBZSxHQUFHLFVBQVUsR0FBRyxxQ0FBcUMsRUFDOUYsU0FBUyxFQUFFLFNBQVMsZUFVckI7QUFFRDs7Ozs7O0lBTUk7QUFDSixlQUFPLE1BQU0saUNBQWlDLDJGQU03QyxDQUFDO0FBRUY7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsVUFBVSxFQUFFLFlBQVksRUFDeEIsTUFBTSxFQUFFLGVBQWUsR0FBRyxVQUFVLEdBQUcscUNBQXFDLEVBQzVFLE9BQU8sRUFBRSxXQUFXLEdBQ25CLE9BQU8sQ0FBQztJQUNULHlFQUF5RTtJQUN6RSxnQkFBZ0IsRUFBRSxPQUFPLENBQUM7SUFDMUIsd0VBQXdFO0lBQ3hFLGVBQWUsRUFBRSxPQUFPLENBQUM7Q0FDMUIsQ0FBQyxDQTBFRDtBQUVEOztHQUVHO0FBQ0gscUJBQWEsbUNBQW9DLFNBQVEsMkJBQTJCO0lBR2hGLE9BQU8sQ0FBQyxJQUFJO0lBRmQsT0FBTyxlQVVOO0lBRUQsT0FBYSxNQUFNLENBQ2pCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLFlBQVksRUFDbEIsbUJBQW1CLEVBQUUsRUFBRSxHQUFHLGVBQWUsR0FBRyxVQUFVLEdBQUcscUNBQXFDLEVBQzlGLFVBQVUsRUFBRSxPQUFPLGdEQUtwQjtJQUVEOzs7OztPQUtHO0lBQ2EsUUFBUSxDQUFDLENBQUMsU0FBUywwQkFBMEIsRUFDM0QsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLEdBQ3ZCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFRbkQ7Ozs7O09BS0c7SUFDYSxPQUFPLENBQ3JCLE9BQU8sR0FBRSxJQUFJLENBQUMseUJBQXlCLEVBQUUsTUFBTSxDQUE0QixHQUMxRSxPQUFPLENBQUMsZUFBZSxDQUFDLENBRTFCO0lBRUQ7Ozs7O09BS0c7SUFFYSxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsSUFBSSxDQUFDLGlDQUFpQyxFQUFFLE1BQU0sQ0FBQyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUdwRixJQUFJLENBQUMsQ0FBQyxTQUFTLHNCQUFzQixFQUNuRCxPQUFPLENBQUMsRUFBRSxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLEdBQ2hELE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQVExQixPQUFPLENBQUMsTUFBTSxDQUFDLG1CQUFtQjtDQXVCbkMifQ==

package/dest/utils/authwit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":"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"}

package/dest/utils/authwit.js

@@ -1,10 +1,10 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { FunctionType } from '@aztec/stdlib/abi';
 import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/stdlib/auth-witness';
 import { computeVarArgsHash } from '@aztec/stdlib/hash';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-/** Identifies ContractFunctionInteractionCallIntents */ function isContractFunctionIntractionCallIntent(messageHashOrIntent) {
+/** Identifies ContractFunctionInteractionCallIntents */ export function isContractFunctionInteractionCallIntent(messageHashOrIntent) {
     return 'caller' in messageHashOrIntent && 'action' in messageHashOrIntent && messageHashOrIntent.action instanceof ContractFunctionInteraction;
 }
 /**
@@ -31,7 +31,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
     const chainId = metadata.chainId;
     const version = metadata.version;
     if ('caller' in intent) {
-        const call = isContractFunctionIntractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
+        const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
         return computeOuterAuthWitHash(call.to, chainId, version, await computeInnerAuthWitHashFromAction(intent.caller, call));
     } else {
         const inner = Buffer.isBuffer(intent.innerHash) ? Fr.fromBuffer(intent.innerHash) : intent.innerHash;
@@ -47,9 +47,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
  */ export async function getMessageHashFromIntent(messageHashOrIntent, chainInfo) {
     let messageHash;
     const { chainId, version } = chainInfo;
-    if (Buffer.isBuffer(messageHashOrIntent)) {
-        messageHash = Fr.fromBuffer(messageHashOrIntent);
-    } else if (messageHashOrIntent instanceof Fr) {
+    if (messageHashOrIntent instanceof Fr) {
         messageHash = messageHashOrIntent;
     } else {
         messageHash = await computeAuthWitMessageHash(messageHashOrIntent, {
@@ -86,12 +84,9 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
  */ export async function lookupValidity(wallet, onBehalfOf, intent, witness) {
     let innerHash, consumer;
     if ('caller' in intent) {
-        const call = isContractFunctionIntractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
+        const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
         innerHash = await computeInnerAuthWitHashFromAction(intent.caller, call);
         consumer = call.to;
-    } else if (Buffer.isBuffer(intent.innerHash)) {
-        innerHash = Fr.fromBuffer(intent.innerHash);
-        consumer = intent.consumer;
     } else {
         ({ innerHash, consumer } = intent);
     }
@@ -106,11 +101,27 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
         name: 'lookup_validity',
         isInitializer: false,
         functionType: FunctionType.UTILITY,
-        isInternal: false,
+        isOnlySelf: false,
         isStatic: false,
         parameters: [
             {
-                name: 'message_hash',
+                name: 'consumer',
+                type: {
+                    fields: [
+                        {
+                            name: 'inner',
+                            type: {
+                                kind: 'field'
+                            }
+                        }
+                    ],
+                    kind: 'struct',
+                    path: 'aztec::protocol_types::address::aztec_address::AztecAddress'
+                },
+                visibility: 'private'
+            },
+            {
+                name: 'inner_hash',
                 type: {
                     kind: 'field'
                 },
@@ -142,7 +153,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
         name: 'utility_is_consumable',
         isInitializer: false,
         functionType: FunctionType.UTILITY,
-        isInternal: false,
+        isOnlySelf: false,
         isStatic: false,
         parameters: [
             {
@@ -219,12 +230,8 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
             from: this.from
         });
     }
-    /**
-   * Overrides the send method, adding the sender of the authwit (authorizer) as from
-   * and preventing misuse
-   * @param options - An optional object containing 'fee' options information
-   * @returns A SentTx instance for tracking the transaction status and information.
-   */ send(options = {}) {
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    send(options) {
         return super.send({
             ...options,
             from: this.from
@@ -235,7 +242,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
             name: 'set_authorized',
             isInitializer: false,
             functionType: FunctionType.PUBLIC,
-            isInternal: true,
+            isOnlySelf: true,
             isStatic: false,
             parameters: [
                 {

package/dest/utils/cross_chain.d.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 /**
  * Waits for the L1 to L2 message to be ready to be consumed.
@@ -21,4 +21,4 @@ export declare function isL1ToL2MessageReady(node: Pick<AztecNode, 'getBlockNumb
     /** True if the message is meant to be consumed from a public function */ forPublicConsumption: boolean;
     /** Cached synced block number for the message (will be fetched from PXE otherwise) */ messageBlockNumber?: number;
 }): Promise<boolean>;
-//# sourceMappingURL=cross_chain.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW4uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jcm9zc19jaGFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHdCQUFzQix5QkFBeUIsQ0FDN0MsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsRUFDakUsaUJBQWlCLEVBQUUsRUFBRSxFQUNyQixJQUFJLEVBQUU7SUFDSiwyQ0FBMkMsQ0FBQyxjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ25FLHlFQUF5RSxDQUFDLG9CQUFvQixFQUFFLE9BQU8sQ0FBQztDQUN6RyxvQkFTRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFzQixvQkFBb0IsQ0FDeEMsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsRUFDakUsaUJBQWlCLEVBQUUsRUFBRSxFQUNyQixJQUFJLEVBQUU7SUFDSix5RUFBeUUsQ0FBQyxvQkFBb0IsRUFBRSxPQUFPLENBQUM7SUFDeEcsc0ZBQXNGLENBQUMsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDcEgsR0FDQSxPQUFPLENBQUMsT0FBTyxDQUFDLENBV2xCIn0=

package/dest/utils/cross_chain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross_chain.d.ts","sourceRoot":"","sources":["../../src/utils/cross_chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,EACjE,iBAAiB,EAAE,EAAE,EACrB,IAAI,EAAE;IACJ,2CAA2C,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,yEAAyE,CAAC,oBAAoB,EAAE,OAAO,CAAC;CACzG,oBASF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,EACjE,iBAAiB,EAAE,EAAE,EACrB,IAAI,EAAE;IACJ,yEAAyE,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACxG,sFAAsF,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACpH,GACA,OAAO,CAAC,OAAO,CAAC,CAWlB"}
+{"version":3,"file":"cross_chain.d.ts","sourceRoot":"","sources":["../../src/utils/cross_chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,EACjE,iBAAiB,EAAE,EAAE,EACrB,IAAI,EAAE;IACJ,2CAA2C,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,yEAAyE,CAAC,oBAAoB,EAAE,OAAO,CAAC;CACzG,oBASF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,EACjE,iBAAiB,EAAE,EAAE,EACrB,IAAI,EAAE;IACJ,yEAAyE,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACxG,sFAAsF,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACpH,GACA,OAAO,CAAC,OAAO,CAAC,CAWlB"}

package/dest/utils/fee_juice.d.ts

@@ -2,7 +2,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 /**
  * Returns the owner's fee juice balance.
- * Note: This is used only e2e_sandbox_example test. TODO: Consider nuking.
+ * Note: This is used only e2e_local_network_example test. TODO: Consider nuking.
  */
 export declare function getFeeJuiceBalance(owner: AztecAddress, node: AztecNode): Promise<bigint>;
-//# sourceMappingURL=fee_juice.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZmVlX2p1aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWpFOzs7R0FHRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUc5RiJ9

package/dest/utils/fee_juice.js

@@ -1,9 +1,9 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { deriveStorageSlotInMap } from '@aztec/stdlib/hash';
 /**
  * Returns the owner's fee juice balance.
- * Note: This is used only e2e_sandbox_example test. TODO: Consider nuking.
+ * Note: This is used only e2e_local_network_example test. TODO: Consider nuking.
  */ export async function getFeeJuiceBalance(owner, node) {
     const slot = await deriveStorageSlotInMap(new Fr(1), owner);
     return (await node.getPublicStorageAt('latest', ProtocolContractAddress.FeeJuice, slot)).toBigInt();

package/dest/utils/field_compressed_string.d.ts

@@ -14,4 +14,4 @@ interface NoirFieldCompressedString {
  */
 export declare const readFieldCompressedString: (field: NoirFieldCompressedString) => string;
 export {};
-//# sourceMappingURL=field_compressed_string.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmllbGRfY29tcHJlc3NlZF9zdHJpbmcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9maWVsZF9jb21wcmVzc2VkX3N0cmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQTs7R0FFRztBQUNILFVBQVUseUJBQXlCO0lBQ2pDOztPQUVHO0lBQ0gsS0FBSyxFQUFFLE1BQU0sQ0FBQztDQUNmO0FBQ0Q7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsOENBVXJDLENBQUMifQ==

package/dest/utils/field_compressed_string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field_compressed_string.d.ts","sourceRoot":"","sources":["../../src/utils/field_compressed_string.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,UAAU,yBAAyB;IACjC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AACD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,OAAO,yBAAyB,KAAG,MAU5E,CAAC"}
+{"version":3,"file":"field_compressed_string.d.ts","sourceRoot":"","sources":["../../src/utils/field_compressed_string.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,UAAU,yBAAyB;IACjC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AACD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,8CAUrC,CAAC"}

package/dest/utils/field_compressed_string.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 /**
  * This turns
  * @param field - The field that contains the string

package/dest/utils/node.d.ts

@@ -1,5 +1,16 @@
 import type { Logger } from '@aztec/foundation/log';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
-export declare const waitForNode: (node: AztecNode, logger?: Logger) => Promise<void>;
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import { type WaitOpts } from '../contract/wait_opts.js';
+export declare const waitForNode: (node: AztecNode, logger?: Logger | undefined) => Promise<void>;
+/**
+ * Waits for a transaction to be mined and returns its receipt.
+ * @param node - The Aztec node to query for transaction status
+ * @param txHash - The hash of the transaction to wait for
+ * @param opts - Optional configuration for waiting behavior
+ * @returns The transaction receipt
+ * @throws If the transaction fails and dontThrowOnRevert is not set
+ */
+export declare function waitForTx(node: AztecNode, txHash: TxHash, opts?: WaitOpts): Promise<TxReceipt>;
 export { createAztecNodeClient, type AztecNode } from '@aztec/stdlib/interfaces/client';
-//# sourceMappingURL=node.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRzFELE9BQU8sRUFBbUIsS0FBSyxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUxRSxlQUFPLE1BQU0sV0FBVyxpRUFZdkIsQ0FBQztBQU9GOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsU0FBUyxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRSxRQUFRLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQTJDcEc7QUFFRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQyJ9

package/dest/utils/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/utils/node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,eAAO,MAAM,WAAW,GAAU,MAAM,SAAS,EAAE,SAAS,MAAM,kBAYjE,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,KAAK,SAAS,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/utils/node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG1D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE1E,eAAO,MAAM,WAAW,iEAYvB,CAAC;AAOF;;;;;;;GAOG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CA2CpG;AAED,OAAO,EAAE,qBAAqB,EAAE,KAAK,SAAS,EAAE,MAAM,iCAAiC,CAAC"}

package/dest/utils/node.js

@@ -1,4 +1,6 @@
 import { retryUntil } from '@aztec/foundation/retry';
+import { SortedTxStatuses, TxStatus } from '@aztec/stdlib/tx';
+import { DefaultWaitOpts } from '../contract/wait_opts.js';
 export const waitForNode = async (node, logger)=>{
     await retryUntil(async ()=>{
         try {
@@ -12,4 +14,48 @@ export const waitForNode = async (node, logger)=>{
         return undefined;
     }, 'RPC Get Node Info');
 };
+/** Returns true if the receipt status is at least the desired status level. */ function hasReachedStatus(receipt, desiredStatus) {
+    return SortedTxStatuses.indexOf(receipt.status) >= SortedTxStatuses.indexOf(desiredStatus);
+}
+/**
+ * Waits for a transaction to be mined and returns its receipt.
+ * @param node - The Aztec node to query for transaction status
+ * @param txHash - The hash of the transaction to wait for
+ * @param opts - Optional configuration for waiting behavior
+ * @returns The transaction receipt
+ * @throws If the transaction fails and dontThrowOnRevert is not set
+ */ export async function waitForTx(node, txHash, opts) {
+    const startTime = Date.now();
+    const ignoreDroppedReceiptsFor = opts?.ignoreDroppedReceiptsFor ?? DefaultWaitOpts.ignoreDroppedReceiptsFor;
+    const waitForStatus = opts?.waitForStatus ?? TxStatus.CHECKPOINTED;
+    const receipt = await retryUntil(async ()=>{
+        const txReceipt = await node.getTxReceipt(txHash);
+        // If receipt is not yet available, try again
+        if (txReceipt.isPending()) {
+            return undefined;
+        }
+        // If the tx was "dropped", either return it or ignore based on timing.
+        // We can ignore it at first because the transaction may have been sent to node 1, and now we're asking node 2 for the receipt.
+        // If we don't allow a short grace period, we could incorrectly return a TxReceipt with status DROPPED.
+        if (txReceipt.isDropped()) {
+            const elapsedSeconds = (Date.now() - startTime) / 1000;
+            if (!ignoreDroppedReceiptsFor || elapsedSeconds > ignoreDroppedReceiptsFor) {
+                return txReceipt;
+            }
+            return undefined;
+        }
+        // Check if the receipt has reached the desired status level
+        if (!hasReachedStatus(txReceipt, waitForStatus)) {
+            return undefined;
+        }
+        return txReceipt;
+    }, 'isMined', opts?.timeout ?? DefaultWaitOpts.timeout, opts?.interval ?? DefaultWaitOpts.interval);
+    if (!receipt.isMined()) {
+        throw new Error(`Transaction ${txHash.toString()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`);
+    }
+    if (!receipt.hasExecutionSucceeded() && !opts?.dontThrowOnRevert) {
+        throw new Error(`Transaction ${txHash.toString()} reverted: ${receipt.executionResult}. Reason: ${receipt.error ?? 'unknown'}`);
+    }
+    return receipt;
+}
 export { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';

package/dest/utils/pub_key.d.ts

@@ -1,4 +1,4 @@
-import type { GrumpkinScalar } from '@aztec/foundation/fields';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { PublicKey } from '@aztec/stdlib/keys';
 /**
  * Method for generating a public grumpkin key from a private key.
@@ -6,4 +6,4 @@ import type { PublicKey } from '@aztec/stdlib/keys';
  * @returns The generated public key.
  */
 export declare function generatePublicKey(privateKey: GrumpkinScalar): Promise<PublicKey>;
-//# sourceMappingURL=pub_key.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3B1Yl9rZXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQ7Ozs7R0FJRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxVQUFVLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FFaEYifQ==

package/dest/utils/pub_key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF"}
+{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF"}

package/dest/utils/pub_key.js

@@ -1,4 +1,4 @@
-import { Grumpkin } from '@aztec/foundation/crypto';
+import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
 /**
  * Method for generating a public grumpkin key from a private key.
  * @param privateKey - The private key.

package/dest/wallet/account_entrypoint_meta_payment_method.d.ts

@@ -1,9 +1,8 @@
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { Account } from '../account/account.js';
 import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
-import type { Wallet } from './index.js';
 /**
  * Fee payment method that allows an account contract to pay for its own deployment
  * It works by rerouting the provided fee payment method through the account's entrypoint,
@@ -20,15 +19,13 @@ import type { Wallet } from './index.js';
  * This class can be seen in action in DeployAccountMethod.ts#getSelfPaymentMethod
  */
 export declare class AccountEntrypointMetaPaymentMethod implements FeePaymentMethod {
-    private wallet;
-    private artifact;
-    private feePaymentNameOrArtifact;
-    private accountAddress;
+    private account;
     private paymentMethod?;
-    constructor(wallet: Wallet, artifact: ContractArtifact, feePaymentNameOrArtifact: string | FunctionArtifact, accountAddress: AztecAddress, paymentMethod?: FeePaymentMethod | undefined);
+    private feeEntrypointOptions?;
+    constructor(account: Account, paymentMethod?: FeePaymentMethod | undefined, feeEntrypointOptions?: any);
     getAsset(): Promise<AztecAddress>;
     getExecutionPayload(): Promise<ExecutionPayload>;
     getFeePayer(): Promise<AztecAddress>;
     getGasSettings(): GasSettings | undefined;
 }
-//# sourceMappingURL=account_entrypoint_meta_payment_method.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YWxsZXQvYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFckU7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxxQkFBYSxrQ0FBbUMsWUFBVyxnQkFBZ0I7SUFFdkUsT0FBTyxDQUFDLE9BQU87SUFDZixPQUFPLENBQUMsYUFBYSxDQUFDO0lBQ3RCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQztJQUgvQixZQUNVLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLGFBQWEsQ0FBQyw4QkFBa0IsRUFDaEMsb0JBQW9CLENBQUMsS0FBSyxFQUNoQztJQUVKLFFBQVEsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRWhDO0lBRUssbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBNkJyRDtJQUVELFdBQVcsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRW5DO0lBRUQsY0FBYyxJQUFJLFdBQVcsR0FBRyxTQUFTLENBRXhDO0NBQ0YifQ==

package/dest/wallet/account_entrypoint_meta_payment_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/wallet/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAKtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;;;;;;;;;;;;;GAcG;AACH,qBAAa,kCAAmC,YAAW,gBAAgB;IAEvE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa,CAAC;gBAJd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,wBAAwB,EAAE,MAAM,GAAG,gBAAgB,EACnD,cAAc,EAAE,YAAY,EAC5B,aAAa,CAAC,EAAE,gBAAgB,YAAA;IAG1C,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAI3B,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAmDtD,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC,cAAc,IAAI,WAAW,GAAG,SAAS;CAG1C"}
+{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/wallet/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;;;;;;;;;;;;;GAcG;AACH,qBAAa,kCAAmC,YAAW,gBAAgB;IAEvE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,oBAAoB,CAAC;IAH/B,YACU,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,8BAAkB,EAChC,oBAAoB,CAAC,KAAK,EAChC;IAEJ,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAEhC;IAEK,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA6BrD;IAED,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAEnC;IAED,cAAc,IAAI,WAAW,GAAG,SAAS,CAExC;CACF"}