@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

package/dest/tests/factories.js

@@ -1,26 +1,25 @@
-import { makeBatchedBlobAccumulator, makeSpongeBlob } from '@aztec/blob-lib/testing';
-import { ARCHIVE_HEIGHT, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, AZTEC_MAX_EPOCH_DURATION, CHONK_PROOF_LENGTH, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, FIXED_DA_GAS, FIXED_L2_GAS, GeneratorIndex, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_PER_CALL, MAX_ENQUEUED_CALLS_PER_TX, MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL, MAX_PRIVATE_LOGS_PER_TX, MAX_PROTOCOL_CONTRACTS, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, NUM_MSGS_PER_BASE_PARITY, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_DATA_TREE_HEIGHT, RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
-import { makeHalfFullTuple, makeTuple } from '@aztec/foundation/array';
-import { compact, padArrayEnd } from '@aztec/foundation/collection';
-import { Grumpkin, SchnorrSignature, poseidon2HashWithSeparator, sha256 } from '@aztec/foundation/crypto';
+import { makeBlobAccumulator, makeFinalBlobAccumulator, makeFinalBlobBatchingChallenges, makeSpongeBlob } from '@aztec/blob-lib/testing';
+import { ARCHIVE_HEIGHT, AVM_V2_PROOF_LENGTH_IN_FIELDS, CHONK_PROOF_LENGTH, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, MAX_CHECKPOINTS_PER_EPOCH, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_PER_CALL, MAX_ENQUEUED_CALLS_PER_TX, MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL, MAX_PRIVATE_LOGS_PER_TX, MAX_PROCESSABLE_L2_GAS, MAX_PROTOCOL_CONTRACTS, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, NUM_MSGS_PER_BASE_PARITY, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_DATA_TREE_HEIGHT, RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { compact } from '@aztec/foundation/collection';
+import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
+import { sha256 } from '@aztec/foundation/crypto/sha256';
+import { Fq, Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fq, Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import { FunctionSelector } from '../abi/function_selector.js';
-import { ContractStorageRead } from '../avm/contract_storage_read.js';
-import { ContractStorageUpdateRequest } from '../avm/contract_storage_update_request.js';
-import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths, AvmAppendLeavesHint, AvmBytecodeCommitmentHint, AvmCircuitInputs, AvmCircuitPublicInputs, AvmCommitCheckpointHint, AvmContractClassHint, AvmContractInstanceHint, AvmCreateCheckpointHint, AvmExecutionHints, AvmGetLeafPreimageHintNullifierTree, AvmGetLeafPreimageHintPublicDataTree, AvmGetLeafValueHint, AvmGetPreviousValueIndexHint, AvmGetSiblingPathHint, AvmRevertCheckpointHint, AvmSequentialInsertHintNullifierTree, AvmSequentialInsertHintPublicDataTree, AvmTxHint, RevertCode } from '../avm/index.js';
-import { PublicDataRead } from '../avm/public_data_read.js';
+import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths, AvmAppendLeavesHint, AvmBytecodeCommitmentHint, AvmCircuitInputs, AvmCircuitPublicInputs, AvmCommitCheckpointHint, AvmContractClassHint, AvmContractDbCommitCheckpointHint, AvmContractDbCreateCheckpointHint, AvmContractDbRevertCheckpointHint, AvmContractInstanceHint, AvmCreateCheckpointHint, AvmDebugFunctionNameHint, AvmExecutionHints, AvmGetLeafPreimageHintNullifierTree, AvmGetLeafPreimageHintPublicDataTree, AvmGetLeafValueHint, AvmGetPreviousValueIndexHint, AvmGetSiblingPathHint, AvmRevertCheckpointHint, AvmSequentialInsertHintNullifierTree, AvmSequentialInsertHintPublicDataTree, AvmTxHint } from '../avm/index.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { L2BlockHeader } from '../block/index.js';
-import { SerializableContractInstance, computeContractClassId, computePublicBytecodeCommitment } from '../contract/index.js';
-import { computeEffectiveGasFees } from '../fees/transaction_fee.js';
+import { BlockHash } from '../block/block_hash.js';
+import { ContractDeploymentData, SerializableContractInstance, computeContractClassId, computePartialAddress, computePublicBytecodeCommitment } from '../contract/index.js';
 import { Gas, GasFees, GasSettings } from '../gas/index.js';
 import { computeCalldataHash } from '../hash/hash.js';
 import { KeyValidationRequest } from '../kernel/hints/key_validation_request.js';
-import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { ReadRequest } from '../kernel/hints/read_request.js';
+import { KeyValidationRequestAndSeparator } from '../kernel/hints/key_validation_request_and_separator.js';
+import { ReadRequest, ScopedReadRequest } from '../kernel/hints/read_request.js';
 import { ClaimedLengthArray, PartialPrivateTailPublicInputsForPublic, PartialPrivateTailPublicInputsForRollup, PrivateKernelTailCircuitPublicInputs, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PrivateToPublicAccumulatedData, PrivateToPublicKernelCircuitPublicInputs, PrivateToRollupAccumulatedData } from '../kernel/index.js';
 import { CountedLogHash, LogHash, ScopedLogHash } from '../kernel/log_hash.js';
 import { NoteHash } from '../kernel/note_hash.js';
@@ -30,17 +29,17 @@ import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inp
 import { PrivateLogData } from '../kernel/private_log_data.js';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
 import { CountedPublicCallRequest, PublicCallRequest, PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
-import { PublicKeys, computeAddress } from '../keys/index.js';
-import { ContractClassLogFields } from '../logs/index.js';
+import { PublicKey, PublicKeys, computeAddress, hashPublicKey } from '../keys/index.js';
+import { AppTaggingSecret } from '../logs/app_tagging_secret.js';
+import { ContractClassLog, ContractClassLogFields } from '../logs/index.js';
 import { PrivateLog } from '../logs/private_log.js';
 import { FlatPublicLogs, PublicLog } from '../logs/public_log.js';
 import { CountedL2ToL1Message, L2ToL1Message, ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { ParityBasePrivateInputs } from '../parity/parity_base_private_inputs.js';
 import { ParityPublicInputs } from '../parity/parity_public_inputs.js';
 import { ParityRootPrivateInputs } from '../parity/parity_root_private_inputs.js';
-import { ProofData } from '../proofs/index.js';
+import { ProofData, ProofDataForFixedVk } from '../proofs/index.js';
 import { Proof } from '../proofs/proof.js';
-import { ProvingRequestType } from '../proofs/proving_request_type.js';
 import { makeRecursiveProof } from '../proofs/recursive_proof.js';
 import { PrivateBaseRollupHints, PublicBaseRollupHints } from '../rollup/base_rollup_hints.js';
 import { BlockConstantData } from '../rollup/block_constant_data.js';
@@ -64,22 +63,20 @@ import { NullifierLeaf, NullifierLeafPreimage } from '../trees/nullifier_leaf.js
 import { PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { CallContext } from '../tx/call_context.js';
-import { ContentCommitment } from '../tx/content_commitment.js';
 import { FunctionData } from '../tx/function_data.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '../tx/processed_tx.js';
 import { ProtocolContracts } from '../tx/protocol_contracts.js';
 import { PublicCallRequestWithCalldata } from '../tx/public_call_request_with_calldata.js';
 import { StateReference } from '../tx/state_reference.js';
 import { TreeSnapshots } from '../tx/tree_snapshots.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
 import { TxContext } from '../tx/tx_context.js';
+import { TxHash } from '../tx/tx_hash.js';
 import { TxRequest } from '../tx/tx_request.js';
 import { Vector } from '../types/index.js';
 import { VkData } from '../vks/index.js';
-import { VerificationKey, VerificationKeyAsFields, VerificationKeyData } from '../vks/verification_key.js';
-import { mockTx } from './mocks.js';
+import { VerificationKeyAsFields, VerificationKeyData } from '../vks/verification_key.js';
 /**
  * Creates an arbitrary side effect object with the given seed.
  * @param seed - The seed to use for generating the object.
@@ -119,7 +116,10 @@ function makePublicLog(seed) {
 /**
  * Creates a default instance of gas settings. No seed value is used to ensure we allocate a sensible amount of gas for testing.
  */ export function makeGasSettings() {
-    return GasSettings.default({
+    return GasSettings.fallback({
+        // Arbitrary daGas pinned to the pre-existing fixture value so avm_inputs.testdata.bin (consumed by
+        // the C++ vm2 tests) stays byte-stable; teardown derives to the same values the old fallback produced.
+        gasLimits: new Gas(196_608, MAX_PROCESSABLE_L2_GAS),
         maxFeesPerGas: new GasFees(10, 10)
     });
 }
@@ -130,66 +130,41 @@ function makePublicLog(seed) {
  */ export function makeSelector(seed) {
     return new FunctionSelector(seed);
 }
-function makeReadRequest(n) {
-    return new ReadRequest(new Fr(BigInt(n)), n + 1);
+function makeScopedReadRequest(n) {
+    return new ScopedReadRequest(new ReadRequest(new Fr(BigInt(n)), n + 1), makeAztecAddress(n + 2));
 }
 /**
  * Creates arbitrary KeyValidationRequest from the given seed.
  * @param seed - The seed to use for generating the KeyValidationRequest.
  * @returns A KeyValidationRequest.
  */ function makeKeyValidationRequests(seed) {
-    return new KeyValidationRequest(makePoint(seed), fr(seed + 2));
+    return new KeyValidationRequest(fr(seed), fr(seed + 2));
 }
 /**
- * Creates arbitrary KeyValidationRequestAndGenerator from the given seed.
- * @param seed - The seed to use for generating the KeyValidationRequestAndGenerator.
- * @returns A KeyValidationRequestAndGenerator.
- */ function makeKeyValidationRequestAndGenerators(seed) {
-    return new KeyValidationRequestAndGenerator(makeKeyValidationRequests(seed), fr(seed + 4));
+ * Creates arbitrary KeyValidationRequestAndSeparator from the given seed.
+ * @param seed - The seed to use for generating the KeyValidationRequestAndSeparator.
+ * @returns A KeyValidationRequestAndSeparator.
+ */ function makeKeyValidationRequestAndSeparators(seed) {
+    return new KeyValidationRequestAndSeparator(makeKeyValidationRequests(seed), fr(seed + 4));
 }
-function makePublicDataWrite(seed = 1) {
+export function makePublicDataWrite(seed = 1) {
     return new PublicDataWrite(fr(seed), fr(seed + 1));
 }
-/**
- * Creates arbitrary public data read.
- * @param seed - The seed to use for generating the public data read.
- * @returns A public data read.
- */ export function makePublicDataRead(seed = 1) {
-    return new PublicDataRead(fr(seed), fr(seed + 1), 0);
-}
-/**
- * Creates empty public data read.
- * @returns An empty public data read.
- */ export function makeEmptyPublicDataRead() {
-    return new PublicDataRead(fr(0), fr(0), 0);
-}
-/**
- * Creates arbitrary contract storage update request.
- * @param seed - The seed to use for generating the contract storage update request.
- * @returns A contract storage update request.
- */ export function makeContractStorageUpdateRequest(seed = 1) {
-    return new ContractStorageUpdateRequest(fr(seed), fr(seed + 1), seed + 2);
-}
-/**
- * Creates arbitrary contract storage read.
- * @param seed - The seed to use for generating the contract storage read.
- * @returns A contract storage read.
- */ export function makeContractStorageRead(seed = 1) {
-    return new ContractStorageRead(fr(seed), fr(seed + 1), seed + 2);
-}
 function makeTxConstantData(seed = 1) {
-    return new TxConstantData(makeHeader(seed), makeTxContext(seed + 0x100), new Fr(seed + 0x200), new Fr(seed + 0x201));
+    return new TxConstantData(makeBlockHeader(seed), makeTxContext(seed + 0x100), new Fr(seed + 0x200), new Fr(seed + 0x201));
+}
+function makePaddedTuple(length, fn, nonPaddedLength = 0, makePadding, offset = 0) {
+    return makeTuple(length, (i)=>i < nonPaddedLength ? fn(i + offset) : makePadding());
 }
 /**
  * Creates arbitrary accumulated data.
  * @param seed - The seed to use for generating the accumulated data.
  * @returns An accumulated data.
- */ export function makePrivateToRollupAccumulatedData(seed = 1, full = false) {
-    const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
-    return new PrivateToRollupAccumulatedData(tupleGenerator(MAX_NOTE_HASHES_PER_TX, fr, seed + 0x120, Fr.zero), tupleGenerator(MAX_NULLIFIERS_PER_TX, fr, seed + 0x200, Fr.zero), tupleGenerator(MAX_L2_TO_L1_MSGS_PER_TX, makeScopedL2ToL1Message, seed + 0x600, ScopedL2ToL1Message.empty), tupleGenerator(MAX_PRIVATE_LOGS_PER_TX, makePrivateLog, seed + 0x700, PrivateLog.empty), tupleGenerator(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeScopedLogHash, seed + 0xa00, ScopedLogHash.empty));
+ */ export function makePrivateToRollupAccumulatedData(seed = 1, { numNoteHashes = MAX_NOTE_HASHES_PER_TX, numNullifiers = MAX_NULLIFIERS_PER_TX, numL2ToL1Messages = MAX_L2_TO_L1_MSGS_PER_TX, numPrivateLogs = MAX_PRIVATE_LOGS_PER_TX, numContractClassLogs = MAX_CONTRACT_CLASS_LOGS_PER_TX } = {}) {
+    return new PrivateToRollupAccumulatedData(makePaddedTuple(MAX_NOTE_HASHES_PER_TX, fr, numNoteHashes, Fr.zero, seed + 0x100), makePaddedTuple(MAX_NULLIFIERS_PER_TX, fr, numNullifiers, Fr.zero, seed + 0x200), makePaddedTuple(MAX_L2_TO_L1_MSGS_PER_TX, makeScopedL2ToL1Message, numL2ToL1Messages, ScopedL2ToL1Message.empty, seed + 0x300), makePaddedTuple(MAX_PRIVATE_LOGS_PER_TX, makePrivateLog, numPrivateLogs, PrivateLog.empty, seed + 0x400), makePaddedTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeScopedLogHash, numContractClassLogs, ScopedLogHash.empty, seed + 0x500));
 }
-export function makePrivateToPublicAccumulatedData(seed = 1) {
-    return new PrivateToPublicAccumulatedData(makeTuple(MAX_NOTE_HASHES_PER_TX, fr, seed), makeTuple(MAX_NULLIFIERS_PER_TX, fr, seed + 0x100), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, makeScopedL2ToL1Message, seed + 0x200), makeTuple(MAX_PRIVATE_LOGS_PER_TX, makePrivateLog, seed + 0x700), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeScopedLogHash, seed + 0x900), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, makePublicCallRequest, seed + 0x500));
+export function makePrivateToPublicAccumulatedData(seed = 1, { numNoteHashes = MAX_NOTE_HASHES_PER_TX, numNullifiers = MAX_NULLIFIERS_PER_TX, numL2ToL1Messages = MAX_L2_TO_L1_MSGS_PER_TX, numPrivateLogs = MAX_PRIVATE_LOGS_PER_TX, numContractClassLogs = MAX_CONTRACT_CLASS_LOGS_PER_TX, numEnqueuedCalls = MAX_ENQUEUED_CALLS_PER_TX } = {}) {
+    return new PrivateToPublicAccumulatedData(makePaddedTuple(MAX_NOTE_HASHES_PER_TX, fr, numNoteHashes, Fr.zero, seed), makePaddedTuple(MAX_NULLIFIERS_PER_TX, fr, numNullifiers, Fr.zero, seed + 0x100), makePaddedTuple(MAX_L2_TO_L1_MSGS_PER_TX, makeScopedL2ToL1Message, numL2ToL1Messages, ScopedL2ToL1Message.empty, seed + 0x200), makePaddedTuple(MAX_PRIVATE_LOGS_PER_TX, makePrivateLog, numPrivateLogs, PrivateLog.empty, seed + 0x300), makePaddedTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeScopedLogHash, numContractClassLogs, ScopedLogHash.empty, seed + 0x400), makePaddedTuple(MAX_ENQUEUED_CALLS_PER_TX, makePublicCallRequest, numEnqueuedCalls, PublicCallRequest.empty, seed + 0x500));
 }
 function makePrivateToAvmAccumulatedData(seed = 1) {
     return new PrivateToAvmAccumulatedData(makeTuple(MAX_NOTE_HASHES_PER_TX, fr, seed), makeTuple(MAX_NULLIFIERS_PER_TX, fr, seed + 0x100), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, makeScopedL2ToL1Message, seed + 0x200));
@@ -204,7 +179,10 @@ function makeAvmAccumulatedDataArrayLengths(seed = 1) {
     return new AvmAccumulatedDataArrayLengths(seed, seed + 1, seed + 2, seed + 3);
 }
 export function makeGas(seed = 1) {
-    return new Gas(seed, seed + 1);
+    // Constrain gas values to u32 range
+    const daGas = seed % 2 ** 32;
+    const l2Gas = (seed + 1) % 2 ** 32;
+    return new Gas(daGas, l2Gas);
 }
 /**
  * Creates arbitrary call context.
@@ -241,8 +219,8 @@ export function makeProtocolContracts(seed = 1) {
  * Creates arbitrary public kernel circuit public inputs.
  * @param seed - The seed to use for generating the kernel circuit public inputs.
  * @returns Public kernel circuit public inputs.
- */ export function makePrivateToRollupKernelCircuitPublicInputs(seed = 1, fullAccumulatedData = true) {
-    return new PrivateToRollupKernelCircuitPublicInputs(makeTxConstantData(seed + 0x100), makePrivateToRollupAccumulatedData(seed, fullAccumulatedData), makeGas(seed + 0x600), makeAztecAddress(seed + 0x700), BigInt(seed + 0x800));
+ */ export function makePrivateToRollupKernelCircuitPublicInputs(seed = 1) {
+    return new PrivateToRollupKernelCircuitPublicInputs(makeTxConstantData(seed + 0x100), makePrivateToRollupAccumulatedData(seed), makeGas(seed + 0x600), makeAztecAddress(seed + 0x700), BigInt(seed + 0x800));
 }
 function makeAvmCircuitPublicInputs(seed = 1) {
     return new AvmCircuitPublicInputs(makeGlobalVariables(seed), makeProtocolContracts(seed + 0x100), makeTreeSnapshots(seed + 0x10), makeGas(seed + 0x20), makeGasSettings(), makeGasFees(seed + 0x30), makeAztecAddress(seed + 0x40), fr(seed + 0x50), makePublicCallRequestArrayLengths(seed + 0x60), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, makePublicCallRequest, seed + 0x100), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, makePublicCallRequest, seed + 0x200), makePublicCallRequest(seed + 0x300), makePrivateToAvmAccumulatedDataArrayLengths(seed + 0x400), makePrivateToAvmAccumulatedDataArrayLengths(seed + 0x410), makePrivateToAvmAccumulatedData(seed + 0x500), makePrivateToAvmAccumulatedData(seed + 0x600), makeTreeSnapshots(seed + 0x700), makeGas(seed + 0x750), makeAvmAccumulatedDataArrayLengths(seed + 0x800), makeAvmAccumulatedData(seed + 0x800), fr(seed + 0x900), false);
@@ -264,18 +242,12 @@ function makeSiblingPath(seed, size) {
  */ export function makeVerificationKeyAsFields(size) {
     return VerificationKeyAsFields.makeFake(size);
 }
-/**
- * Creates arbitrary/mocked verification key.
- * @returns A verification key object
- */ export function makeVerificationKey() {
-    return VerificationKey.makeFake();
-}
 /**
  * Creates an arbitrary point in a curve.
  * @param seed - Seed to generate the point values.
  * @returns A point.
  */ export function makePoint(seed = 1) {
-    return new Point(fr(seed), fr(seed + 1), false);
+    return new Point(fr(seed), fr(seed + 1));
 }
 /**
  * Creates an arbitrary grumpkin scalar.
@@ -325,16 +297,16 @@ function makeClaimedLengthArray(arraySize, makeItem, seed, length = arraySize) {
  * @returns A private circuit public inputs.
  */ export function makePrivateCircuitPublicInputs(seed = 0) {
     return PrivateCircuitPublicInputs.from({
-        includeByTimestamp: BigInt(seed + 0x31415),
+        expirationTimestamp: BigInt(seed + 0x31415),
         callContext: makeCallContext(seed, {
             isStaticCall: true
         }),
         argsHash: fr(seed + 0x100),
         returnsHash: fr(seed + 0x200),
         minRevertibleSideEffectCounter: fr(0),
-        noteHashReadRequests: makeClaimedLengthArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x300),
-        nullifierReadRequests: makeClaimedLengthArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x310),
-        keyValidationRequestsAndGenerators: makeClaimedLengthArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, makeKeyValidationRequestAndGenerators, seed + 0x320),
+        noteHashReadRequests: makeClaimedLengthArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, makeScopedReadRequest, seed + 0x300),
+        nullifierReadRequests: makeClaimedLengthArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, makeScopedReadRequest, seed + 0x310),
+        keyValidationRequestsAndSeparators: makeClaimedLengthArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, makeKeyValidationRequestAndSeparators, seed + 0x320),
         noteHashes: makeClaimedLengthArray(MAX_NOTE_HASHES_PER_CALL, makeNoteHash, seed + 0x400),
         nullifiers: makeClaimedLengthArray(MAX_NULLIFIERS_PER_CALL, makeNullifier, seed + 0x500),
         privateCallRequests: makeClaimedLengthArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, makePrivateCallRequest, seed + 0x600),
@@ -345,20 +317,23 @@ function makeClaimedLengthArray(arraySize, makeItem, seed, length = arraySize) {
         contractClassLogsHashes: makeClaimedLengthArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeCountedLogHash, seed + 0xa00),
         startSideEffectCounter: fr(seed + 0x849),
         endSideEffectCounter: fr(seed + 0x850),
-        anchorBlockHeader: makeHeader(seed + 0xd00, undefined),
+        expectedNonRevertibleSideEffectCounter: fr(seed + 0x860),
+        expectedRevertibleSideEffectCounter: fr(seed + 0x861),
+        anchorBlockHeader: makeBlockHeader(seed + 0xd00),
         txContext: makeTxContext(seed + 0x1400),
-        isFeePayer: false
+        isFeePayer: false,
+        txRequestSalt: fr(seed + 0x1500)
     });
 }
 export function makeGlobalVariables(seed = 1, overrides = {}) {
     return GlobalVariables.from({
         chainId: new Fr(seed),
         version: new Fr(seed + 1),
-        blockNumber: seed + 2,
-        slotNumber: new Fr(seed + 3),
+        blockNumber: BlockNumber(seed + 2),
+        slotNumber: SlotNumber(seed + 3),
         timestamp: BigInt(seed + 4),
         coinbase: EthAddress.fromField(new Fr(seed + 5)),
-        feeRecipient: AztecAddress.fromField(new Fr(seed + 6)),
+        feeRecipient: AztecAddress.fromFieldUnsafe(new Fr(seed + 6)),
         gasFees: new GasFees(seed + 7, seed + 8),
         ...compact(overrides)
     });
@@ -374,7 +349,9 @@ function makeFeeRecipient(seed = 1) {
  * @param seed - The seed to use for generating the append only tree snapshot.
  * @returns An append only tree snapshot.
  */ export function makeAppendOnlyTreeSnapshot(seed = 1) {
-    return new AppendOnlyTreeSnapshot(fr(seed), seed);
+    // Constrain nextAvailableLeafIndex to u32 range
+    const nextAvailableLeafIndex = seed % 2 ** 32;
+    return new AppendOnlyTreeSnapshot(fr(seed), nextAvailableLeafIndex);
 }
 /**
  * Makes arbitrary eth address.
@@ -396,20 +373,13 @@ function makeFeeRecipient(seed = 1) {
  * @param seed - The seed to use for generating the aztec address.
  * @returns An aztec address.
  */ export function makeAztecAddress(seed = 1) {
-    return AztecAddress.fromField(fr(seed));
-}
-/**
- * Makes arbitrary Schnorr signature.
- * @param seed - The seed to use for generating the Schnorr signature.
- * @returns A Schnorr signature.
- */ export function makeSchnorrSignature(seed = 1) {
-    return new SchnorrSignature(Buffer.alloc(SchnorrSignature.SIZE, seed));
+    return AztecAddress.fromFieldUnsafe(fr(seed));
 }
 function makeBlockConstantData(seed = 1, globalVariables) {
     return new BlockConstantData(makeAppendOnlyTreeSnapshot(seed + 0x100), makeAppendOnlyTreeSnapshot(seed + 0x200), fr(seed + 0x300), fr(seed + 0x400), globalVariables ?? makeGlobalVariables(seed + 0x500), fr(seed + 0x600));
 }
 function makeCheckpointConstantData(seed = 1) {
-    return new CheckpointConstantData(fr(seed), fr(seed + 1), fr(seed + 2), fr(seed + 3), fr(seed + 4), fr(seed + 5), makeEthAddress(seed + 6), makeAztecAddress(seed + 7), makeGasFees(seed + 8));
+    return new CheckpointConstantData(fr(seed), fr(seed + 1), fr(seed + 2), fr(seed + 3), fr(seed + 4), SlotNumber(seed + 5), makeEthAddress(seed + 6), makeAztecAddress(seed + 7), makeGasFees(seed + 8));
 }
 function makeEpochConstantData(seed = 1) {
     return new EpochConstantData(fr(seed), fr(seed + 1), fr(seed + 2), fr(seed + 3), fr(seed + 4));
@@ -428,17 +398,16 @@ function makeEpochConstantData(seed = 1) {
  * @param blockNumber - The block number to use for generating the block merge or block root rollup circuit public inputs.
  * @returns A block merge or block root rollup circuit public inputs.
  */ export function makeBlockRollupPublicInputs(seed = 0) {
-    return new BlockRollupPublicInputs(makeCheckpointConstantData(seed + 0x100), makeAppendOnlyTreeSnapshot(seed + 0x200), makeAppendOnlyTreeSnapshot(seed + 0x300), makeStateReference(seed + 0x400), makeStateReference(seed + 0x500), makeSpongeBlob(seed + 0x600), makeSpongeBlob(seed + 0x700), BigInt(seed + 0x810), BigInt(seed + 0x820), fr(seed + 0x830), fr(seed + 0x840), fr(seed + 0x850), fr(seed + 0x860));
+    return new BlockRollupPublicInputs(makeCheckpointConstantData(seed + 0x100), makeAppendOnlyTreeSnapshot(seed + 0x200), makeAppendOnlyTreeSnapshot(seed + 0x300), makeStateReference(seed + 0x400), makeStateReference(seed + 0x500), makeSpongeBlob(seed + 0x600), makeSpongeBlob(seed + 0x700), BigInt(seed + 0x800), fr(seed + 0x820), fr(seed + 0x830), fr(seed + 0x840), fr(seed + 0x850), fr(seed + 0x860));
 }
 export function makeCheckpointRollupPublicInputs(seed = 0) {
-    const startBlobAccumulator = makeBatchedBlobAccumulator(seed);
-    return new CheckpointRollupPublicInputs(makeEpochConstantData(seed), makeAppendOnlyTreeSnapshot(seed + 0x100), makeAppendOnlyTreeSnapshot(seed + 0x200), makeTuple(AZTEC_MAX_EPOCH_DURATION, ()=>fr(seed), 0x300), makeTuple(AZTEC_MAX_EPOCH_DURATION, ()=>makeFeeRecipient(seed), 0x700), startBlobAccumulator.toBlobAccumulator(), makeBatchedBlobAccumulator(seed + 1).toBlobAccumulator(), startBlobAccumulator.finalBlobChallenges);
+    return new CheckpointRollupPublicInputs(makeEpochConstantData(seed), makeAppendOnlyTreeSnapshot(seed + 0x100), makeAppendOnlyTreeSnapshot(seed + 0x200), makeAppendOnlyTreeSnapshot(seed + 0x300), makeAppendOnlyTreeSnapshot(seed + 0x350), makeTuple(MAX_CHECKPOINTS_PER_EPOCH, ()=>fr(seed), 0x400), makeTuple(MAX_CHECKPOINTS_PER_EPOCH, ()=>makeFeeRecipient(seed), 0x500), makeBlobAccumulator(seed + 0x600), makeBlobAccumulator(seed + 0x700), makeFinalBlobBatchingChallenges(seed + 0x800));
 }
 export function makeParityPublicInputs(seed = 0) {
-    return new ParityPublicInputs(new Fr(BigInt(seed + 0x200)), new Fr(BigInt(seed + 0x300)), new Fr(BigInt(seed + 0x400)));
+    return new ParityPublicInputs(new Fr(BigInt(seed + 0x200)), new Fr(BigInt(seed + 0x300)), new Fr(BigInt(seed + 0x400)), new Fr(BigInt(seed + 0x500)));
 }
 export function makeParityBasePrivateInputs(seed = 0) {
-    return new ParityBasePrivateInputs(makeTuple(NUM_MSGS_PER_BASE_PARITY, fr, seed + 0x3000), new Fr(seed + 0x4000));
+    return new ParityBasePrivateInputs(makeTuple(NUM_MSGS_PER_BASE_PARITY, fr, seed + 0x3000), new Fr(seed + 0x4000), new Fr(seed + 0x5000));
 }
 export function makeParityRootPrivateInputs(seed = 0) {
     return new ParityRootPrivateInputs(makeTuple(NUM_BASE_PARITY_PER_ROOT_PARITY, ()=>makeProofData(seed, makeParityPublicInputs)));
@@ -449,53 +418,34 @@ export function makeParityRootPrivateInputs(seed = 0) {
  * @param blockNumber - The block number to use in the global variables of a header.
  * @returns A root rollup public inputs.
  */ export function makeRootRollupPublicInputs(seed = 0) {
-    return new RootRollupPublicInputs(fr(seed + 0x100), fr(seed + 0x200), makeTuple(AZTEC_MAX_EPOCH_DURATION, ()=>fr(seed), 0x300), makeTuple(AZTEC_MAX_EPOCH_DURATION, ()=>makeFeeRecipient(seed), 0x500), makeEpochConstantData(seed + 0x600), makeBatchedBlobAccumulator(seed).toFinalBlobAccumulator());
+    return new RootRollupPublicInputs(fr(seed + 0x100), fr(seed + 0x200), fr(seed + 0x300), makeTuple(MAX_CHECKPOINTS_PER_EPOCH, ()=>fr(seed), 0x400), makeTuple(MAX_CHECKPOINTS_PER_EPOCH, ()=>makeFeeRecipient(seed), 0x500), makeEpochConstantData(seed + 0x600), makeFinalBlobAccumulator(seed + 0x700));
 }
-/**
- * Makes content commitment
- */ export function makeContentCommitment(seed = 0) {
-    return new ContentCommitment(fr(seed + 0x100), fr(seed + 0x200), fr(seed + 0x300));
-}
-/**
- * Makes header.
- */ export function makeHeader(seed = 0, blockNumber = undefined, slotNumber = undefined, overrides = {}) {
+export function makeBlockHeader(seed = 0, overrides = {}) {
     return BlockHeader.from({
         lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x100),
         state: makeStateReference(seed + 0x200),
         spongeBlobHash: fr(seed + 0x300),
-        globalVariables: makeGlobalVariables(seed += 0x700, {
-            ...blockNumber ? {
-                blockNumber
-            } : {},
-            ...slotNumber ? {
-                slotNumber: new Fr(slotNumber)
-            } : {}
-        }),
+        globalVariables: makeGlobalVariables(seed += 0x700, overrides),
         totalFees: fr(seed + 0x800),
         totalManaUsed: fr(seed + 0x900),
         ...overrides
     });
 }
-export function makeL2BlockHeader(seed = 0, blockNumber, slotNumber, overrides = {}) {
-    return new L2BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200), overrides?.state ?? makeStateReference(seed + 0x600), makeGlobalVariables(seed += 0x700, {
-        ...blockNumber ? {
-            blockNumber
-        } : {},
-        ...slotNumber ? {
-            slotNumber: new Fr(slotNumber)
-        } : {}
-    }), new Fr(seed + 0x800), new Fr(seed + 0x900), new Fr(seed + 0xa00));
-}
-export function makeCheckpointHeader(seed = 0) {
+export function makeCheckpointHeader(seed = 0, overrides = {}) {
     return CheckpointHeader.from({
         lastArchiveRoot: fr(seed + 0x100),
-        contentCommitment: makeContentCommitment(seed + 0x200),
-        slotNumber: new Fr(seed + 0x300),
+        blockHeadersHash: fr(seed + 0x150),
+        blobsHash: fr(seed + 0x200),
+        inHash: fr(seed + 0x210),
+        epochOutHash: fr(seed + 0x220),
+        slotNumber: SlotNumber(seed + 0x300),
         timestamp: BigInt(seed + 0x400),
         coinbase: makeEthAddress(seed + 0x500),
         feeRecipient: makeAztecAddress(seed + 0x600),
         gasFees: makeGasFees(seed + 0x700),
-        totalManaUsed: fr(seed + 0x800)
+        totalManaUsed: fr(seed + 0x800),
+        accumulatedFees: fr(seed + 0x850),
+        ...overrides
     });
 }
 /**
@@ -520,7 +470,7 @@ function makeTreeSnapshots(seed = 0) {
 function makeCountedL2ToL1Message(seed = 0) {
     return new CountedL2ToL1Message(makeL2ToL1Message(seed), seed + 2);
 }
-function makeScopedL2ToL1Message(seed = 1) {
+export function makeScopedL2ToL1Message(seed = 1) {
     return new ScopedL2ToL1Message(makeL2ToL1Message(seed), makeAztecAddress(seed + 3));
 }
 /**
@@ -603,6 +553,9 @@ function makeVkData(seed = 1) {
 export function makeProofData(seed = 0, makePublicInputs, proofSize = NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {
     return new ProofData(makePublicInputs(seed), makeRecursiveProof(proofSize, seed + 0x100), makeVkData(seed + 0x200));
 }
+function makeProofDataForFixedVk(seed = 0, makePublicInputs, proofSize = NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH) {
+    return new ProofDataForFixedVk(makePublicInputs(seed), makeRecursiveProof(proofSize, seed + 0x100));
+}
 function makeContractClassLogFields(seed = 1) {
     return new ContractClassLogFields(makeArray(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, fr, seed));
 }
@@ -640,7 +593,7 @@ export function makePrivateTxBaseRollupPrivateInputs(seed = 0) {
 }
 export function makePublicTxBaseRollupPrivateInputs(seed = 0) {
     const publicChonkVerifierProofData = makeProofData(seed, makePublicChonkVerifierPublicInputs, RECURSIVE_ROLLUP_HONK_PROOF_LENGTH);
-    const avmProofData = makeProofData(seed + 0x100, makeAvmCircuitPublicInputs, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
+    const avmProofData = makeProofDataForFixedVk(seed + 0x100, makeAvmCircuitPublicInputs, AVM_V2_PROOF_LENGTH_IN_FIELDS);
     const hints = makePublicBaseRollupHints(seed + 0x200);
     return PublicTxBaseRollupPrivateInputs.from({
         publicChonkVerifierProofData,
@@ -648,31 +601,6 @@ export function makePublicTxBaseRollupPrivateInputs(seed = 0) {
         hints
     });
 }
-export function makeExecutablePrivateFunctionWithMembershipProof(seed = 0) {
-    return {
-        selector: makeSelector(seed),
-        bytecode: makeBytes(100, seed + 1),
-        artifactTreeSiblingPath: makeTuple(3, fr, seed + 2),
-        artifactTreeLeafIndex: seed + 2,
-        privateFunctionTreeSiblingPath: makeTuple(3, fr, seed + 3),
-        privateFunctionTreeLeafIndex: seed + 3,
-        artifactMetadataHash: fr(seed + 4),
-        functionMetadataHash: fr(seed + 5),
-        utilityFunctionsTreeRoot: fr(seed + 6),
-        vkHash: fr(seed + 7)
-    };
-}
-export function makeUtilityFunctionWithMembershipProof(seed = 0) {
-    return {
-        selector: makeSelector(seed),
-        bytecode: makeBytes(100, seed + 1),
-        artifactTreeSiblingPath: makeTuple(3, fr, seed + 2),
-        artifactTreeLeafIndex: seed + 2,
-        artifactMetadataHash: fr(seed + 4),
-        functionMetadataHash: fr(seed + 5),
-        privateFunctionsArtifactTreeRoot: fr(seed + 6)
-    };
-}
 export async function makeContractClassPublic(seed = 0, publicBytecode) {
     const artifactHash = fr(seed + 1);
     const privateFunctionsRoot = fr(seed + 3);
@@ -688,8 +616,6 @@ export async function makeContractClassPublic(seed = 0, publicBytecode) {
         artifactHash,
         packedBytecode,
         privateFunctionsRoot,
-        privateFunctions: [],
-        utilityFunctions: [],
         version: 1
     };
 }
@@ -722,30 +648,31 @@ export async function makeMapAsync(size, fn, offset = 0) {
 }
 export async function makePublicKeys(seed = 0) {
     const f = (offset)=>Grumpkin.mul(Grumpkin.generator, new Fq(seed + offset));
-    return new PublicKeys(await f(0), await f(1), await f(2), await f(3));
+    const ivpkM = await f(1);
+    return new PublicKeys(await hashPublicKey(await f(0)), ivpkM, await hashPublicKey(await f(2)), await hashPublicKey(await f(3)), await hashPublicKey(await f(4)), await hashPublicKey(await f(5)));
 }
 export async function makeContractInstanceFromClassId(classId, seed = 0, overrides) {
     const salt = new Fr(seed);
     const initializationHash = overrides?.initializationHash ?? new Fr(seed + 1);
     const deployer = overrides?.deployer ?? new AztecAddress(new Fr(seed + 2));
     const publicKeys = overrides?.publicKeys ?? await makePublicKeys(seed + 3);
-    const saltedInitializationHash = await poseidon2HashWithSeparator([
+    const immutablesHash = overrides?.immutablesHash ?? new Fr(seed + 4);
+    const partialAddress = await computePartialAddress({
+        originalContractClassId: classId,
         salt,
         initializationHash,
+        immutablesHash,
         deployer
-    ], GeneratorIndex.PARTIAL_ADDRESS);
-    const partialAddress = await poseidon2HashWithSeparator([
-        classId,
-        saltedInitializationHash
-    ], GeneratorIndex.PARTIAL_ADDRESS);
+    });
     const address = await computeAddress(publicKeys, partialAddress);
     return new SerializableContractInstance({
-        version: 1,
+        version: 2,
         salt,
         deployer,
         currentContractClassId: overrides?.currentClassId ?? classId,
         originalContractClassId: classId,
         initializationHash,
+        immutablesHash,
         publicKeys
     }).withAddress(address);
 }
@@ -814,24 +741,40 @@ export function makeAvmCheckpointActionCommitCheckpointHint(seed = 0) {
 export function makeAvmCheckpointActionRevertCheckpointHint(seed = 0) {
     return new AvmRevertCheckpointHint(/*actionCounter=*/ seed, /*oldCheckpointId=*/ seed + 1, /*newCheckpointId=*/ seed + 2, /*beforeState=*/ makeTreeSnapshots(seed + 3), /*afterState=*/ makeTreeSnapshots(seed + 7));
 }
+export function makeAvmContractDbCheckpointActionCreateCheckpointHint(seed = 0) {
+    return new AvmContractDbCreateCheckpointHint(/*actionCounter=*/ seed, /*oldCheckpointId=*/ seed + 1, /*newCheckpointId=*/ seed + 2);
+}
+export function makeAvmContractDbCheckpointActionCommitCheckpointHint(seed = 0) {
+    return new AvmContractDbCommitCheckpointHint(/*actionCounter=*/ seed, /*oldCheckpointId=*/ seed + 1, /*newCheckpointId=*/ seed + 2);
+}
+export function makeAvmContractDbCheckpointActionRevertCheckpointHint(seed = 0) {
+    return new AvmContractDbRevertCheckpointHint(/*actionCounter=*/ seed, /*oldCheckpointId=*/ seed + 1, /*newCheckpointId=*/ seed + 2);
+}
 /**
  * Makes arbitrary AvmContractInstanceHint.
  * @param seed - The seed to use for generating the state reference.
  * @returns AvmContractInstanceHint.
  */ export function makeAvmContractInstanceHint(seed = 0) {
-    return new AvmContractInstanceHint(new AztecAddress(new Fr(seed)), new Fr(seed + 0x2), new AztecAddress(new Fr(seed + 0x3)), new Fr(seed + 0x4), new Fr(seed + 0x5), new Fr(seed + 0x6), new PublicKeys(new Point(new Fr(seed + 0x7), new Fr(seed + 0x8), false), new Point(new Fr(seed + 0x9), new Fr(seed + 0x10), false), new Point(new Fr(seed + 0x11), new Fr(seed + 0x12), false), new Point(new Fr(seed + 0x13), new Fr(seed + 0x14), false)));
+    return new AvmContractInstanceHint(seed, new AztecAddress(new Fr(seed)), new Fr(seed + 0x2), new AztecAddress(new Fr(seed + 0x3)), new Fr(seed + 0x4), new Fr(seed + 0x5), new Fr(seed + 0x6), new Fr(seed + 0x7), new PublicKeys(new Fr(seed + 0x7), new PublicKey(new Fr(seed + 0x9), new Fr(seed + 0x10)), new Fr(seed + 0x11), new Fr(seed + 0x13), new Fr(seed + 0x15), new Fr(seed + 0x17)));
+}
+/**
+ * Makes arbitrary AvmDebugFunctionNameHint.
+ * @param seed - The seed to use for generating the hint.
+ * @returns AvmDebugFunctionNameHint.
+ */ export function makeAvmDebugFunctionNameHint(seed = 0) {
+    return new AvmDebugFunctionNameHint(new AztecAddress(new Fr(seed)), new Fr(seed + 0x2), `function-${seed}`);
 }
 /* Makes arbitrary AvmContractClassHint.
  * @param seed - The seed to use for generating the state reference.
  * @returns AvmContractClassHint.
  */ export function makeAvmContractClassHint(seed = 0) {
     const bytecode = makeBytes(32, seed + 0x5);
-    return new AvmContractClassHint(new Fr(seed), new Fr(seed + 0x2), new Fr(seed + 0x3), bytecode);
+    return new AvmContractClassHint(seed, new Fr(seed), new Fr(seed + 0x2), new Fr(seed + 0x3), bytecode);
 }
 export async function makeAvmBytecodeCommitmentHint(seed = 0) {
     const classId = new Fr(seed + 2);
     const bytecode = makeBytes(32, seed + 0x5);
-    return new AvmBytecodeCommitmentHint(classId, await computePublicBytecodeCommitment(bytecode));
+    return new AvmBytecodeCommitmentHint(seed, classId, await computePublicBytecodeCommitment(bytecode));
 }
 export async function makePublicCallRequestWithCalldata(seed = 0) {
     const calldata = makeArray(seed % 20 + 4, (i)=>new Fr(i), seed + 0x1000);
@@ -839,8 +782,16 @@ export async function makePublicCallRequestWithCalldata(seed = 0) {
     const publicCallRequest = new PublicCallRequest(new AztecAddress(new Fr(seed)), new AztecAddress(new Fr(seed + 1)), false, calldataHash);
     return new PublicCallRequestWithCalldata(publicCallRequest, calldata);
 }
+export function makeContractClassLog(seed = 0) {
+    return new ContractClassLog(makeAztecAddress(seed + 0x1000), makeContractClassLogFields(seed + 0x2000), seed % 20);
+}
+export function makeContractDeploymentData(seed = 0) {
+    const contractClassLogs = makeArray(seed % 20, (i)=>makeContractClassLog(i), seed + 0x1000);
+    const privateLogs = makeArray(seed % 20, (i)=>makePrivateLog(i), seed + 0x2000);
+    return new ContractDeploymentData(contractClassLogs, privateLogs);
+}
 export async function makeAvmTxHint(seed = 0) {
-    return new AvmTxHint(`txhash-${seed}`, makeGasSettings(), makeGasFees(seed + 0x1000), {
+    return new AvmTxHint(`txhash-${seed}`, makeGasSettings(), makeGasFees(seed + 0x1000), makeContractDeploymentData(seed + 0x2000), makeContractDeploymentData(seed + 0x3000), {
         noteHashes: makeArray(seed % 20 + 4, (i)=>new Fr(i), seed + 0x1000),
         nullifiers: makeArray(seed % 20 + 4, (i)=>new Fr(i), seed + 0x2000),
         l2ToL1Messages: makeArray(seed % 20 + 4, (i)=>makeScopedL2ToL1Message(i), seed + 0x3000)
@@ -865,6 +816,10 @@ export async function makeAvmTxHint(seed = 0) {
         contractInstances: makeArray(baseLength + 2, makeAvmContractInstanceHint, seed + 0x4700),
         contractClasses: makeArray(baseLength + 5, makeAvmContractClassHint, seed + 0x4900),
         bytecodeCommitments: await makeArrayAsync(baseLength + 5, makeAvmBytecodeCommitmentHint, seed + 0x4900),
+        debugFunctionNames: makeArray(baseLength + 5, makeAvmDebugFunctionNameHint, seed + 0x4a00),
+        contractDbCreateCheckpointHints: makeArray(baseLength + 5, makeAvmContractDbCheckpointActionCreateCheckpointHint, seed + 0x5900),
+        contractDbCommitCheckpointHints: makeArray(baseLength + 5, makeAvmContractDbCheckpointActionCommitCheckpointHint, seed + 0x5b00),
+        contractDbRevertCheckpointHints: makeArray(baseLength + 5, makeAvmContractDbCheckpointActionRevertCheckpointHint, seed + 0x5d00),
         startingTreeRoots: makeTreeSnapshots(seed + 0x4900),
         getSiblingPathHints: makeArray(baseLength + 5, makeAvmGetSiblingPathHint, seed + 0x4b00),
         getPreviousValueIndexHints: makeArray(baseLength + 5, makeAvmGetPreviousValueIndexHint, seed + 0x4d00),
@@ -879,7 +834,7 @@ export async function makeAvmTxHint(seed = 0) {
         revertCheckpointHints: makeArray(baseLength + 5, makeAvmCheckpointActionRevertCheckpointHint, seed + 0x5d00),
         ...overrides
     };
-    return new AvmExecutionHints(fields.globalVariables, fields.tx, fields.protocolContracts, fields.contractInstances, fields.contractClasses, fields.bytecodeCommitments, fields.startingTreeRoots, fields.getSiblingPathHints, fields.getPreviousValueIndexHints, fields.getLeafPreimageHintPublicDataTree, fields.getLeafPreimageHintNullifierTree, fields.getLeafValueHints, fields.sequentialInsertHintsPublicDataTree, fields.sequentialInsertHintsNullifierTree, fields.appendLeavesHints, fields.createCheckpointHints, fields.commitCheckpointHints, fields.revertCheckpointHints);
+    return new AvmExecutionHints(fields.globalVariables, fields.tx, fields.protocolContracts, fields.contractInstances, fields.contractClasses, fields.bytecodeCommitments, fields.debugFunctionNames, fields.contractDbCreateCheckpointHints, fields.contractDbCommitCheckpointHints, fields.contractDbRevertCheckpointHints, fields.startingTreeRoots, fields.getSiblingPathHints, fields.getPreviousValueIndexHints, fields.getLeafPreimageHintPublicDataTree, fields.getLeafPreimageHintNullifierTree, fields.getLeafValueHints, fields.sequentialInsertHintsPublicDataTree, fields.sequentialInsertHintsNullifierTree, fields.appendLeavesHints, fields.createCheckpointHints, fields.commitCheckpointHints, fields.revertCheckpointHints);
 }
 /**
  * Creates arbitrary AvmCircuitInputs.
@@ -901,98 +856,108 @@ export async function makeAvmTxHint(seed = 0) {
  */ export function fr(n) {
     return new Fr(BigInt(n));
 }
-/** Makes a bloated processed tx for testing purposes. */ export async function makeBloatedProcessedTx({ seed = 1, header, db, chainId = Fr.ZERO, version = Fr.ZERO, gasSettings = GasSettings.default({
-    maxFeesPerGas: new GasFees(10, 10)
-}), vkTreeRoot = Fr.ZERO, protocolContracts = makeProtocolContracts(seed + 0x100), globalVariables = GlobalVariables.empty(), newL1ToL2Snapshot = AppendOnlyTreeSnapshot.empty(), feePayer, feePaymentPublicDataWrite, // The default gasUsed is the tx overhead.
-gasUsed = Gas.from({
-    daGas: FIXED_DA_GAS,
-    l2Gas: FIXED_L2_GAS
-}), privateOnly = false } = {}) {
-    seed *= 0x1000; // Avoid clashing with the previous mock values if seed only increases by 1.
-    header ??= db?.getInitialHeader() ?? makeHeader(seed);
-    feePayer ??= await AztecAddress.random();
-    const txConstantData = TxConstantData.empty();
-    txConstantData.anchorBlockHeader = header;
-    txConstantData.txContext.chainId = chainId;
-    txConstantData.txContext.version = version;
-    txConstantData.txContext.gasSettings = gasSettings;
-    txConstantData.vkTreeRoot = vkTreeRoot;
-    txConstantData.protocolContractsHash = await protocolContracts.hash();
-    const tx = !privateOnly ? await mockTx(seed, {
-        feePayer,
-        gasUsed
-    }) : await mockTx(seed, {
-        numberOfNonRevertiblePublicCallRequests: 0,
-        numberOfRevertiblePublicCallRequests: 0,
-        feePayer,
-        gasUsed
-    });
-    tx.data.constants = txConstantData;
-    const transactionFee = tx.data.gasUsed.computeFee(globalVariables.gasFees);
-    if (privateOnly) {
-        const data = makePrivateToRollupAccumulatedData(seed + 0x1000);
-        clearContractClassLogs(data);
-        feePaymentPublicDataWrite ??= new PublicDataWrite(Fr.random(), Fr.random());
-        tx.data.forRollup.end = data;
-        await tx.recomputeHash();
-        return makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, globalVariables);
-    } else {
-        const dataFromPrivate = tx.data.forPublic;
-        const nonRevertibleData = dataFromPrivate.nonRevertibleAccumulatedData;
-        // Create revertible data.
-        const revertibleData = makePrivateToPublicAccumulatedData(seed + 0x1000);
-        clearContractClassLogs(revertibleData);
-        revertibleData.nullifiers[MAX_NULLIFIERS_PER_TX - 1] = Fr.ZERO; // Leave one space for the tx hash nullifier in nonRevertibleAccumulatedData.
-        dataFromPrivate.revertibleAccumulatedData = revertibleData;
-        // Create avm output.
-        const avmOutput = AvmCircuitPublicInputs.empty();
-        // Assign data from hints.
-        avmOutput.protocolContracts = protocolContracts;
-        avmOutput.startTreeSnapshots.l1ToL2MessageTree = newL1ToL2Snapshot;
-        avmOutput.endTreeSnapshots.l1ToL2MessageTree = newL1ToL2Snapshot;
-        avmOutput.effectiveGasFees = computeEffectiveGasFees(globalVariables.gasFees, gasSettings);
-        // Assign data from private.
-        avmOutput.globalVariables = globalVariables;
-        avmOutput.startGasUsed = tx.data.gasUsed;
-        avmOutput.gasSettings = gasSettings;
-        avmOutput.feePayer = feePayer;
-        avmOutput.publicCallRequestArrayLengths = new PublicCallRequestArrayLengths(tx.data.numberOfNonRevertiblePublicCallRequests(), tx.data.numberOfRevertiblePublicCallRequests(), tx.data.hasTeardownPublicCallRequest());
-        avmOutput.publicSetupCallRequests = dataFromPrivate.nonRevertibleAccumulatedData.publicCallRequests;
-        avmOutput.publicAppLogicCallRequests = dataFromPrivate.revertibleAccumulatedData.publicCallRequests;
-        avmOutput.publicTeardownCallRequest = dataFromPrivate.publicTeardownCallRequest;
-        avmOutput.previousNonRevertibleAccumulatedData = new PrivateToAvmAccumulatedData(dataFromPrivate.nonRevertibleAccumulatedData.noteHashes, dataFromPrivate.nonRevertibleAccumulatedData.nullifiers, dataFromPrivate.nonRevertibleAccumulatedData.l2ToL1Msgs);
-        avmOutput.previousNonRevertibleAccumulatedDataArrayLengths = avmOutput.previousNonRevertibleAccumulatedData.getArrayLengths();
-        avmOutput.previousRevertibleAccumulatedData = new PrivateToAvmAccumulatedData(dataFromPrivate.revertibleAccumulatedData.noteHashes, dataFromPrivate.revertibleAccumulatedData.nullifiers, dataFromPrivate.revertibleAccumulatedData.l2ToL1Msgs);
-        avmOutput.previousRevertibleAccumulatedDataArrayLengths = avmOutput.previousRevertibleAccumulatedData.getArrayLengths();
-        // Assign final data emitted from avm.
-        avmOutput.accumulatedData.noteHashes = revertibleData.noteHashes;
-        avmOutput.accumulatedData.nullifiers = padArrayEnd(nonRevertibleData.nullifiers.concat(revertibleData.nullifiers).filter((n)=>!n.isEmpty()), Fr.ZERO, MAX_NULLIFIERS_PER_TX);
-        avmOutput.accumulatedData.l2ToL1Msgs = revertibleData.l2ToL1Msgs;
-        avmOutput.accumulatedData.publicDataWrites = makeTuple(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, (i)=>new PublicDataWrite(new Fr(i), new Fr(i + 10)), seed + 0x2000);
-        avmOutput.accumulatedDataArrayLengths = avmOutput.accumulatedData.getArrayLengths();
-        avmOutput.gasSettings = gasSettings;
-        // Note: The fee is computed from the tx's gas used, which only includes the gas used in private. But this shouldn't
-        // be a problem for the tests.
-        avmOutput.transactionFee = transactionFee;
-        const avmCircuitInputs = await makeAvmCircuitInputs(seed + 0x3000, {
-            publicInputs: avmOutput
-        });
-        avmCircuitInputs.hints.startingTreeRoots.l1ToL2MessageTree = newL1ToL2Snapshot;
-        const gasUsed = {
-            totalGas: Gas.empty(),
-            teardownGas: Gas.empty(),
-            publicGas: Gas.empty(),
-            billedGas: Gas.empty()
+/** Creates a random {@link LogResult} with private-log-shaped data. `includeEffects` populates `noteHashes` + `nullifiers`. */ export function randomPrivateLogResult(opts) {
+    const log = PrivateLog.random(opts?.tag);
+    const includeEffects = opts?.includeEffects ?? (opts?.noteHashes !== undefined || opts?.nullifiers !== undefined);
+    const base = {
+        logData: log.getEmittedFields(),
+        blockNumber: BlockNumber(opts?.blockNumber ?? 1),
+        blockHash: opts?.blockHash ?? BlockHash.random(),
+        blockTimestamp: opts?.blockTimestamp ?? 1n,
+        txHash: opts?.txHash ?? TxHash.random(),
+        txIndexWithinBlock: opts?.txIndexWithinBlock ?? 0,
+        logIndexWithinTx: opts?.logIndexWithinTx ?? 0
+    };
+    if (includeEffects) {
+        return {
+            ...base,
+            noteHashes: opts?.noteHashes ?? [
+                Fr.random(),
+                Fr.random()
+            ],
+            nullifiers: opts?.nullifiers ?? [
+                Fr.random()
+            ]
         };
-        await tx.recomputeHash();
-        return makeProcessedTxFromTxWithPublicCalls(tx, {
-            type: ProvingRequestType.PUBLIC_VM,
-            inputs: avmCircuitInputs
-        }, gasUsed, RevertCode.OK, undefined /* revertReason */ );
     }
+    return base;
+}
+/** Creates a random {@link LogResult} with public-log-shaped data. `includeEffects` populates `noteHashes` + `nullifiers`. */ export async function randomPublicLogResult(opts) {
+    const log = await PublicLog.random();
+    const includeEffects = opts?.includeEffects ?? (opts?.noteHashes !== undefined || opts?.nullifiers !== undefined);
+    const base = {
+        logData: log.getEmittedFields(),
+        blockNumber: BlockNumber(opts?.blockNumber ?? 1),
+        blockHash: opts?.blockHash ?? BlockHash.random(),
+        blockTimestamp: opts?.blockTimestamp ?? 1n,
+        txHash: opts?.txHash ?? TxHash.random(),
+        txIndexWithinBlock: opts?.txIndexWithinBlock ?? 0,
+        logIndexWithinTx: opts?.logIndexWithinTx ?? 0
+    };
+    if (includeEffects) {
+        return {
+            ...base,
+            noteHashes: opts?.noteHashes ?? [
+                Fr.random(),
+                Fr.random()
+            ],
+            nullifiers: opts?.nullifiers ?? [
+                Fr.random()
+            ]
+        };
+    }
+    return base;
+}
+/**
+ * Creates L2Tips with all tips pointing to the same block number.
+ * Useful for mocking aztecNode.getL2Tips() in tests.
+ * @param blockNumber - The block number to use for all tips.
+ * @param hash - Optional hash for the block (defaults to empty string).
+ * @param checkpointNumber - Optional checkpoint number (defaults to blockNumber).
+ * @param checkpointHash - Optional checkpoint hash (defaults to block hash).
+ * @returns L2Tips object with all tips at the same block.
+ */ export function makeL2Tips(blockNumber, hash = '', checkpointNumber, checkpointHash) {
+    const bn = typeof blockNumber === 'number' ? BlockNumber(blockNumber) : blockNumber;
+    const cpn = checkpointNumber !== undefined ? typeof checkpointNumber === 'number' ? CheckpointNumber(checkpointNumber) : checkpointNumber : CheckpointNumber.fromBlockNumber(bn);
+    const cph = checkpointHash ?? hash;
+    return {
+        proposed: {
+            number: bn,
+            hash
+        },
+        checkpointed: {
+            block: {
+                number: bn,
+                hash
+            },
+            checkpoint: {
+                number: cpn,
+                hash: cph
+            }
+        },
+        proven: {
+            block: {
+                number: bn,
+                hash
+            },
+            checkpoint: {
+                number: cpn,
+                hash: cph
+            }
+        },
+        finalized: {
+            block: {
+                number: bn,
+                hash
+            },
+            checkpoint: {
+                number: cpn,
+                hash: cph
+            }
+        }
+    };
 }
-// Remove all contract class log hashes from the data as they are not required for the current tests.
-// If they are needed one day, change this to create the random fields first and update the data with real hashes of those fields.
-function clearContractClassLogs(data) {
-    data.contractClassLogsHashes.forEach((_, i)=>data.contractClassLogsHashes[i] = ScopedLogHash.empty());
+export async function randomAppTaggingSecret(kind) {
+    const resolvedApp = await AztecAddress.random();
+    return new AppTaggingSecret(Fr.random(), resolvedApp, kind);
 }