@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/block/validate_block_result.d.ts

@@ -0,0 +1,222 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+import { type L2BlockInfo } from './l2_block_info.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
+/** Subtype for invalid block validation results */
+export type ValidateBlockNegativeResult = {
+    valid: false;
+    /** Identifiers from the invalid block */
+    block: L2BlockInfo;
+    /** Committee members at the epoch this block was proposed */
+    committee: EthAddress[];
+    /** Epoch in which this block was proposed */
+    epoch: bigint;
+    /** Proposer selection seed for the epoch */
+    seed: bigint;
+    /** List of committee members who signed this block proposal */
+    attestors: EthAddress[];
+    /** Committee attestations for this block as they were posted to L1 */
+    attestations: CommitteeAttestation[];
+    /** Reason for the block being invalid: not enough attestations were posted */
+    reason: 'insufficient-attestations';
+} | {
+    valid: false;
+    /** Identifiers from the invalid block */
+    block: L2BlockInfo;
+    /** Committee members at the epoch this block was proposed */
+    committee: EthAddress[];
+    /** Epoch in which this block was proposed */
+    epoch: bigint;
+    /** Proposer selection seed for the epoch */
+    seed: bigint;
+    /** List of committee members who signed this block proposal */
+    attestors: EthAddress[];
+    /** Committee attestations for this block as they were posted to L1 */
+    attestations: CommitteeAttestation[];
+    /** Reason for the block being invalid: an invalid attestation was posted */
+    reason: 'invalid-attestation';
+    /** Index in the attestations array of the invalid attestation posted */
+    invalidIndex: number;
+};
+/** Result type for validating a block attestations */
+export type ValidateBlockResult = {
+    valid: true;
+} | ValidateBlockNegativeResult;
+export declare const ValidateBlockResultSchema: z.ZodUnion<[z.ZodObject<{
+    valid: z.ZodLiteral<true>;
+}, "strip", z.ZodTypeAny, {
+    valid: true;
+}, {
+    valid: true;
+}>, z.ZodObject<{
+    valid: z.ZodLiteral<false>;
+    block: z.ZodObject<{
+        blockHash: z.ZodOptional<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>>;
+        archive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        lastArchive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        blockNumber: z.ZodNumber;
+        slotNumber: z.ZodNumber;
+        txCount: z.ZodNumber;
+        timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    }, "strip", z.ZodTypeAny, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    }, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    }>;
+    committee: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    epoch: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    seed: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    attestors: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+        address: z.ZodType<EthAddress, any, string>;
+        signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
+    }, "strip", z.ZodTypeAny, {
+        address: EthAddress;
+        signature: import("./proposal/committee_attestation.js").Signature;
+    }, {
+        address: string;
+        signature: string;
+    }>, CommitteeAttestation, {
+        address: string;
+        signature: string;
+    }>, "many">;
+    reason: z.ZodLiteral<"insufficient-attestations">;
+}, "strip", z.ZodTypeAny, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    };
+    attestations: CommitteeAttestation[];
+    committee: EthAddress[];
+    epoch: bigint;
+    seed: bigint;
+    attestors: EthAddress[];
+    reason: "insufficient-attestations";
+}, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    };
+    attestations: {
+        address: string;
+        signature: string;
+    }[];
+    committee: string[];
+    epoch: string | number | bigint;
+    seed: string | number | bigint;
+    attestors: string[];
+    reason: "insufficient-attestations";
+}>, z.ZodObject<{
+    valid: z.ZodLiteral<false>;
+    block: z.ZodObject<{
+        blockHash: z.ZodOptional<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>>;
+        archive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        lastArchive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        blockNumber: z.ZodNumber;
+        slotNumber: z.ZodNumber;
+        txCount: z.ZodNumber;
+        timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    }, "strip", z.ZodTypeAny, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    }, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    }>;
+    committee: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    epoch: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    seed: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    attestors: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+        address: z.ZodType<EthAddress, any, string>;
+        signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
+    }, "strip", z.ZodTypeAny, {
+        address: EthAddress;
+        signature: import("./proposal/committee_attestation.js").Signature;
+    }, {
+        address: string;
+        signature: string;
+    }>, CommitteeAttestation, {
+        address: string;
+        signature: string;
+    }>, "many">;
+    reason: z.ZodLiteral<"invalid-attestation">;
+    invalidIndex: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    };
+    attestations: CommitteeAttestation[];
+    committee: EthAddress[];
+    epoch: bigint;
+    seed: bigint;
+    attestors: EthAddress[];
+    reason: "invalid-attestation";
+    invalidIndex: number;
+}, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    };
+    attestations: {
+        address: string;
+        signature: string;
+    }[];
+    committee: string[];
+    epoch: string | number | bigint;
+    seed: string | number | bigint;
+    attestors: string[];
+    reason: "invalid-attestation";
+    invalidIndex: number;
+}>]>;
+export declare function serializeValidateBlockResult(result: ValidateBlockResult): Buffer;
+export declare function deserializeValidateBlockResult(bufferOrReader: Buffer | BufferReader): ValidateBlockResult;
+//# sourceMappingURL=validate_block_result.d.ts.map

package/dest/block/validate_block_result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate_block_result.d.ts","sourceRoot":"","sources":["../../src/block/validate_block_result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,KAAK,WAAW,EAA4C,MAAM,oBAAoB,CAAC;AACjH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,mDAAmD;AACnD,MAAM,MAAM,2BAA2B,GACnC;IACE,KAAK,EAAE,KAAK,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,sEAAsE;IACtE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,8EAA8E;IAC9E,MAAM,EAAE,2BAA2B,CAAC;CACrC,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,sEAAsE;IACtE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,4EAA4E;IAC5E,MAAM,EAAE,qBAAqB,CAAC;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEN,sDAAsD;AACtD,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,2BAA2B,CAAC;AAEhF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuBE,CAAC;AAEzC,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAqBhF;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAsBzG"}

package/dest/block/validate_block_result.js

@@ -0,0 +1,83 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { schemas } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+import { BlockInfoSchema, deserializeBlockInfo, serializeBlockInfo } from './l2_block_info.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
+export const ValidateBlockResultSchema = z.union([
+    z.object({
+        valid: z.literal(true)
+    }),
+    z.object({
+        valid: z.literal(false),
+        block: BlockInfoSchema,
+        committee: z.array(schemas.EthAddress),
+        epoch: schemas.BigInt,
+        seed: schemas.BigInt,
+        attestors: z.array(schemas.EthAddress),
+        attestations: z.array(CommitteeAttestation.schema),
+        reason: z.literal('insufficient-attestations')
+    }),
+    z.object({
+        valid: z.literal(false),
+        block: BlockInfoSchema,
+        committee: z.array(schemas.EthAddress),
+        epoch: schemas.BigInt,
+        seed: schemas.BigInt,
+        attestors: z.array(schemas.EthAddress),
+        attestations: z.array(CommitteeAttestation.schema),
+        reason: z.literal('invalid-attestation'),
+        invalidIndex: z.number()
+    })
+]);
+export function serializeValidateBlockResult(result) {
+    if (result.valid) {
+        return serializeToBuffer(true);
+    }
+    const l2Block = serializeBlockInfo(result.block);
+    return serializeToBuffer(result.valid, result.reason, l2Block.length, l2Block, result.committee.length, result.committee, result.epoch, result.seed ?? 0n, result.attestors.length, result.attestors, result.attestations.length, result.attestations, result.reason === 'invalid-attestation' ? result.invalidIndex : 0);
+}
+export function deserializeValidateBlockResult(bufferOrReader) {
+    const reader = BufferReader.asReader(bufferOrReader);
+    const valid = reader.readBoolean();
+    if (valid) {
+        return {
+            valid
+        };
+    }
+    const reason = reader.readString();
+    const block = deserializeBlockInfo(reader.readBuffer());
+    const committee = reader.readVector(EthAddress);
+    const epoch = reader.readBigInt();
+    const seed = reader.readBigInt();
+    const attestors = reader.readVector(EthAddress);
+    const attestations = reader.readVector(CommitteeAttestation);
+    const invalidIndex = reader.readNumber();
+    if (reason === 'insufficient-attestations') {
+        return {
+            valid,
+            reason,
+            block,
+            committee,
+            epoch,
+            seed,
+            attestors,
+            attestations: attestations
+        };
+    } else if (reason === 'invalid-attestation') {
+        return {
+            valid,
+            reason,
+            block,
+            committee,
+            epoch,
+            seed,
+            attestors,
+            invalidIndex,
+            attestations: attestations
+        };
+    } else {
+        const _ = reason;
+        throw new Error(`Unknown reason: ${reason}`);
+    }
+}

package/dest/config/{config.d.ts → chain-config.d.ts}

@@ -1,6 +1,7 @@
-import { type ConfigMappingsType } from '@aztec/foundation/config';
+import type { ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-export { type AllowedElement, type SequencerConfig, SequencerConfigSchema } from '../interfaces/configs.js';
+export { type SequencerConfig, SequencerConfigSchema } from '../interfaces/configs.js';
+export { type AllowedElement } from '../interfaces/allowed_element.js';
 export declare const emptyChainConfig: ChainConfig;
 export declare const chainConfigMappings: ConfigMappingsType<ChainConfig>;
 /** Chain configuration. */
@@ -8,11 +9,11 @@ export type ChainConfig = {
     /** The chain id of the ethereum host. */
     l1ChainId: number;
     /** The version of the rollup. */
-    version: number;
+    rollupVersion: number;
     /** The address to the L1 contracts. */
     l1Contracts: {
         /** The address to rollup */
         rollupAddress: EthAddress;
     };
 };
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=chain-config.d.ts.map

package/dest/config/chain-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chain-config.d.ts","sourceRoot":"","sources":["../../src/config/chain-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAEvE,eAAO,MAAM,gBAAgB,EAAE,WAI9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,kBAAkB,CAAC,WAAW,CAgB/D,CAAC;AAEF,2BAA2B;AAC3B,MAAM,MAAM,WAAW,GAAG;IACxB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,iCAAiC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,WAAW,EAAE;QACX,4BAA4B;QAC5B,aAAa,EAAE,UAAU,CAAC;KAC3B,CAAC;CACH,CAAC"}

package/dest/config/{config.js → chain-config.js}

@@ -1,5 +1,4 @@
 import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
-import { numberConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 export { SequencerConfigSchema } from '../interfaces/configs.js';
 export const emptyChainConfig = {
@@ -7,7 +6,7 @@ export const emptyChainConfig = {
     l1Contracts: {
         rollupAddress: EthAddress.ZERO
     },
-    version: 0
+    rollupVersion: 0
 };
 export const chainConfigMappings = {
     l1ChainId: {
@@ -16,10 +15,10 @@ export const chainConfigMappings = {
         defaultValue: 31337,
         description: 'The chain ID of the ethereum host.'
     },
-    version: {
-        env: 'VERSION',
+    rollupVersion: {
+        env: 'ROLLUP_VERSION',
         description: 'The version of the rollup.',
-        ...numberConfigHelper(1)
+        parseEnv: (val)=>Number.isSafeInteger(parseInt(val, 10)) ? parseInt(val, 10) : undefined
     },
     l1Contracts: {
         description: 'The deployed L1 contract addresses',

package/dest/config/index.d.ts

@@ -1,2 +1,3 @@
-export * from './config.js';
+export * from './chain-config.js';
+export * from './node-rpc-config.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}

package/dest/config/index.js

@@ -1 +1,2 @@
-export * from './config.js';
+export * from './chain-config.js';
+export * from './node-rpc-config.js';

package/dest/config/node-rpc-config.d.ts

@@ -0,0 +1,11 @@
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+export declare const nodeRpcConfigMappings: ConfigMappingsType<NodeRPCConfig>;
+export type NodeRPCConfig = {
+    /** Maximum gas limit for public tx simulation in the node on `simulatePublicCalls`. */
+    rpcSimulatePublicMaxGasLimit: number;
+    /** Maximum allowed batch size for JSON RPC batch requests. */
+    rpcMaxBatchSize: number;
+    /** The maximum body size the RPC server will accept */
+    rpcMaxBodySize: string;
+};
+//# sourceMappingURL=node-rpc-config.d.ts.map

package/dest/config/node-rpc-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-rpc-config.d.ts","sourceRoot":"","sources":["../../src/config/node-rpc-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,0BAA0B,CAAC;AAEvF,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,CAAC,aAAa,CAgBnE,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,uFAAuF;IACvF,4BAA4B,EAAE,MAAM,CAAC;IACrC,8DAA8D;IAC9D,eAAe,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC"}

package/dest/config/node-rpc-config.js

@@ -0,0 +1,18 @@
+import { numberConfigHelper } from '@aztec/foundation/config';
+export const nodeRpcConfigMappings = {
+    rpcSimulatePublicMaxGasLimit: {
+        env: 'RPC_SIMULATE_PUBLIC_MAX_GAS_LIMIT',
+        description: 'Maximum gas limit for public tx simulation in the node on `simulatePublicCalls`.',
+        ...numberConfigHelper(10e9)
+    },
+    rpcMaxBatchSize: {
+        env: 'RPC_MAX_BATCH_SIZE',
+        description: 'Maximum allowed batch size for JSON RPC batch requests.',
+        ...numberConfigHelper(100)
+    },
+    rpcMaxBodySize: {
+        env: 'RPC_MAX_BODY_SIZE',
+        description: 'Maximum allowed batch size for JSON RPC batch requests.',
+        defaultValue: '50mb'
+    }
+};

package/dest/contract/artifact_hash.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { MerkleTree } from '@aztec/foundation/trees';
 import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '../abi/index.js';
@@ -11,15 +9,15 @@ import { type ContractArtifact, type FunctionArtifact, FunctionSelector, Functio
  *   sha256(fn.selector, fn.metadata_hash, sha256(fn.bytecode))
  * private_functions_artifact_tree_root = merkleize(private_functions_artifact_leaves)
  *
- * unconstrained_functions_artifact_leaves = artifact.unconstrained_functions.map fn =>
+ * utility_functions_artifact_leaves = artifact.utility_functions.map fn =>
  *   sha256(fn.selector, fn.metadata_hash, sha256(fn.bytecode))
- * unconstrained_functions_artifact_tree_root = merkleize(unconstrained_functions_artifact_leaves)
+ * utility_functions_artifact_tree_root = merkleize(utility_functions_artifact_leaves)
  *
  * version = 1
  * artifact_hash = sha256(
  *   version,
  *   private_functions_artifact_tree_root,
- *   unconstrained_functions_artifact_tree_root,
+ *   utility_functions_artifact_tree_root,
  *   artifact_metadata,
  * )
  * ```
@@ -27,12 +25,12 @@ import { type ContractArtifact, type FunctionArtifact, FunctionSelector, Functio
  */
 export declare function computeArtifactHash(artifact: ContractArtifact | {
     privateFunctionRoot: Fr;
-    unconstrainedFunctionRoot: Fr;
+    utilityFunctionRoot: Fr;
     metadataHash: Fr;
 }): Promise<Fr>;
 export declare function computeArtifactHashPreimage(artifact: ContractArtifact): Promise<{
     privateFunctionRoot: Fr;
-    unconstrainedFunctionRoot: Fr;
+    utilityFunctionRoot: Fr;
     metadataHash: Fr;
 }>;
 export declare function computeArtifactMetadataHash(artifact: ContractArtifact): Fr;
@@ -43,5 +41,5 @@ export declare function computeFunctionArtifactHash(fn: FunctionArtifact | (Pick
     selector: FunctionSelector;
 })): Promise<Fr>;
 export declare function computeFunctionMetadataHash(fn: FunctionArtifact): Fr;
-export declare function getArtifactMerkleTreeHasher(): (l: Buffer, r: Buffer) => Promise<Buffer>;
+export declare function getArtifactMerkleTreeHasher(): (l: Buffer, r: Buffer) => Promise<Buffer<ArrayBuffer>>;
 //# sourceMappingURL=artifact_hash.d.ts.map

package/dest/contract/artifact_hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artifact_hash.d.ts","sourceRoot":"","sources":["../../src/contract/artifact_hash.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAY,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAwB,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAS/G;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,gBAAgB,GAAG;IAAE,mBAAmB,EAAE,EAAE,CAAC;IAAC,yBAAyB,EAAE,EAAE,CAAC;IAAC,YAAY,EAAE,EAAE,CAAA;CAAE,GACxG,OAAO,CAAC,EAAE,CAAC,CAWb;AAED,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB;;;;GAK3E;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,MAErE;AAED,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,eAGrG;AAED,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CASjC;AAYD,wBAAsB,2BAA2B,CAC/C,EAAE,EACE,gBAAgB,GAChB,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAAG;IAAE,oBAAoB,EAAE,EAAE,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAC,eAOpG;AAED,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,gBAAgB,MAE/D;AAMD,wBAAgB,2BAA2B,QAC9B,MAAM,KAAK,MAAM,qBAC7B"}
+{"version":3,"file":"artifact_hash.d.ts","sourceRoot":"","sources":["../../src/contract/artifact_hash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAY,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAwB,MAAM,yBAAyB,CAAC;AAI3E,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAS/G;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,gBAAgB,GAAG;IAAE,mBAAmB,EAAE,EAAE,CAAC;IAAC,mBAAmB,EAAE,EAAE,CAAC;IAAC,YAAY,EAAE,EAAE,CAAA;CAAE,GAClG,OAAO,CAAC,EAAE,CAAC,CAWb;AAED,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB;;;;GAK3E;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,MAErE;AAED,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,eAGrG;AAED,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CASjC;AAYD,wBAAsB,2BAA2B,CAC/C,EAAE,EACE,gBAAgB,GAChB,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAAG;IAAE,oBAAoB,EAAE,EAAE,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAC,eAOpG;AAED,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,gBAAgB,MAE/D;AAMD,wBAAgB,2BAA2B,KACjC,GAAG,MAAM,EAAE,GAAG,MAAM,kCAC7B"}

package/dest/contract/artifact_hash.js

@@ -3,6 +3,7 @@ import { Fr, reduceFn } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { numToUInt8 } from '@aztec/foundation/serialize';
 import { MerkleTreeCalculator } from '@aztec/foundation/trees';
+import deterministicStringify from 'json-stringify-deterministic';
 import { FunctionSelector, FunctionType } from '../abi/index.js';
 const VERSION = 1;
 // TODO(miranda): Artifact and artifact metadata hashes are currently the only SHAs not truncated by a byte.
@@ -17,25 +18,25 @@ const sha256Fr = reduceFn(sha256, Fr);
  *   sha256(fn.selector, fn.metadata_hash, sha256(fn.bytecode))
  * private_functions_artifact_tree_root = merkleize(private_functions_artifact_leaves)
  *
- * unconstrained_functions_artifact_leaves = artifact.unconstrained_functions.map fn =>
+ * utility_functions_artifact_leaves = artifact.utility_functions.map fn =>
  *   sha256(fn.selector, fn.metadata_hash, sha256(fn.bytecode))
- * unconstrained_functions_artifact_tree_root = merkleize(unconstrained_functions_artifact_leaves)
+ * utility_functions_artifact_tree_root = merkleize(utility_functions_artifact_leaves)
  *
  * version = 1
  * artifact_hash = sha256(
  *   version,
  *   private_functions_artifact_tree_root,
- *   unconstrained_functions_artifact_tree_root,
+ *   utility_functions_artifact_tree_root,
  *   artifact_metadata,
  * )
  * ```
  * @param artifact - Artifact to calculate the hash for.
  */ export async function computeArtifactHash(artifact) {
-    if ('privateFunctionRoot' in artifact && 'unconstrainedFunctionRoot' in artifact && 'metadataHash' in artifact) {
-        const { privateFunctionRoot, unconstrainedFunctionRoot, metadataHash } = artifact;
+    if ('privateFunctionRoot' in artifact && 'utilityFunctionRoot' in artifact && 'metadataHash' in artifact) {
+        const { privateFunctionRoot, utilityFunctionRoot, metadataHash } = artifact;
         const preimage = [
             privateFunctionRoot,
-            unconstrainedFunctionRoot,
+            utilityFunctionRoot,
             metadataHash
         ].map((x)=>x.toBuffer());
         return sha256Fr(Buffer.concat([
@@ -53,16 +54,16 @@ const sha256Fr = reduceFn(sha256, Fr);
 }
 export async function computeArtifactHashPreimage(artifact) {
     const privateFunctionRoot = await computeArtifactFunctionTreeRoot(artifact, FunctionType.PRIVATE);
-    const unconstrainedFunctionRoot = await computeArtifactFunctionTreeRoot(artifact, FunctionType.UNCONSTRAINED);
+    const utilityFunctionRoot = await computeArtifactFunctionTreeRoot(artifact, FunctionType.UTILITY);
     const metadataHash = computeArtifactMetadataHash(artifact);
     return {
         privateFunctionRoot,
-        unconstrainedFunctionRoot,
+        utilityFunctionRoot,
         metadataHash
     };
 }
 export function computeArtifactMetadataHash(artifact) {
-    return sha256Fr(Buffer.from(JSON.stringify({
+    return sha256Fr(Buffer.from(deterministicStringify({
         name: artifact.name,
         outputs: artifact.outputs
     }), 'utf-8'));
@@ -101,7 +102,7 @@ export async function computeFunctionArtifactHash(fn) {
     ]));
 }
 export function computeFunctionMetadataHash(fn) {
-    return sha256Fr(Buffer.from(JSON.stringify(fn.returnTypes), 'utf8'));
+    return sha256Fr(Buffer.from(deterministicStringify(fn.returnTypes), 'utf8'));
 }
 function getLogger() {
     return createLogger('circuits:artifact_hash');

package/dest/contract/complete_address.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';

package/dest/contract/complete_address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"complete_address.d.ts","sourceRoot":"","sources":["../../src/contract/complete_address.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;GAOG;AACH,qBAAa,eAAe;IAExB,0DAA0D;IACnD,OAAO,EAAE,YAAY;IAC5B,uBAAuB;IAChB,UAAU,EAAE,UAAU;IAC7B,kEAAkE;IAC3D,cAAc,EAAE,cAAc;IANvC,OAAO;WASM,MAAM,CACjB,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,eAAe,CAAC;IAM3B,mCAAmC;IACnC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAW;IAExC,MAAM,KAAK,MAAM,8CAEhB;IAED,MAAM;WAIO,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC;WAIlC,8BAA8B,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlG,aAAa;WAIN,wBAAwB,CACnC,SAAS,EAAE,EAAE,EACb,QAAQ,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACpD,OAAO,CAAC,eAAe,CAAC;IAK3B,6FAA6F;IAChF,QAAQ;IAUrB;;;OAGG;IACI,gBAAgB,IAAI,MAAM;IAIjC;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAQvC;;;;;OAKG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAQ1E;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAI5D;;;;;OAKG;IACH,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"complete_address.d.ts","sourceRoot":"","sources":["../../src/contract/complete_address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;GAOG;AACH,qBAAa,eAAe;IAExB,0DAA0D;IACnD,OAAO,EAAE,YAAY;IAC5B,uBAAuB;IAChB,UAAU,EAAE,UAAU;IAC7B,kEAAkE;IAC3D,cAAc,EAAE,cAAc;IANvC,OAAO;WASM,MAAM,CACjB,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,eAAe,CAAC;IAM3B,mCAAmC;IACnC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAW;IAExC,MAAM,KAAK,MAAM,8CAEhB;IAED,MAAM;WAIO,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC;WAIlC,8BAA8B,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlG,aAAa;WAIN,wBAAwB,CACnC,SAAS,EAAE,EAAE,EACb,QAAQ,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACpD,OAAO,CAAC,eAAe,CAAC;IAK3B,6FAA6F;IAChF,QAAQ;IAUrB;;;OAGG;IACI,gBAAgB,IAAI,MAAM;IAIjC;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAQvC;;;;;OAKG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAQ1E;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAI5D;;;;;OAKG;IACH,QAAQ,IAAI,MAAM;CAGnB"}

package/dest/contract/contract_class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAkC,MAAM,iBAAiB,CAAC;AAG/G,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAkB,MAAM,uBAAuB,CAAC;AAEhG,oDAAoD;AACpD,KAAK,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAKxE,oEAAoE;AACpE,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CA0CxD;AAED,wBAAsB,2CAA2C,CAC/D,CAAC,EAAE,gBAAgB,GAClB,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAKpD;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,eAKnE"}
+{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAkC,MAAM,iBAAiB,CAAC;AAG/G,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,oDAAoD;AACpD,KAAK,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAKxE,oEAAoE;AACpE,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CA0BxD;AAED,wBAAsB,2CAA2C,CAC/D,CAAC,EAAE,gBAAgB,GAClB,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAKpD;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,eAKnE"}

package/dest/contract/contract_class.js

@@ -1,6 +1,4 @@
-import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
 import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
 import { FunctionSelector, FunctionType } from '../abi/index.js';
 import { hashVK } from '../hash/hash.js';
 import { computeArtifactHash } from './artifact_hash.js';
@@ -9,30 +7,16 @@ const cmpFunctionArtifacts = (a, b)=>a.selector.toField().cmp(b.selector.toField
 /** Creates a ContractClass from a contract compilation artifact. */ export async function getContractClassFromArtifact(artifact) {
     const artifactHash = 'artifactHash' in artifact ? artifact.artifactHash : await computeArtifactHash(artifact);
     const publicFunctions = artifact.functions.filter((f)=>f.functionType === FunctionType.PUBLIC);
-    const artifactPublicFunctions = await Promise.all(publicFunctions.map(async (f)=>({
-            selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-            bytecode: f.bytecode
-        })));
-    artifactPublicFunctions.sort(cmpFunctionArtifacts);
-    let packedBytecode = Buffer.alloc(0);
-    let dispatchFunction = undefined;
-    if (artifactPublicFunctions.length > 0) {
-        dispatchFunction = artifactPublicFunctions.find((f)=>f.selector.equals(FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR))));
-        if (!dispatchFunction) {
-            throw new Error(`A contract with public functions should define a public_dispatch(Field) function as its public entrypoint. Contract: ${artifact.name}`);
-        }
-        packedBytecode = dispatchFunction.bytecode;
+    if (publicFunctions.length > 1) {
+        throw new Error(`Contract should contain at most one public function artifact. Received ${publicFunctions.length}.`);
     }
+    const packedBytecode = publicFunctions[0]?.bytecode ?? Buffer.alloc(0);
     const privateFunctions = artifact.functions.filter((f)=>f.functionType === FunctionType.PRIVATE);
     const privateArtifactFunctions = await Promise.all(privateFunctions.map(getContractClassPrivateFunctionFromArtifact));
     privateArtifactFunctions.sort(cmpFunctionArtifacts);
     const contractClass = {
         version: 1,
         artifactHash,
-        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Remove public functions.
-        publicFunctions: dispatchFunction ? [
-            dispatchFunction
-        ] : [],
         packedBytecode,
         privateFunctions: privateArtifactFunctions
     };

package/dest/contract/contract_class_id.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import type { ContractClass } from './interfaces/contract_class.js';
 /**

package/dest/contract/contract_class_id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class_id.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_id.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhH;AAED,2EAA2E;AAC3E,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,aAAa,GAAG,uBAAuB,GACrD,OAAO,CAAC,uBAAuB,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,CAAC,CAe/C;AAED,0EAA0E;AAC1E,wBAAsB,8BAA8B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAInH;AAED,uCAAuC;AACvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,EAAE,EAAE,CAAC;IACjB,oBAAoB,EAAE,EAAE,CAAC;IACzB,wBAAwB,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF,wBAAsB,+BAA+B,CAAC,cAAc,EAAE,MAAM,eAQ3E"}
+{"version":3,"file":"contract_class_id.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhH;AAED,2EAA2E;AAC3E,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,aAAa,GAAG,uBAAuB,GACrD,OAAO,CAAC,uBAAuB,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,CAAC,CAe/C;AAED,0EAA0E;AAC1E,wBAAsB,8BAA8B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAInH;AAED,uCAAuC;AACvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,EAAE,EAAE,CAAC;IACjB,oBAAoB,EAAE,EAAE,CAAC;IACzB,wBAAwB,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF,wBAAsB,+BAA+B,CAAC,cAAc,EAAE,MAAM,eAc3E"}

package/dest/contract/contract_class_id.js

@@ -1,5 +1,5 @@
 import { GeneratorIndex, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS } from '@aztec/constants';
-import { poseidon2HashAccumulate, poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { strict as assert } from 'assert';
 import { bufferAsFields } from '../abi/index.js';
@@ -46,9 +46,11 @@ import { computePrivateFunctionsRoot } from './private_function.js';
 }
 export async function computePublicBytecodeCommitment(packedBytecode) {
     // Encode the buffer into field elements (chunked into 32 bytes each)
-    const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
     // The first element is the length of the bytecode (in bytes)
-    const bytecodeLength = Math.ceil(encodedBytecode[0].toNumber() / (Fr.SIZE_IN_BYTES - 1));
+    const [bytecodeLengthAsField, ...bytecodeAsFields] = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
+    const bytecodeLength = Math.ceil(bytecodeLengthAsField.toNumber() / (Fr.SIZE_IN_BYTES - 1));
     assert(bytecodeLength < MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, 'Bytecode exceeds maximum deployable size');
-    return bytecodeLength == 0 ? new Fr(0) : await poseidon2HashAccumulate(encodedBytecode.slice(0, bytecodeLength + 1));
+    // NOTE: hash the bytecode here only up to the actual length of the bytecode.
+    // We do not hash the entire max bytecode length!
+    return await poseidon2HashWithSeparator(bytecodeAsFields.slice(0, bytecodeLength), GeneratorIndex.PUBLIC_BYTECODE);
 }