@aztec/stdlib 0.0.1-commit.c31f2472 → 0.0.1-commit.c52d6e7

package/dest/abi/decoder.js

@@ -1,18 +1,18 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { AztecAddress } from '../aztec-address/index.js';
-import { isAztecAddressStruct, parseSignedInt } from './utils.js';
+import { FunctionSelector } from './function_selector.js';
+import { isAztecAddressStruct, isEthAddressStruct, isFunctionSelectorStruct, isOptionStruct, isWrappedFieldStruct, parseSignedInt } from './utils.js';
 /**
  * Decodes values using a provided ABI.
  */ class AbiDecoder {
-    types;
     flattened;
-    constructor(types, flattened){
-        this.types = types;
+    constructor(flattened){
         this.flattened = flattened;
     }
     /**
-   * Decodes a single return value from field to the given type.
-   * @param abiType - The type of the return value.
-   * @returns The decoded return value.
+   * Decodes a single value from field to the given type.
+   * @param abiType - The type of the value.
+   * @returns The decoded value.
    */ decodeNext(abiType) {
         switch(abiType.kind){
             case 'field':
@@ -42,6 +42,20 @@ import { isAztecAddressStruct, parseSignedInt } from './utils.js';
                     if (isAztecAddressStruct(abiType)) {
                         return new AztecAddress(this.getNextField().toBuffer());
                     }
+                    if (isEthAddressStruct(abiType)) {
+                        return EthAddress.fromField(this.getNextField());
+                    }
+                    if (isFunctionSelectorStruct(abiType)) {
+                        return FunctionSelector.fromField(this.getNextField());
+                    }
+                    if (isWrappedFieldStruct(abiType)) {
+                        return this.getNextField();
+                    }
+                    if (isOptionStruct(abiType)) {
+                        const isSome = this.decodeNext(abiType.fields[0].type);
+                        const value = this.decodeNext(abiType.fields[1].type);
+                        return isSome ? value : undefined;
+                    }
                     for (const field of abiType.fields){
                         struct[field.name] = this.decodeNext(field.type);
                     }
@@ -78,91 +92,21 @@ import { isAztecAddressStruct, parseSignedInt } from './utils.js';
         }
         return field;
     }
-    /**
-   * Decodes all the values for the given ABI.
-   * The decided value can be simple types, structs or arrays
-   * @returns The decoded return values.
-   */ decode() {
-        if (this.types.length === 1) {
-            return this.decodeNext(this.types[0]);
-        }
-        return this.types.map((type)=>this.decodeNext(type));
-    }
 }
 /**
- * Decodes values in a flattened Field array using a provided ABI.
- * @param abi - The ABI to use as reference.
+ * Decodes the single value a function returns, or undefined if it returns nothing. Multiple return values are expressed
+ * as one `tuple` type, so they decode through here too.
+ * @param type - The type the function returns.
  * @param buffer - The flattened Field array to decode.
- * @returns
- */ export function decodeFromAbi(typ, buffer) {
-    return new AbiDecoder(typ, buffer.slice()).decode();
-}
-/**
- * Decodes the signature of a function from the name and parameters.
- */ export class FunctionSignatureDecoder {
-    name;
-    parameters;
-    includeNames;
-    separator;
-    constructor(name, parameters, includeNames = false){
-        this.name = name;
-        this.parameters = parameters;
-        this.includeNames = includeNames;
-        this.separator = includeNames ? ', ' : ',';
-    }
-    /**
-   * Decodes a single function parameter type for the function signature.
-   * @param param - The parameter type to decode.
-   * @returns A string representing the parameter type.
-   */ getParameterType(param) {
-        switch(param.kind){
-            case 'field':
-                return 'Field';
-            case 'integer':
-                if (param.sign === 'signed') {
-                    throw new Error('Unsupported type: signed integer');
-                }
-                return `u${param.width}`;
-            case 'boolean':
-                return 'bool';
-            case 'array':
-                return `[${this.getParameterType(param.type)};${param.length}]`;
-            case 'string':
-                return `str<${param.length}>`;
-            case 'struct':
-                return `(${param.fields.map((field)=>`${this.decodeParameter(field)}`).join(this.separator)})`;
-            default:
-                throw new Error(`Unsupported type: ${param.kind}`);
-        }
-    }
-    /**
-   * Decodes a single function parameter for the function signature.
-   * @param param - The parameter to decode.
-   * @returns A string representing the parameter type and optionally its name.
-   */ decodeParameter(param) {
-        const type = this.getParameterType(param.type);
-        return this.includeNames ? `${param.name}: ${type}` : type;
-    }
-    /**
-   * Decodes all the parameters and build the function signature
-   * @returns The function signature.
-   */ decode() {
-        return `${this.name}(${this.parameters.map((param)=>this.decodeParameter(param)).join(this.separator)})`;
-    }
+ */ export function decodeFromAbi(type, buffer) {
+    return type === undefined ? undefined : new AbiDecoder(buffer.slice()).decodeNext(type);
 }
 /**
- * Decodes a function signature from the name and parameters.
- * @param name - The name of the function.
- * @param parameters - The parameters of the function.
- * @returns - The function signature.
- */ export function decodeFunctionSignature(name, parameters) {
-    return new FunctionSignatureDecoder(name, parameters).decode();
-}
-/**
- * Decodes a function signature from the name and parameters including parameter names.
- * @param name - The name of the function.
- * @param parameters - The parameters of the function.
- * @returns - The user-friendly function signature.
- */ export function decodeFunctionSignatureWithParameterNames(name, parameters) {
-    return new FunctionSignatureDecoder(name, parameters, true).decode();
+ * Decodes one value per given type, consumed from the buffer in order. Always returns one decoded value per type, so
+ * callers can index the result positionally. A function's arguments are encoded this way.
+ * @param types - The type of each value, in order.
+ * @param buffer - The flattened Field array to decode.
+ */ export function decodeEachFromAbi(types, buffer) {
+    const decoder = new AbiDecoder(buffer.slice());
+    return types.map((type)=>decoder.decodeNext(type));
 }

package/dest/abi/encoder.d.ts

@@ -13,4 +13,4 @@ export declare function encodeArguments(abi: FunctionAbi, args: any[]): Fr[];
  * @returns The size of the arguments.
  */
 export declare function countArgumentsSize(abi: FunctionAbi): number;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2Rlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9lbmNvZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBVyxXQUFXLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFrT3JEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxHQUFHLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsUUFFNUQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGtCQUFrQixDQUFDLEdBQUcsRUFBRSxXQUFXLFVBRWxEIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2Rlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9lbmNvZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBVyxXQUFXLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFpVHJEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxHQUFHLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsUUFFNUQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGtCQUFrQixDQUFDLEdBQUcsRUFBRSxXQUFXLFVBRWxEIn0=

package/dest/abi/encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../src/abi/encoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,UAAU,CAAC;AAkOrD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,QAE5D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,WAAW,UAElD"}
+{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../src/abi/encoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,UAAU,CAAC;AAiTrD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,QAE5D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,WAAW,UAElD"}

package/dest/abi/encoder.js

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappedFieldStruct } from './utils.js';
+import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isOptionStruct, isWrappedFieldStruct } from './utils.js';
 /**
  * Encodes arguments for a function call.
  * Missing support for integer and string.
@@ -39,6 +39,27 @@ import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappe
    * @param arg - The value to encode.
    * @param name - Name.
    */ encodeArgument(abiType, arg, name) {
+        if (isOptionStruct(abiType)) {
+            const optionType = abiType;
+            const [isSomeField, valueField] = optionType.fields;
+            if (arg === undefined || arg === null) {
+                this.encodeArgument(isSomeField.type, false, `${name}._is_some`);
+                this.#encodeDefaultValue(valueField.type);
+                return;
+            }
+            if (typeof arg === 'object' && '_is_some' in arg) {
+                this.encodeArgument(isSomeField.type, arg._is_some, `${name}._is_some`);
+                if (arg._is_some) {
+                    this.encodeArgument(valueField.type, arg._value, `${name}._value`);
+                } else {
+                    this.#encodeDefaultValue(valueField.type);
+                }
+                return;
+            }
+            this.encodeArgument(isSomeField.type, true, `${name}._is_some`);
+            this.encodeArgument(valueField.type, arg, `${name}._value`);
+            return;
+        }
         if (arg === undefined || arg == null) {
             throw new Error(`Undefined argument ${name ?? 'unnamed'} of type ${abiType.kind}`);
         }
@@ -70,13 +91,24 @@ import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappe
                 this.flattened.push(new Fr(arg ? 1n : 0n));
                 break;
             case 'array':
+                if (!Array.isArray(arg)) {
+                    throw new Error(`Expected array for '${name ?? 'unnamed'}' but received ${typeof arg}`);
+                }
+                if (arg.length !== abiType.length) {
+                    throw new Error(`Expected array of length ${abiType.length} for '${name ?? 'unnamed'}' but received length ${arg.length}`);
+                }
                 for(let i = 0; i < abiType.length; i += 1){
                     this.encodeArgument(abiType.type, arg[i], `${name}[${i}]`);
                 }
                 break;
             case 'string':
+                if (typeof arg !== 'string') {
+                    throw new Error(`Expected string for '${name ?? 'unnamed'}' but received ${typeof arg}`);
+                }
+                if (arg.length > abiType.length) {
+                    throw new Error(`Expected string of max length ${abiType.length} for '${name ?? 'unnamed'}' but received length ${arg.length}`);
+                }
                 for(let i = 0; i < abiType.length; i += 1){
-                    // If the string is shorter than the defined length, pad it with 0s.
                     const toInsert = i < arg.length ? BigInt(arg.charCodeAt(i)) : 0n;
                     this.flattened.push(new Fr(toInsert));
                 }
@@ -129,13 +161,29 @@ import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappe
                     break;
                 }
             case 'integer':
-                if (typeof arg === 'string') {
+                {
                     const value = BigInt(arg);
-                    this.flattened.push(new Fr(value));
-                } else {
-                    this.flattened.push(new Fr(arg));
+                    if (abiType.sign === 'unsigned') {
+                        const maxValue = (1n << BigInt(abiType.width)) - 1n;
+                        if (value < 0n || value > maxValue) {
+                            throw new Error(`Value ${value} does not fit in u${abiType.width} for '${name ?? 'unnamed'}' (valid range: 0 to ${maxValue})`);
+                        }
+                        this.flattened.push(new Fr(value));
+                    } else {
+                        const minValue = -(1n << BigInt(abiType.width - 1));
+                        const maxValue = (1n << BigInt(abiType.width - 1)) - 1n;
+                        if (value < minValue || value > maxValue) {
+                            throw new Error(`Value ${value} does not fit in i${abiType.width} for '${name ?? 'unnamed'}' (valid range: ${minValue} to ${maxValue})`);
+                        }
+                        if (value < 0n) {
+                            const twosComplement = value + (1n << BigInt(abiType.width));
+                            this.flattened.push(new Fr(twosComplement));
+                        } else {
+                            this.flattened.push(new Fr(value));
+                        }
+                    }
+                    break;
                 }
-                break;
             default:
                 throw new Error(`Unsupported type: ${abiType.kind}`);
         }
@@ -144,6 +192,9 @@ import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappe
    * Encodes all the arguments for the given function ABI.
    * @returns The encoded arguments.
    */ encode() {
+        if (this.args.length !== this.abi.parameters.length) {
+            throw new Error(`Function '${this.abi.name}' expects ${this.abi.parameters.length} argument(s) but received ${this.args.length}`);
+        }
         for(let i = 0; i < this.abi.parameters.length; i += 1){
             const parameterAbi = this.abi.parameters[i];
             this.encodeArgument(parameterAbi.type, this.args[i], parameterAbi.name);
@@ -212,6 +263,12 @@ import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappe
             this.encodeArgument(lenField.type, arg.length, 'len');
         }
     }
+    /**
+   * Appends the flattened zero value for an ABI type.
+   * Option::None still serializes the wrapped value, so we need to zero-fill its footprint.
+   */ #encodeDefaultValue(abiType) {
+        this.flattened.push(...new Array(ArgumentEncoder.typeSize(abiType)).fill(Fr.ZERO));
+    }
 }
 /**
  * Encodes all the arguments for a function call.

package/dest/abi/event_metadata_definition.d.ts

@@ -1,8 +1,10 @@
 import type { AbiType } from './abi.js';
 import type { EventSelector } from './event_selector.js';
+/** Metadata for a contract event, used to decode emitted event logs back into structured data. */
 export type EventMetadataDefinition = {
     eventSelector: EventSelector;
     abiType: AbiType;
+    /** Names of the event's struct members (not serialized Noir Field elements). */
     fieldNames: string[];
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRfbWV0YWRhdGFfZGVmaW5pdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9ldmVudF9tZXRhZGF0YV9kZWZpbml0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN4QyxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFDcEMsYUFBYSxFQUFFLGFBQWEsQ0FBQztJQUM3QixPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQ2pCLFVBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQztDQUN0QixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRfbWV0YWRhdGFfZGVmaW5pdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9ldmVudF9tZXRhZGF0YV9kZWZpbml0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN4QyxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxrR0FBa0c7QUFDbEcsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLGFBQWEsRUFBRSxhQUFhLENBQUM7SUFDN0IsT0FBTyxFQUFFLE9BQU8sQ0FBQztJQUNqQixnRkFBZ0Y7SUFDaEYsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDO0NBQ3RCLENBQUMifQ==

package/dest/abi/event_metadata_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event_metadata_definition.d.ts","sourceRoot":"","sources":["../../src/abi/event_metadata_definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC"}
+{"version":3,"file":"event_metadata_definition.d.ts","sourceRoot":"","sources":["../../src/abi/event_metadata_definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,kGAAkG;AAClG,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC"}

package/dest/abi/event_metadata_definition.js

@@ -1 +1 @@
-export { };
+/** Metadata for a contract event, used to decode emitted event logs back into structured data. */ export { };

package/dest/abi/event_selector.d.ts

@@ -1,13 +1,10 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { Selector } from './selector.js';
-/** Event selector branding */
-export interface EventSelector {
-    /** Brand. */
-    _branding: 'EventSelector';
-}
 /** An event selector is the first 4 bytes of the hash of an event signature. */
 export declare class EventSelector extends Selector {
+    /** Branding for nominal typing. */
+    private readonly _branding;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer  or BufferReader to read from.
@@ -45,6 +42,6 @@ export declare class EventSelector extends Selector {
      */
     static random(): EventSelector;
     toJSON(): string;
-    static get schema(): import("zod").ZodType<EventSelector, any, string>;
+    static get schema(): import("zod").ZodType<EventSelector, string, import("zod/v4/core").$ZodTypeInternals<EventSelector, string>>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRfc2VsZWN0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hYmkvZXZlbnRfc2VsZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJekMsOEJBQThCO0FBQzlCLE1BQU0sV0FBVyxhQUFhO0lBQzVCLGFBQWE7SUFDYixTQUFTLEVBQUUsZUFBZSxDQUFDO0NBQzVCO0FBRUQsZ0ZBQWdGO0FBQ2hGLHFCQUFhLGFBQWMsU0FBUSxRQUFRO0lBQ3pDOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxpQkFJOUM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxpQkFFdEI7SUFFRDs7OztPQUlHO0lBQ0gsT0FBYSxhQUFhLENBQUMsU0FBUyxFQUFFLE1BQU0sMEJBUzNDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxpQkFNakM7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsS0FBSyxrQkFFWDtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxNQUFNLGtCQUVaO0lBRUQsTUFBTSxXQUVMO0lBRUQsTUFBTSxLQUFLLE1BQU0sc0RBRWhCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRfc2VsZWN0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hYmkvZXZlbnRfc2VsZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFekMsZ0ZBQWdGO0FBQ2hGLHFCQUFhLGFBQWMsU0FBUSxRQUFRO0lBQ3pDLG1DQUFtQztJQUNuQyxpQkFBeUIsU0FBUyxDQUFrQjtJQUNwRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksaUJBSTlDO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsaUJBRXRCO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWEsYUFBYSxDQUFDLFNBQVMsRUFBRSxNQUFNLDBCQVMzQztJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLE1BQU0saUJBTWpDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEtBQUssa0JBRVg7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsTUFBTSxrQkFFWjtJQUVELE1BQU0sV0FFTDtJQUVELE1BQU0sS0FBSyxNQUFNLGlIQUVoQjtDQUNGIn0=

package/dest/abi/event_selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event_selector.d.ts","sourceRoot":"","sources":["../../src/abi/event_selector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,8BAA8B;AAC9B,MAAM,WAAW,aAAa;IAC5B,aAAa;IACb,SAAS,EAAE,eAAe,CAAC;CAC5B;AAED,gFAAgF;AAChF,qBAAa,aAAc,SAAQ,QAAQ;IACzC;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAI9C;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,iBAEtB;IAED;;;;OAIG;IACH,OAAa,aAAa,CAAC,SAAS,EAAE,MAAM,0BAS3C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,iBAMjC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,kBAEX;IAED;;;OAGG;IACH,MAAM,CAAC,MAAM,kBAEZ;IAED,MAAM,WAEL;IAED,MAAM,KAAK,MAAM,sDAEhB;CACF"}
+{"version":3,"file":"event_selector.d.ts","sourceRoot":"","sources":["../../src/abi/event_selector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,gFAAgF;AAChF,qBAAa,aAAc,SAAQ,QAAQ;IACzC,mCAAmC;IACnC,iBAAyB,SAAS,CAAkB;IACpD;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAI9C;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,iBAEtB;IAED;;;;OAIG;IACH,OAAa,aAAa,CAAC,SAAS,EAAE,MAAM,0BAS3C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,iBAMjC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,kBAEX;IAED;;;OAGG;IACH,MAAM,CAAC,MAAM,kBAEZ;IAED,MAAM,WAEL;IAED,MAAM,KAAK,MAAM,iHAEhB;CACF"}

package/dest/abi/function_call.d.ts

@@ -1,5 +1,6 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { FieldsOf } from '@aztec/foundation/types';
+import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { type AbiType, FunctionType } from './abi.js';
 import { FunctionSelector } from './function_selector.js';
@@ -19,8 +20,8 @@ export declare class FunctionCall {
     isStatic: boolean;
     /** The encoded args */
     args: Fr[];
-    /** The return type for decoding */
-    returnTypes: AbiType[];
+    /** The type the call returns, for decoding, or undefined if it returns nothing */
+    returnType?: AbiType | undefined;
     constructor(
     /** The name of the function to call */
     name: string, 
@@ -36,23 +37,43 @@ export declare class FunctionCall {
     isStatic: boolean, 
     /** The encoded args */
     args: Fr[], 
-    /** The return type for decoding */
-    returnTypes: AbiType[]);
-    static getFields(fields: FieldsOf<FunctionCall>): readonly [string, AztecAddress, FunctionSelector, FunctionType, boolean, boolean, Fr[], AbiType[]];
+    /** The type the call returns, for decoding, or undefined if it returns nothing */
+    returnType?: AbiType | undefined);
+    static getFields(fields: FieldsOf<FunctionCall>): readonly [string, AztecAddress, FunctionSelector, FunctionType, boolean, boolean, Fr[], AbiType | undefined];
     static from(fields: FieldsOf<FunctionCall>): FunctionCall;
-    /**
-     * Creates an empty function call.
-     * @returns an empty function call.
-     */
-    static empty(): {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        name: z.ZodString;
+        to: import("../schemas/index.js").ZodFor<AztecAddress>;
+        selector: import("../schemas/index.js").ZodFor<FunctionSelector>;
+        type: z.ZodEnum<typeof FunctionType>;
+        isStatic: z.ZodBoolean;
+        hideMsgSender: z.ZodBoolean;
+        args: z.ZodArray<import("../schemas/index.js").ZodFor<Fr>>;
+        returnType: z.ZodOptional<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+        returnTypes: z.ZodOptional<z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>>;
+    }, z.core.$strip>, z.ZodTransform<FunctionCall, {
         name: string;
         to: AztecAddress;
         selector: FunctionSelector;
         type: FunctionType;
-        hideMsgSender: boolean;
         isStatic: boolean;
-        args: never[];
-        returnTypes: never[];
+        hideMsgSender: boolean;
+        args: Fr[];
+        returnType?: AbiType | undefined;
+        returnTypes?: AbiType[] | undefined;
+    }>>;
+    /**
+     * Serializes the deprecated `returnTypes` alongside `returnType`, so that peers that still require the old field can
+     * parse calls sent by this version.
+     */
+    toJSON(): this & {
+        returnTypes: AbiType[];
     };
+    isPublicStatic(): boolean;
+    /**
+     * Creates an empty function call.
+     * @returns an empty function call.
+     */
+    static empty(): FunctionCall;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fY2FsbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9mdW5jdGlvbl9jYWxsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTFELGtEQUFrRDtBQUNsRCxxQkFBYSxZQUFZO0lBRXJCLHVDQUF1QztJQUNoQyxJQUFJLEVBQUUsTUFBTTtJQUNuQiw2QkFBNkI7SUFDdEIsRUFBRSxFQUFFLFlBQVk7SUFDdkIsZ0NBQWdDO0lBQ3pCLFFBQVEsRUFBRSxnQkFBZ0I7SUFDakMsMkJBQTJCO0lBQ3BCLElBQUksRUFBRSxZQUFZO0lBQ3pCLHFRQUFxUTtJQUM5UCxhQUFhLEVBQUUsT0FBTztJQUM3QiwrREFBK0Q7SUFDeEQsUUFBUSxFQUFFLE9BQU87SUFDeEIsdUJBQXVCO0lBQ2hCLElBQUksRUFBRSxFQUFFLEVBQUU7SUFDakIsbUNBQW1DO0lBQzVCLFdBQVcsRUFBRSxPQUFPLEVBQUU7SUFoQi9CO0lBQ0UsdUNBQXVDO0lBQ2hDLElBQUksRUFBRSxNQUFNO0lBQ25CLDZCQUE2QjtJQUN0QixFQUFFLEVBQUUsWUFBWTtJQUN2QixnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLGdCQUFnQjtJQUNqQywyQkFBMkI7SUFDcEIsSUFBSSxFQUFFLFlBQVk7SUFDekIscVFBQXFRO0lBQzlQLGFBQWEsRUFBRSxPQUFPO0lBQzdCLCtEQUErRDtJQUN4RCxRQUFRLEVBQUUsT0FBTztJQUN4Qix1QkFBdUI7SUFDaEIsSUFBSSxFQUFFLEVBQUUsRUFBRTtJQUNqQixtQ0FBbUM7SUFDNUIsV0FBVyxFQUFFLE9BQU8sRUFBRSxFQUMzQjtJQUVKLE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxZQUFZLENBQUMsc0dBVzlDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFlBQVksQ0FFeEQ7SUFFRDs7O09BR0c7SUFDSCxPQUFjLEtBQUs7Ozs7Ozs7OztNQVdsQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fY2FsbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9mdW5jdGlvbl9jYWxsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBaUIsWUFBWSxFQUF5QixNQUFNLFVBQVUsQ0FBQztBQUM1RixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUxRCxrREFBa0Q7QUFDbEQscUJBQWEsWUFBWTtJQUVyQix1Q0FBdUM7SUFDaEMsSUFBSSxFQUFFLE1BQU07SUFDbkIsNkJBQTZCO0lBQ3RCLEVBQUUsRUFBRSxZQUFZO0lBQ3ZCLGdDQUFnQztJQUN6QixRQUFRLEVBQUUsZ0JBQWdCO0lBQ2pDLDJCQUEyQjtJQUNwQixJQUFJLEVBQUUsWUFBWTtJQUN6QixxUUFBcVE7SUFDOVAsYUFBYSxFQUFFLE9BQU87SUFDN0IsK0RBQStEO0lBQ3hELFFBQVEsRUFBRSxPQUFPO0lBQ3hCLHVCQUF1QjtJQUNoQixJQUFJLEVBQUUsRUFBRSxFQUFFO0lBQ2pCLGtGQUFrRjtJQUMzRSxVQUFVLENBQUM7SUFoQnBCO0lBQ0UsdUNBQXVDO0lBQ2hDLElBQUksRUFBRSxNQUFNO0lBQ25CLDZCQUE2QjtJQUN0QixFQUFFLEVBQUUsWUFBWTtJQUN2QixnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLGdCQUFnQjtJQUNqQywyQkFBMkI7SUFDcEIsSUFBSSxFQUFFLFlBQVk7SUFDekIscVFBQXFRO0lBQzlQLGFBQWEsRUFBRSxPQUFPO0lBQzdCLCtEQUErRDtJQUN4RCxRQUFRLEVBQUUsT0FBTztJQUN4Qix1QkFBdUI7SUFDaEIsSUFBSSxFQUFFLEVBQUUsRUFBRTtJQUNqQixrRkFBa0Y7SUFDM0UsVUFBVSxDQUFDLHFCQUFTLEVBQ3pCO0lBRUosTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFlBQVksQ0FBQyxnSEFXOUM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsWUFBWSxDQUFDLEdBQUcsWUFBWSxDQUV4RDtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztRQWtCaEI7SUFFRDs7O09BR0c7SUFDSSxNQUFNOztNQUVaO0lBRU0sY0FBYyxJQUFJLE9BQU8sQ0FFL0I7SUFFRDs7O09BR0c7SUFDSCxPQUFjLEtBQUssaUJBVWxCO0NBQ0YifQ==

package/dest/abi/function_call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function_call.d.ts","sourceRoot":"","sources":["../../src/abi/function_call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,kDAAkD;AAClD,qBAAa,YAAY;IAErB,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,mCAAmC;IAC5B,WAAW,EAAE,OAAO,EAAE;IAhB/B;IACE,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,mCAAmC;IAC5B,WAAW,EAAE,OAAO,EAAE,EAC3B;IAEJ,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,sGAW9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY,CAExD;IAED;;;OAGG;IACH,OAAc,KAAK;;;;;;;;;MAWlB;CACF"}
+{"version":3,"file":"function_call.d.ts","sourceRoot":"","sources":["../../src/abi/function_call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,KAAK,OAAO,EAAiB,YAAY,EAAyB,MAAM,UAAU,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,kDAAkD;AAClD,qBAAa,YAAY;IAErB,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,kFAAkF;IAC3E,UAAU,CAAC;IAhBpB;IACE,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,kFAAkF;IAC3E,UAAU,CAAC,qBAAS,EACzB;IAEJ,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,gHAW9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY,CAExD;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;QAkBhB;IAED;;;OAGG;IACI,MAAM;;MAEZ;IAEM,cAAc,IAAI,OAAO,CAE/B;IAED;;;OAGG;IACH,OAAc,KAAK,iBAUlB;CACF"}

package/dest/abi/function_call.js

@@ -1,5 +1,7 @@
+import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
-import { FunctionType } from './abi.js';
+import { schemas } from '../schemas/index.js';
+import { AbiTypeSchema, FunctionType, getFunctionReturnType } from './abi.js';
 import { FunctionSelector } from './function_selector.js';
 /** A request to call a function on a contract. */ export class FunctionCall {
     name;
@@ -9,8 +11,8 @@ import { FunctionSelector } from './function_selector.js';
     hideMsgSender;
     isStatic;
     args;
-    returnTypes;
-    constructor(/** The name of the function to call */ name, /** The recipient contract */ to, /** The function being called */ selector, /** Type of the function */ type, /** Only applicable for enqueued public function calls. `hideMsgSender = true` will set the msg_sender field (the caller's address) to "null", meaning the public function (and observers around the world) won't know which smart contract address made the call. */ hideMsgSender, /** Whether this call can make modifications to state or not */ isStatic, /** The encoded args */ args, /** The return type for decoding */ returnTypes){
+    returnType;
+    constructor(/** The name of the function to call */ name, /** The recipient contract */ to, /** The function being called */ selector, /** Type of the function */ type, /** Only applicable for enqueued public function calls. `hideMsgSender = true` will set the msg_sender field (the caller's address) to "null", meaning the public function (and observers around the world) won't know which smart contract address made the call. */ hideMsgSender, /** Whether this call can make modifications to state or not */ isStatic, /** The encoded args */ args, /** The type the call returns, for decoding, or undefined if it returns nothing */ returnType){
         this.name = name;
         this.to = to;
         this.selector = selector;
@@ -18,7 +20,7 @@ import { FunctionSelector } from './function_selector.js';
         this.hideMsgSender = hideMsgSender;
         this.isStatic = isStatic;
         this.args = args;
-        this.returnTypes = returnTypes;
+        this.returnType = returnType;
     }
     static getFields(fields) {
         return [
@@ -29,25 +31,59 @@ import { FunctionSelector } from './function_selector.js';
             fields.hideMsgSender,
             fields.isStatic,
             fields.args,
-            fields.returnTypes
+            fields.returnType
         ];
     }
     static from(fields) {
         return new FunctionCall(...FunctionCall.getFields(fields));
     }
+    static get schema() {
+        return z.object({
+            name: z.string(),
+            to: schemas.AztecAddress,
+            selector: schemas.FunctionSelector,
+            type: z.nativeEnum(FunctionType),
+            isStatic: z.boolean(),
+            hideMsgSender: z.boolean(),
+            args: z.array(schemas.Fr),
+            returnType: AbiTypeSchema.optional(),
+            // Old consumers send `returnTypes`, not `returnType`. So we accept both for now, until we can safely remove
+            // the old version.
+            returnTypes: z.array(AbiTypeSchema).optional()
+        }).transform(({ returnType, returnTypes, ...fields })=>FunctionCall.from({
+                ...fields,
+                returnType: getFunctionReturnType({
+                    returnType,
+                    returnTypes
+                })
+            }));
+    }
+    /**
+   * Serializes the deprecated `returnTypes` alongside `returnType`, so that peers that still require the old field can
+   * parse calls sent by this version.
+   */ toJSON() {
+        return {
+            ...this,
+            returnTypes: this.returnType ? [
+                this.returnType
+            ] : []
+        };
+    }
+    isPublicStatic() {
+        return this.type === FunctionType.PUBLIC && this.isStatic;
+    }
     /**
    * Creates an empty function call.
    * @returns an empty function call.
    */ static empty() {
-        return {
+        return FunctionCall.from({
             name: '',
             to: AztecAddress.ZERO,
             selector: FunctionSelector.empty(),
             type: FunctionType.PUBLIC,
             hideMsgSender: false,
             isStatic: false,
-            args: [],
-            returnTypes: []
-        };
+            args: []
+        });
     }
 }

package/dest/abi/function_selector.d.ts

@@ -3,13 +3,10 @@ import { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { ABIParameter } from './abi.js';
 import { Selector } from './selector.js';
-/** Function selector branding */
-export interface FunctionSelector {
-    /** Brand. */
-    _branding: 'FunctionSelector';
-}
 /** A function selector is the first 4 bytes of the hash of a function signature. */
 export declare class FunctionSelector extends Selector {
+    /** Branding for nominal typing. */
+    private readonly _branding;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer  or BufferReader to read from.
@@ -61,4 +58,4 @@ export declare class FunctionSelector extends Selector {
     toJSON(): string;
     static get schema(): ZodFor<FunctionSelector>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fc2VsZWN0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hYmkvZnVuY3Rpb25fc2VsZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDJCQUEyQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFnQixNQUFNLDZCQUE2QixDQUFDO0FBRXRGLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUU3QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBSXpDLGlDQUFpQztBQUNqQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLGFBQWE7SUFDYixTQUFTLEVBQUUsa0JBQWtCLENBQUM7Q0FDL0I7QUFFRCxvRkFBb0Y7QUFDcEYscUJBQWEsZ0JBQWlCLFNBQVEsUUFBUTtJQUM1Qzs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksb0JBSTlDO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsb0JBRXRCO0lBRUQsTUFBTSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxFQUFFLGdDQU1qQztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsb0JBRzNDO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWEsYUFBYSxDQUFDLFNBQVMsRUFBRSxNQUFNLDZCQVMzQztJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLE1BQU0sb0JBTWpDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEtBQUsscUJBRVg7SUFFRDs7Ozs7T0FLRztJQUNILE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLEVBQUU7UUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDO1FBQUMsVUFBVSxFQUFFLFlBQVksRUFBRSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUM1RyxNQUFNLENBQUMscUJBQXFCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFjbEc7O09BRUc7SUFDSCxNQUFNLENBQUMsTUFBTSxxQkFFWjtJQUVELE1BQU0sV0FFTDtJQUVELE1BQU0sS0FBSyxNQUFNLElBQUksTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBRTVDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fc2VsZWN0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hYmkvZnVuY3Rpb25fc2VsZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDJCQUEyQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRTdDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFekMsb0ZBQW9GO0FBQ3BGLHFCQUFhLGdCQUFpQixTQUFRLFFBQVE7SUFDNUMsbUNBQW1DO0lBQ25DLGlCQUF5QixTQUFTLENBQXFCO0lBQ3ZEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxvQkFJOUM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxvQkFFdEI7SUFFRCxNQUFNLENBQUMsb0JBQW9CLENBQUMsRUFBRSxFQUFFLEVBQUUsZ0NBTWpDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxvQkFHM0M7SUFFRDs7OztPQUlHO0lBQ0gsT0FBYSxhQUFhLENBQUMsU0FBUyxFQUFFLE1BQU0sNkJBUzNDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxvQkFNakM7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsS0FBSyxxQkFFWDtJQUVEOzs7OztPQUtHO0lBQ0gsTUFBTSxDQUFDLHFCQUFxQixDQUFDLElBQUksRUFBRTtRQUFFLElBQUksRUFBRSxNQUFNLENBQUM7UUFBQyxVQUFVLEVBQUUsWUFBWSxFQUFFLENBQUE7S0FBRSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzVHLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQWNsRzs7T0FFRztJQUNILE1BQU0sQ0FBQyxNQUFNLHFCQUVaO0lBRUQsTUFBTSxXQUVMO0lBRUQsTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FFNUM7Q0FDRiJ9

package/dest/abi/function_selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function_selector.d.ts","sourceRoot":"","sources":["../../src/abi/function_selector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAEtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,iCAAiC;AACjC,MAAM,WAAW,gBAAgB;IAC/B,aAAa;IACb,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED,oFAAoF;AACpF,qBAAa,gBAAiB,SAAQ,QAAQ;IAC5C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oBAI9C;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,oBAEtB;IAED,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,EAAE,gCAMjC;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,oBAG3C;IAED;;;;OAIG;IACH,OAAa,aAAa,CAAC,SAAS,EAAE,MAAM,6BAS3C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,oBAMjC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,qBAEX;IAED;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,YAAY,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5G,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAclG;;OAEG;IACH,MAAM,CAAC,MAAM,qBAEZ;IAED,MAAM,WAEL;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAE5C;CACF"}
+{"version":3,"file":"function_selector.d.ts","sourceRoot":"","sources":["../../src/abi/function_selector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,oFAAoF;AACpF,qBAAa,gBAAiB,SAAQ,QAAQ;IAC5C,mCAAmC;IACnC,iBAAyB,SAAS,CAAqB;IACvD;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oBAI9C;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,oBAEtB;IAED,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,EAAE,gCAMjC;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,oBAG3C;IAED;;;;OAIG;IACH,OAAa,aAAa,CAAC,SAAS,EAAE,MAAM,6BAS3C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,oBAMjC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,qBAEX;IAED;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,YAAY,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5G,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAclG;;OAEG;IACH,MAAM,CAAC,MAAM,qBAEZ;IAED,MAAM,WAEL;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAE5C;CACF"}

package/dest/abi/function_selector.js

@@ -2,8 +2,8 @@ import { fromHex, toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { poseidon2HashBytes } from '@aztec/foundation/crypto/poseidon';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { hexSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, TypeRegistry } from '@aztec/foundation/serialize';
-import { decodeFunctionSignature } from './decoder.js';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { decodeFunctionSignature } from './function_signature_decoder.js';
 import { Selector } from './selector.js';
 /** A function selector is the first 4 bytes of the hash of a function signature. */ export class FunctionSelector extends Selector {
     /**
@@ -89,5 +89,3 @@ import { Selector } from './selector.js';
         return hexSchemaFor(FunctionSelector);
     }
 }
-// For deserializing JSON.
-TypeRegistry.register('FunctionSelector', FunctionSelector);

package/dest/abi/function_signature_decoder.d.ts

@@ -0,0 +1,43 @@
+import type { ABIParameter } from './abi.js';
+/**
+ * Decodes the signature of a function from the name and parameters.
+ */
+export declare class FunctionSignatureDecoder {
+    private name;
+    private parameters;
+    private includeNames;
+    private separator;
+    constructor(name: string, parameters: ABIParameter[], includeNames?: boolean);
+    /**
+     * Decodes a single function parameter type for the function signature.
+     * @param param - The parameter type to decode.
+     * @returns A string representing the parameter type.
+     */
+    private getParameterType;
+    /**
+     * Decodes a single function parameter for the function signature.
+     * @param param - The parameter to decode.
+     * @returns A string representing the parameter type and optionally its name.
+     */
+    private decodeParameter;
+    /**
+     * Decodes all the parameters and build the function signature
+     * @returns The function signature.
+     */
+    decode(): string;
+}
+/**
+ * Decodes a function signature from the name and parameters.
+ * @param name - The name of the function.
+ * @param parameters - The parameters of the function.
+ * @returns - The function signature.
+ */
+export declare function decodeFunctionSignature(name: string, parameters: ABIParameter[]): string;
+/**
+ * Decodes a function signature from the name and parameters including parameter names.
+ * @param name - The name of the function.
+ * @param parameters - The parameters of the function.
+ * @returns - The user-friendly function signature.
+ */
+export declare function decodeFunctionSignatureWithParameterNames(name: string, parameters: ABIParameter[]): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fc2lnbmF0dXJlX2RlY29kZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hYmkvZnVuY3Rpb25fc2lnbmF0dXJlX2RlY29kZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUF3QixNQUFNLFVBQVUsQ0FBQztBQUVuRTs7R0FFRztBQUNILHFCQUFhLHdCQUF3QjtJQUdqQyxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxZQUFZO0lBSnRCLE9BQU8sQ0FBQyxTQUFTLENBQVM7SUFDMUIsWUFDVSxJQUFJLEVBQUUsTUFBTSxFQUNaLFVBQVUsRUFBRSxZQUFZLEVBQUUsRUFDMUIsWUFBWSxVQUFRLEVBRzdCO0lBRUQ7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxnQkFBZ0I7SUFtQnhCOzs7O09BSUc7SUFDSCxPQUFPLENBQUMsZUFBZTtJQUt2Qjs7O09BR0c7SUFDSSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFVBRS9FO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IseUNBQXlDLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFVBRWpHIn0=

package/dest/abi/function_signature_decoder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"function_signature_decoder.d.ts","sourceRoot":"","sources":["../../src/abi/function_signature_decoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAEnE;;GAEG;AACH,qBAAa,wBAAwB;IAGjC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IAJtB,OAAO,CAAC,SAAS,CAAS;IAC1B,YACU,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,YAAY,EAAE,EAC1B,YAAY,UAAQ,EAG7B;IAED;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAmBxB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAKvB;;;OAGG;IACI,MAAM,IAAI,MAAM,CAEtB;CACF;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,UAE/E;AAED;;;;;GAKG;AACH,wBAAgB,yCAAyC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,UAEjG"}