@aztec/stdlib 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/tests/factories.js

@@ -1,25 +1,24 @@
 import { makeBlobAccumulator, makeFinalBlobAccumulator, makeFinalBlobBatchingChallenges, 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, 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 { 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, SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { compact } from '@aztec/foundation/collection';
-import { Grumpkin, SchnorrSignature, poseidon2HashWithSeparator, sha256 } from '@aztec/foundation/crypto';
+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, AvmContractDbCommitCheckpointHint, AvmContractDbCreateCheckpointHint, AvmContractDbRevertCheckpointHint, AvmContractInstanceHint, AvmCreateCheckpointHint, AvmDebugFunctionNameHint, AvmExecutionHints, AvmGetLeafPreimageHintNullifierTree, AvmGetLeafPreimageHintPublicDataTree, AvmGetLeafValueHint, AvmGetPreviousValueIndexHint, AvmGetSiblingPathHint, AvmRevertCheckpointHint, AvmSequentialInsertHintNullifierTree, AvmSequentialInsertHintPublicDataTree, AvmTxHint } from '../avm/index.js';
-import { PublicDataRead } from '../avm/public_data_read.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { L2BlockHeader } from '../block/l2_block_header.js';
-import { ContractDeploymentData, SerializableContractInstance, computeContractClassId, computePublicBytecodeCommitment } from '../contract/index.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 { 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';
@@ -30,7 +29,8 @@ 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 { 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';
@@ -38,7 +38,7 @@ import { CountedL2ToL1Message, L2ToL1Message, ScopedL2ToL1Message } from '../mes
 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 { makeRecursiveProof } from '../proofs/recursive_proof.js';
 import { PrivateBaseRollupHints, PublicBaseRollupHints } from '../rollup/base_rollup_hints.js';
@@ -63,7 +63,6 @@ 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';
@@ -73,10 +72,11 @@ 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 { 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.
@@ -116,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)
     });
 }
@@ -135,45 +138,18 @@ function makeScopedReadRequest(n) {
  * @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));
 }
 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(makeBlockHeader(seed), makeTxContext(seed + 0x100), new Fr(seed + 0x200), new Fr(seed + 0x201));
 }
@@ -203,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.
@@ -263,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.
@@ -324,7 +297,7 @@ 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
         }),
@@ -333,7 +306,7 @@ function makeClaimedLengthArray(arraySize, makeItem, seed, length = arraySize) {
         minRevertibleSideEffectCounter: fr(0),
         noteHashReadRequests: makeClaimedLengthArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, makeScopedReadRequest, seed + 0x300),
         nullifierReadRequests: makeClaimedLengthArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, makeScopedReadRequest, seed + 0x310),
-        keyValidationRequestsAndGenerators: makeClaimedLengthArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, makeKeyValidationRequestAndGenerators, seed + 0x320),
+        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),
@@ -348,7 +321,8 @@ function makeClaimedLengthArray(arraySize, makeItem, seed, length = arraySize) {
         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 = {}) {
@@ -359,7 +333,7 @@ export function makeGlobalVariables(seed = 1, overrides = {}) {
         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)
     });
@@ -375,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.
@@ -397,14 +373,7 @@ 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));
@@ -429,16 +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 + 0x800), BigInt(seed + 0x810), fr(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) {
-    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), 0x400), makeBlobAccumulator(seed + 0x500), makeBlobAccumulator(seed + 0x600), makeFinalBlobBatchingChallenges(seed + 0x700));
+    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,12 +418,7 @@ 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), makeFinalBlobAccumulator(seed + 0x700));
-}
-/**
- * Makes content commitment
- */ export function makeContentCommitment(seed = 0) {
-    return new ContentCommitment(fr(seed + 0x100), fr(seed + 0x200), fr(seed + 0x300));
+    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));
 }
 export function makeBlockHeader(seed = 0, overrides = {}) {
     return BlockHeader.from({
@@ -467,27 +431,21 @@ export function makeBlockHeader(seed = 0, overrides = {}) {
         ...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 !== undefined ? {
-            blockNumber: BlockNumber(blockNumber)
-        } : {},
-        ...slotNumber !== undefined ? {
-            slotNumber: SlotNumber(slotNumber)
-        } : {}
-    }), new Fr(seed + 0x800), new Fr(seed + 0x900), new Fr(seed + 0xa00), new Fr(seed + 0xb00));
-}
-export function makeCheckpointHeader(seed = 0) {
+export function makeCheckpointHeader(seed = 0, overrides = {}) {
     return CheckpointHeader.from({
         lastArchiveRoot: fr(seed + 0x100),
         blockHeadersHash: fr(seed + 0x150),
-        contentCommitment: makeContentCommitment(seed + 0x200),
+        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
     });
 }
 /**
@@ -512,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));
 }
 /**
@@ -595,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));
 }
@@ -632,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,
@@ -640,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);
@@ -680,8 +616,6 @@ export async function makeContractClassPublic(seed = 0, publicBytecode) {
         artifactHash,
         packedBytecode,
         privateFunctionsRoot,
-        privateFunctions: [],
-        utilityFunctions: [],
         version: 1
     };
 }
@@ -714,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);
 }
@@ -820,7 +755,7 @@ export function makeAvmContractDbCheckpointActionRevertCheckpointHint(seed = 0)
  * @param seed - The seed to use for generating the state reference.
  * @returns AvmContractInstanceHint.
  */ export function makeAvmContractInstanceHint(seed = 0) {
-    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 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.
@@ -921,3 +856,108 @@ export async function makeAvmTxHint(seed = 0) {
  */ export function fr(n) {
     return new Fr(BigInt(n));
 }
+/** 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()
+            ]
+        };
+    }
+    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
+            }
+        }
+    };
+}
+export async function randomAppTaggingSecret(kind) {
+    const resolvedApp = await AztecAddress.random();
+    return new AppTaggingSecret(Fr.random(), resolvedApp, kind);
+}

package/dest/tests/jest.js

@@ -17,7 +17,7 @@ import { L2Block } from '../block/l2_block.js';
         // use a custom comparator because the blockHash property is lazily computed and one instance might not have it
         return aAsL2Block.toBuffer().equals(bAsL2Block.toBuffer());
     } else if (aAsL2Block || bAsL2Block) {
-        // one value is an L2block and the other isn't. Definitely not equal.
+        // one value is an L2Block and the other isn't. Definitely not equal.
         return false;
     } else {
         // we don't know what they are, tell Jest to keep looking