@aztec/stdlib 0.82.2 → 0.82.3-nightly.20250403

package/dest/tests/factories.js

@@ -3,14 +3,14 @@ import { ARCHIVE_HEIGHT, AVM_PROOF_LENGTH_IN_FIELDS, AZTEC_MAX_EPOCH_DURATION, B
 import { makeHalfFullTuple, makeTuple } from '@aztec/foundation/array';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { compact } from '@aztec/foundation/collection';
-import { SchnorrSignature, poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { SchnorrSignature, poseidon2HashWithSeparator, sha256 } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { 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, AvmAppendTreeHint, AvmBytecodeCommitmentHint, AvmCircuitInputs, AvmCircuitPublicInputs, AvmContractClassHint, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmNullifierReadTreeHint, AvmNullifierWriteTreeHint, AvmPublicDataReadTreeHint, AvmPublicDataWriteTreeHint, RevertCode } from '../avm/index.js';
+import { AvmAccumulatedData, AvmBytecodeCommitmentHint, AvmCircuitInputs, AvmCircuitPublicInputs, AvmContractClassHint, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmGetLeafPreimageHintNullifierTree, AvmGetLeafPreimageHintPublicDataTree, AvmGetLeafValueHint, AvmGetPreviousValueIndexHint, AvmGetSiblingPathHint, AvmSequentialInsertHintNullifierTree, AvmSequentialInsertHintPublicDataTree, RevertCode } from '../avm/index.js';
 import { PublicDataHint } from '../avm/public_data_hint.js';
 import { PublicDataRead } from '../avm/public_data_read.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
@@ -60,7 +60,8 @@ import { PublicTubeData } from '../rollup/public_tube_data.js';
 import { RootRollupInputs, RootRollupPublicInputs } from '../rollup/root_rollup.js';
 import { PrivateBaseStateDiffHints } from '../rollup/state_diff_hints.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { NullifierLeafPreimage } from '../trees/nullifier_leaf.js';
+import { MerkleTreeId } from '../trees/merkle_tree_id.js';
+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';
@@ -574,19 +575,33 @@ function makeTreeSnapshots(seed = 0) {
  */ export function makePublicDataTreeLeaf(seed = 0) {
     return new PublicDataTreeLeaf(new Fr(seed), new Fr(seed + 1));
 }
+/**
+ * Makes arbitrary nullifier leaf.
+ * @param seed - The seed to use for generating the nullifier leaf.
+ * @returns A nullifier leaf.
+ */ export function makeNullifierLeaf(seed = 0) {
+    return new NullifierLeaf(new Fr(seed));
+}
+/**
+ * Makes arbitrary nullifier leaf preimages.
+ * @param seed - The seed to use for generating the nullifier leaf preimage.
+ * @returns A nullifier leaf preimage.
+ */ export function makeNullifierLeafPreimage(seed = 0) {
+    return new NullifierLeafPreimage(makeNullifierLeaf(seed), new Fr(seed + 1), BigInt(seed + 2));
+}
 /**
  * Makes arbitrary public data tree leaf preimages.
  * @param seed - The seed to use for generating the public data tree leaf preimage.
  * @returns A public data tree leaf preimage.
  */ export function makePublicDataTreeLeafPreimage(seed = 0) {
-    return new PublicDataTreeLeafPreimage(new Fr(seed), new Fr(seed + 1), new Fr(seed + 2), BigInt(seed + 3));
+    return new PublicDataTreeLeafPreimage(makePublicDataTreeLeaf(seed), new Fr(seed + 2), BigInt(seed + 3));
 }
 /**
  * Creates an instance of PrivateBaseStateDiffHints with arbitrary values based on the provided seed.
  * @param seed - The seed to use for generating the hints.
  * @returns A PrivateBaseStateDiffHints object.
  */ export function makePrivateBaseStateDiffHints(seed = 1) {
-    const nullifierPredecessorPreimages = makeTuple(MAX_NULLIFIERS_PER_TX, (x)=>new NullifierLeafPreimage(fr(x), fr(x + 0x100), BigInt(x + 0x200)), seed + 0x1000);
+    const nullifierPredecessorPreimages = makeTuple(MAX_NULLIFIERS_PER_TX, (x)=>makeNullifierLeafPreimage(x), seed + 0x1000);
     const nullifierPredecessorMembershipWitnesses = makeTuple(MAX_NULLIFIERS_PER_TX, (x)=>makeMembershipWitness(NULLIFIER_TREE_HEIGHT, x), seed + 0x2000);
     const sortedNullifiers = makeTuple(MAX_NULLIFIERS_PER_TX, fr, seed + 0x3000);
     const sortedNullifierIndexes = makeTuple(MAX_NULLIFIERS_PER_TX, (i)=>i, seed + 0x4000);
@@ -757,24 +772,57 @@ export async function makeContractInstanceFromClassId(classId, seed = 0, overrid
         publicKeys
     }).withAddress(address);
 }
-export function makeAvmTreeHints(seed = 0) {
-    return new AvmAppendTreeHint(new Fr(seed), new Fr(seed + 1), makeArray(10, (i)=>new Fr(i), seed + 0x1000));
-}
-export function makeAvmNullifierReadTreeHints(seed = 0) {
-    const lowNullifierPreimage = new NullifierLeafPreimage(new Fr(seed), new Fr(seed + 1), BigInt(seed + 2));
-    return new AvmNullifierReadTreeHint(lowNullifierPreimage, new Fr(seed + 1), makeArray(10, (i)=>new Fr(i), seed + 0x1000));
-}
-export function makeAvmPublicDataReadTreeHints(seed = 0) {
-    return new AvmPublicDataReadTreeHint(new PublicDataTreeLeafPreimage(new Fr(seed), new Fr(seed + 1), new Fr(seed + 2), BigInt(seed + 3)), new Fr(seed + 1), makeArray(10, (i)=>new Fr(i), seed + 0x1000));
-}
-export function makeAvmNullifierInsertionTreeHints(seed = 0) {
-    return new AvmNullifierWriteTreeHint(makeAvmNullifierReadTreeHints(seed), makeArray(20, (i)=>new Fr(i), seed + 0x1000));
-}
-export function makeAvmStorageReadTreeHints(seed = 0) {
-    return new AvmPublicDataReadTreeHint(new PublicDataTreeLeafPreimage(new Fr(seed), new Fr(seed + 1), new Fr(seed + 2), BigInt(seed + 3)), new Fr(seed + 1), makeArray(10, (i)=>new Fr(i), seed + 0x1000));
+export function makeAvmGetSiblingPathHint(seed = 0) {
+    // We want a possibly large index, but non-random.
+    const index = BigInt(`0x${sha256(Buffer.from(seed.toString())).toString('hex')}`) % (1n << 64n);
+    return new AvmGetSiblingPathHint(makeAppendOnlyTreeSnapshot(seed), /*treeId=*/ (seed + 1) % 5, /*index=*/ index, makeArray(seed % 64, (i)=>new Fr(i), seed + 10));
+}
+export function makeAvmGetPreviousValueIndexHint(seed = 0) {
+    // We want a possibly large index, but non-random.
+    const index = BigInt(`0x${sha256(Buffer.from(seed.toString())).toString('hex')}`) % (1n << 64n);
+    const value = new Fr(BigInt(`0x${sha256(Buffer.from((seed + 2).toString())).toString('hex')}`) % (1n << 128n));
+    return new AvmGetPreviousValueIndexHint(makeAppendOnlyTreeSnapshot(seed), /*treeId=*/ (seed + 1) % 5, value, index, /*alreadyPresent=*/ index % 2n === 0n);
+}
+export function makeAvmGetLeafPreimageHintPublicDataTree(seed = 0) {
+    // We want a possibly large index, but non-random.
+    const index = BigInt(`0x${sha256(Buffer.from(seed.toString())).toString('hex')}`) % (1n << 64n);
+    return new AvmGetLeafPreimageHintPublicDataTree(makeAppendOnlyTreeSnapshot(seed), /*index=*/ index, /*leafPreimage=*/ makePublicDataTreeLeafPreimage(seed + 3));
+}
+export function makeAvmGetLeafPreimageHintNullifierTree(seed = 0) {
+    // We want a possibly large index, but non-random.
+    const index = BigInt(`0x${sha256(Buffer.from(seed.toString())).toString('hex')}`) % (1n << 64n);
+    return new AvmGetLeafPreimageHintNullifierTree(makeAppendOnlyTreeSnapshot(seed), /*index=*/ index, /*leafPreimage=*/ makeNullifierLeafPreimage(seed + 3));
+}
+export function makeAvmGetLeafValueHint(seed = 0) {
+    // We want a possibly large index, but non-random.
+    const index = BigInt(`0x${sha256(Buffer.from(seed.toString())).toString('hex')}`) % (1n << 64n);
+    return new AvmGetLeafValueHint(makeAppendOnlyTreeSnapshot(seed), /*treeId=*/ (seed + 1) % 5, /*index=*/ index, /*value=*/ new Fr(seed + 3));
+}
+export function makeAvmSequentialInsertHintPublicDataTree(seed = 0) {
+    const lowLeavesWitnessData = {
+        leaf: makePublicDataTreeLeafPreimage(seed + 3),
+        index: BigInt(seed + 4),
+        path: makeArray(seed % 64, (i)=>new Fr(i), seed + 5)
+    };
+    const insertionWitnessData = {
+        leaf: makePublicDataTreeLeafPreimage(seed + 6),
+        index: BigInt(seed + 7),
+        path: makeArray(seed % 64, (i)=>new Fr(i), seed + 8)
+    };
+    return new AvmSequentialInsertHintPublicDataTree(makeAppendOnlyTreeSnapshot(seed), makeAppendOnlyTreeSnapshot(seed + 1), MerkleTreeId.PUBLIC_DATA_TREE, makePublicDataTreeLeaf(seed + 2), lowLeavesWitnessData, insertionWitnessData);
 }
-export function makeAvmStorageUpdateTreeHints(seed = 0) {
-    return new AvmPublicDataWriteTreeHint(makeAvmStorageReadTreeHints(seed), new PublicDataTreeLeafPreimage(new Fr(seed), new Fr(seed + 1), new Fr(seed + 2), BigInt(seed + 3)), makeArray(20, (i)=>new Fr(i), seed + 0x1000));
+export function makeAvmSequentialInsertHintNullifierTree(seed = 0) {
+    const lowLeavesWitnessData = {
+        leaf: makeNullifierLeafPreimage(seed + 3),
+        index: BigInt(seed + 4),
+        path: makeArray(seed % 64, (i)=>new Fr(i), seed + 5)
+    };
+    const insertionWitnessData = {
+        leaf: makeNullifierLeafPreimage(seed + 6),
+        index: BigInt(seed + 7),
+        path: makeArray(seed % 64, (i)=>new Fr(i), seed + 8)
+    };
+    return new AvmSequentialInsertHintNullifierTree(makeAppendOnlyTreeSnapshot(seed), makeAppendOnlyTreeSnapshot(seed + 1), MerkleTreeId.NULLIFIER_TREE, makeNullifierLeaf(seed + 2), lowLeavesWitnessData, insertionWitnessData);
 }
 /**
  * Makes arbitrary AvmContractInstanceHint.
@@ -811,16 +859,16 @@ export function makeAvmEnqueuedCallHint(seed = 0) {
         contractInstances: makeArray(baseLength + 2, makeAvmContractInstanceHint, seed + 0x4700),
         contractClasses: makeArray(baseLength + 5, makeAvmContractClassHint, seed + 0x4900),
         bytecodeCommitments: await makeArrayAsync(baseLength + 5, makeAvmBytecodeCommitmentHint, seed + 0x4900),
-        publicDataReads: makeArray(baseLength + 7, makeAvmStorageReadTreeHints, seed + 0x4900),
-        publicDataWrites: makeArray(baseLength + 8, makeAvmStorageUpdateTreeHints, seed + 0x4a00),
-        nullifierReads: makeArray(baseLength + 9, makeAvmNullifierReadTreeHints, seed + 0x4b00),
-        nullifierWrites: makeArray(baseLength + 10, makeAvmNullifierInsertionTreeHints, seed + 0x4c00),
-        noteHashReads: makeArray(baseLength + 11, makeAvmTreeHints, seed + 0x4d00),
-        noteHashWrites: makeArray(baseLength + 12, makeAvmTreeHints, seed + 0x4e00),
-        l1ToL2MessageReads: makeArray(baseLength + 13, makeAvmTreeHints, seed + 0x4f00),
+        getSiblingPathHints: makeArray(baseLength + 5, makeAvmGetSiblingPathHint, seed + 0x4b00),
+        getPreviousValueIndexHints: makeArray(baseLength + 5, makeAvmGetPreviousValueIndexHint, seed + 0x4d00),
+        getLeafPreimageHintPublicDataTree: makeArray(baseLength + 5, makeAvmGetLeafPreimageHintPublicDataTree, seed + 0x4f00),
+        getLeafPreimageHintNullifierTree: makeArray(baseLength + 5, makeAvmGetLeafPreimageHintNullifierTree, seed + 0x5100),
+        getLeafValueHints: makeArray(baseLength + 5, makeAvmGetLeafValueHint, seed + 0x5300),
+        sequentialInsertHintsPublicDataTree: makeArray(baseLength + 5, makeAvmSequentialInsertHintPublicDataTree, seed + 0x5500),
+        sequentialInsertHintsNullifierTree: makeArray(baseLength + 5, makeAvmSequentialInsertHintNullifierTree, seed + 0x5700),
         ...overrides
     };
-    return new AvmExecutionHints(fields.enqueuedCalls, fields.contractInstances, fields.contractClasses, fields.bytecodeCommitments, fields.publicDataReads, fields.publicDataWrites, fields.nullifierReads, fields.nullifierWrites, fields.noteHashReads, fields.noteHashWrites, fields.l1ToL2MessageReads);
+    return new AvmExecutionHints(fields.enqueuedCalls, fields.contractInstances, fields.contractClasses, fields.bytecodeCommitments, fields.getSiblingPathHints, fields.getPreviousValueIndexHints, fields.getLeafPreimageHintPublicDataTree, fields.getLeafPreimageHintNullifierTree, fields.getLeafValueHints, fields.sequentialInsertHintsPublicDataTree, fields.sequentialInsertHintsNullifierTree);
 }
 /**
  * Creates arbitrary AvmCircuitInputs.

package/dest/tests/mocks.d.ts

@@ -13,9 +13,10 @@ import { TxHash } from '../tx/tx_hash.js';
 export declare const randomTxHash: () => TxHash;
 export declare const randomExtendedNote: ({ note, recipient, contractAddress, txHash, storageSlot, }?: Partial<ExtendedNote>) => Promise<ExtendedNote>;
 export declare const randomUniqueNote: ({ note, recipient, contractAddress, txHash, storageSlot, nonce, }?: Partial<UniqueNote>) => Promise<UniqueNote>;
-export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, hasPublicTeardownCallRequest, publicCalldataSize, feePayer, clientIvcProof, }?: {
+export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, numberOfRevertibleNullifiers, hasPublicTeardownCallRequest, publicCalldataSize, feePayer, clientIvcProof, }?: {
     numberOfNonRevertiblePublicCallRequests?: number;
     numberOfRevertiblePublicCallRequests?: number;
+    numberOfRevertibleNullifiers?: number;
     hasPublicTeardownCallRequest?: boolean;
     publicCalldataSize?: number;
     feePayer?: AztecAddress;

package/dest/tests/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAUxE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAoE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAiC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,YAAY,QAAO,MAAyB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,gEAM5B,QAAQ,YAAY,CAAC,0BAQvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uEAO1B,QAAQ,UAAU,CAAC,wBASrB,CAAC;AAEF,eAAO,MAAM,MAAM,mLASd;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,gBA6CF,CAAC;AAEF,eAAO,MAAM,eAAe,gCAC2E,CAAC;AAkBxG,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAWxC,CAAC;AAEH,eAAO,MAAM,iCAAiC,UACtC;IAAE,eAAe,CAAC,EAAE,EAAE,CAAA;CAAE,YACpB,YAAY,KACrB,QAAQ,2BAA2B,CAUrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;EAIlC,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAyBD,eAAO,MAAM,iBAAiB,aAAoB,2BAA2B,KAAG,QAAQ,aAAa,CAGpG,CAAC;AAGF,eAAO,MAAM,oBAAoB,aAAoB,2BAA2B,KAAG,QAAQ,gBAAgB,CAG1G,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAUxE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAoE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAiC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,YAAY,QAAO,MAAyB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,gEAM5B,QAAQ,YAAY,CAAC,0BAQvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uEAO1B,QAAQ,UAAU,CAAC,wBASrB,CAAC;AAEF,eAAO,MAAM,MAAM,iNAUd;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,gBAkDF,CAAC;AAEF,eAAO,MAAM,eAAe,gCAC2E,CAAC;AAkBxG,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAWxC,CAAC;AAEH,eAAO,MAAM,iCAAiC,UACtC;IAAE,eAAe,CAAC,EAAE,EAAE,CAAA;CAAE,YACpB,YAAY,KACrB,QAAQ,2BAA2B,CAUrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;EAIlC,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAyBD,eAAO,MAAM,iBAAiB,aAAoB,2BAA2B,KAAG,QAAQ,aAAa,CAGpG,CAAC;AAGF,eAAO,MAAM,oBAAoB,aAAoB,2BAA2B,KAAG,QAAQ,gBAAgB,CAG1G,CAAC"}

package/dest/tests/mocks.js

@@ -32,7 +32,7 @@ export const randomExtendedNote = async ({ note = Note.random(), recipient = und
 export const randomUniqueNote = async ({ note = Note.random(), recipient = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), nonce = Fr.random() } = {})=>{
     return new UniqueNote(note, recipient ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, txHash, nonce);
 };
-export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, hasPublicTeardownCallRequest = false, publicCalldataSize = 2, feePayer, clientIvcProof = ClientIvcProof.empty() } = {})=>{
+export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertibleNullifiers = 0, hasPublicTeardownCallRequest = false, publicCalldataSize = 2, feePayer, clientIvcProof = ClientIvcProof.empty() } = {})=>{
     const totalPublicCallRequests = numberOfNonRevertiblePublicCallRequests + numberOfRevertiblePublicCallRequests + (hasPublicTeardownCallRequest ? 1 : 0);
     const isForPublic = totalPublicCallRequests > 0;
     const data = PrivateKernelTailCircuitPublicInputs.empty();
@@ -60,6 +60,10 @@ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests
             data.forPublic.publicTeardownCallRequest = publicCallRequests.pop();
         }
         data.forPublic.nonRevertibleAccumulatedData = nonRevertibleBuilder.pushNullifier(firstNullifier.value).withPublicCallRequests(publicCallRequests.slice(numberOfRevertiblePublicCallRequests)).build();
+        for(let i = 0; i < numberOfRevertibleNullifiers; i++){
+            const revertibleNullifier = new Nullifier(new Fr(seed + 2 + i), 0, Fr.ZERO);
+            revertibleBuilder.pushNullifier(revertibleNullifier.value);
+        }
         data.forPublic.revertibleAccumulatedData = revertibleBuilder.withPublicCallRequests(publicCallRequests.slice(0, numberOfRevertiblePublicCallRequests)).build();
     }
     return new Tx(data, clientIvcProof, [], publicFunctionCalldata);

package/dest/trees/merkle_tree_id.d.ts

@@ -19,5 +19,13 @@ declare const TREE_HEIGHTS: {
 };
 export type TreeHeights = typeof TREE_HEIGHTS;
 export declare function getTreeHeight<TID extends MerkleTreeId>(treeId: TID): TreeHeights[TID];
+declare const TREE_NAMES: {
+    readonly 0: "NULLIFIER_TREE";
+    readonly 1: "NOTE_HASH_TREE";
+    readonly 2: "PUBLIC_DATA_TREE";
+    readonly 3: "L1_TO_L2_MESSAGE_TREE";
+    readonly 4: "ARCHIVE";
+};
+export declare function getTreeName<TID extends MerkleTreeId>(treeId: TID): (typeof TREE_NAMES)[TID];
 export {};
 //# sourceMappingURL=merkle_tree_id.d.ts.map

package/dest/trees/merkle_tree_id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merkle_tree_id.d.ts","sourceRoot":"","sources":["../../src/trees/merkle_tree_id.ts"],"names":[],"mappings":"AAaA;;;GAGG;AACH,oBAAY,YAAY;IACtB,cAAc,IAAoB,CAAE,IAAI;IACxC,cAAc,IAAoB,CAAE,IAAI;IACxC,gBAAgB,IAAsB,CAAE,IAAI;IAC5C,qBAAqB,IAA2B,CAAE,IAAI;IACtD,OAAO,IAAkB;CAC1B;AAED,eAAO,MAAM,aAAa,sBAEzB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;CAMR,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,OAAO,YAAY,CAAC;AAE9C,wBAAgB,aAAa,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAErF"}
+{"version":3,"file":"merkle_tree_id.d.ts","sourceRoot":"","sources":["../../src/trees/merkle_tree_id.ts"],"names":[],"mappings":"AAaA;;;GAGG;AACH,oBAAY,YAAY;IACtB,cAAc,IAAoB,CAAE,IAAI;IACxC,cAAc,IAAoB,CAAE,IAAI;IACxC,gBAAgB,IAAsB,CAAE,IAAI;IAC5C,qBAAqB,IAA2B,CAAE,IAAI;IACtD,OAAO,IAAkB;CAC1B;AAED,eAAO,MAAM,aAAa,sBAEzB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;CAMR,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,OAAO,YAAY,CAAC;AAE9C,wBAAgB,aAAa,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAErF;AAED,QAAA,MAAM,UAAU;;;;;;CAMN,CAAC;AAEX,wBAAgB,WAAW,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,GAAG,CAAC,CAE3F"}

package/dest/trees/merkle_tree_id.js

@@ -23,3 +23,13 @@ const TREE_HEIGHTS = {
 export function getTreeHeight(treeId) {
     return TREE_HEIGHTS[treeId];
 }
+const TREE_NAMES = {
+    [MerkleTreeId.NULLIFIER_TREE]: 'NULLIFIER_TREE',
+    [MerkleTreeId.NOTE_HASH_TREE]: 'NOTE_HASH_TREE',
+    [MerkleTreeId.PUBLIC_DATA_TREE]: 'PUBLIC_DATA_TREE',
+    [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: 'L1_TO_L2_MESSAGE_TREE',
+    [MerkleTreeId.ARCHIVE]: 'ARCHIVE'
+};
+export function getTreeName(treeId) {
+    return TREE_NAMES[treeId];
+}

package/dest/trees/nullifier_leaf.d.ts

@@ -12,11 +12,11 @@ export declare class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     /**
      * Leaf value inside the indexed tree's linked list.
      */
-    nullifier: Fr;
+    leaf: NullifierLeaf;
     /**
-     * Next value inside the indexed tree's linked list.
+     * Next nullifier inside the indexed tree's linked list.
      */
-    nextNullifier: Fr;
+    nextKey: Fr;
     /**
      * Index of the next leaf in the indexed tree's linked list.
      */
@@ -25,32 +25,53 @@ export declare class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     /**
      * Leaf value inside the indexed tree's linked list.
      */
-    nullifier: Fr, 
+    leaf: NullifierLeaf, 
     /**
-     * Next value inside the indexed tree's linked list.
+     * Next nullifier inside the indexed tree's linked list.
      */
-    nextNullifier: Fr, 
+    nextKey: Fr, 
     /**
      * Index of the next leaf in the indexed tree's linked list.
      */
     nextIndex: bigint);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        nullifier: z.ZodType<Fr, any, string>;
-        nextNullifier: z.ZodType<Fr, any, string>;
+        leaf: z.ZodEffects<z.ZodObject<{
+            nullifier: z.ZodType<Fr, any, string>;
+        }, "strip", z.ZodTypeAny, {
+            nullifier: Fr;
+        }, {
+            nullifier: string;
+        }>, NullifierLeaf, {
+            nullifier: string;
+        }>;
+        nextKey: z.ZodType<Fr, any, string>;
         nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
     }, "strip", z.ZodTypeAny, {
-        nullifier: Fr;
-        nextNullifier: Fr;
+        leaf: NullifierLeaf;
+        nextKey: Fr;
         nextIndex: bigint;
     }, {
-        nullifier: string;
-        nextNullifier: string;
+        leaf: {
+            nullifier: string;
+        };
+        nextKey: string;
         nextIndex: string | number | bigint;
     }>, NullifierLeafPreimage, {
-        nullifier: string;
-        nextNullifier: string;
+        leaf: {
+            nullifier: string;
+        };
+        nextKey: string;
         nextIndex: string | number | bigint;
     }>;
+    static get leafSchema(): z.ZodEffects<z.ZodObject<{
+        nullifier: z.ZodType<Fr, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        nullifier: Fr;
+    }, {
+        nullifier: string;
+    }>, NullifierLeaf, {
+        nullifier: string;
+    }>;
     getKey(): bigint;
     getNextKey(): bigint;
     getNextIndex(): bigint;
@@ -80,9 +101,22 @@ export declare class NullifierLeaf implements IndexedTreeLeaf {
     nullifier: Fr);
     getKey(): bigint;
     toBuffer(): Buffer;
+    clone(): NullifierLeaf;
+    toHashInputs(): Buffer[];
+    static empty(): NullifierLeaf;
+    static random(): NullifierLeaf;
     isEmpty(): boolean;
     updateTo(_another: NullifierLeaf): NullifierLeaf;
     static buildDummy(key: bigint): NullifierLeaf;
-    static fromBuffer(buf: Buffer): NullifierLeaf;
+    static fromBuffer(buf: Buffer | BufferReader): NullifierLeaf;
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        nullifier: z.ZodType<Fr, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        nullifier: Fr;
+    }, {
+        nullifier: string;
+    }>, NullifierLeaf, {
+        nullifier: string;
+    }>;
 }
 //# sourceMappingURL=nullifier_leaf.d.ts.map

package/dest/trees/nullifier_leaf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_leaf.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,uBAAuB;IAEjE;;OAEG;IACI,SAAS,EAAE,EAAE;IACpB;;OAEG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,SAAS,EAAE,EAAE;IACpB;;OAEG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,aAAa;IAIvB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAQxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,KAAK,IAAI,qBAAqB;IAI9B,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK,IAAI,qBAAqB;IAIrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IAKvE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB;IAI/F,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAqB,GAAG,qBAAqB;CAGrE;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,eAAe;IAEjD;;OAEG;IACI,SAAS,EAAE,EAAE;;IAHpB;;OAEG;IACI,SAAS,EAAE,EAAE;IAGtB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;IAIhD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAI7C,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;CAG9C"}
+{"version":3,"file":"nullifier_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_leaf.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,uBAAuB;IAEjE;;OAEG;IACI,IAAI,EAAE,aAAa;IAC1B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,IAAI,EAAE,aAAa;IAC1B;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,KAAK,UAAU;;;;;;;;OAEpB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,aAAa;IAIvB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAQxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,KAAK,IAAI,qBAAqB;IAI9B,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK,IAAI,qBAAqB;IAIrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IASvE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB;IAI/F,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAqB,GAAG,qBAAqB;CAGrE;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,eAAe;IAEjD;;OAEG;IACI,SAAS,EAAE,EAAE;;IAHpB;;OAEG;IACI,SAAS,EAAE,EAAE;IAGtB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,KAAK,IAAI,aAAa;IAItB,YAAY,IAAI,MAAM,EAAE;IAIxB,MAAM,CAAC,KAAK,IAAI,aAAa;IAI7B,MAAM,CAAC,MAAM,IAAI,aAAa;IAI9B,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;IAIhD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAI7C,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAK5D,MAAM,KAAK,MAAM;;;;;;;;OAEhB;CACF"}

package/dest/trees/nullifier_leaf.js

@@ -7,46 +7,49 @@ import { z } from 'zod';
  * Class containing the data of a preimage of a single leaf in the nullifier tree.
  * Note: It's called preimage because this data gets hashed before being inserted as a node into the `IndexedTree`.
  */ export class NullifierLeafPreimage {
-    nullifier;
-    nextNullifier;
+    leaf;
+    nextKey;
     nextIndex;
     constructor(/**
      * Leaf value inside the indexed tree's linked list.
-     */ nullifier, /**
-     * Next value inside the indexed tree's linked list.
-     */ nextNullifier, /**
+     */ leaf, /**
+     * Next nullifier inside the indexed tree's linked list.
+     */ nextKey, /**
      * Index of the next leaf in the indexed tree's linked list.
      */ nextIndex){
-        this.nullifier = nullifier;
-        this.nextNullifier = nextNullifier;
+        this.leaf = leaf;
+        this.nextKey = nextKey;
         this.nextIndex = nextIndex;
     }
     static get schema() {
         return z.object({
-            nullifier: schemas.Fr,
-            nextNullifier: schemas.Fr,
+            leaf: NullifierLeaf.schema,
+            nextKey: schemas.Fr,
             nextIndex: schemas.BigInt
-        }).transform(({ nullifier, nextNullifier, nextIndex })=>new NullifierLeafPreimage(nullifier, nextNullifier, nextIndex));
+        }).transform(({ leaf, nextKey, nextIndex })=>new NullifierLeafPreimage(leaf, nextKey, nextIndex));
+    }
+    static get leafSchema() {
+        return NullifierLeaf.schema;
     }
     getKey() {
-        return this.nullifier.toBigInt();
+        return this.leaf.getKey();
     }
     getNextKey() {
-        return this.nextNullifier.toBigInt();
+        return this.nextKey.toBigInt();
     }
     getNextIndex() {
         return this.nextIndex;
     }
     asLeaf() {
-        return new NullifierLeaf(this.nullifier);
+        return this.leaf;
     }
     toBuffer() {
         return Buffer.concat(this.toHashInputs());
     }
     toHashInputs() {
         return [
-            Buffer.from(this.nullifier.toBuffer()),
-            Buffer.from(this.nextNullifier.toBuffer()),
+            ...this.leaf.toHashInputs(),
+            Buffer.from(this.nextKey.toBuffer()),
             Buffer.from(toBufferBE(this.nextIndex, 32))
         ];
     }
@@ -54,23 +57,23 @@ import { z } from 'zod';
         return this.toHashInputs().map((buf)=>Fr.fromBuffer(buf));
     }
     clone() {
-        return new NullifierLeafPreimage(this.nullifier, this.nextNullifier, this.nextIndex);
+        return new NullifierLeafPreimage(this.leaf.clone(), this.nextKey, this.nextIndex);
     }
     static random() {
-        return new NullifierLeafPreimage(Fr.random(), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
+        return new NullifierLeafPreimage(NullifierLeaf.random(), Fr.random(), BigInt(Math.floor(Math.random() * 1000)));
     }
     static empty() {
-        return new NullifierLeafPreimage(Fr.ZERO, Fr.ZERO, 0n);
+        return new NullifierLeafPreimage(NullifierLeaf.empty(), Fr.zero(), 0n);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new NullifierLeafPreimage(reader.readObject(Fr), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
+        return new NullifierLeafPreimage(NullifierLeaf.fromBuffer(reader), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
     }
     static fromLeaf(leaf, nextKey, nextIndex) {
-        return new NullifierLeafPreimage(leaf.nullifier, new Fr(nextKey), nextIndex);
+        return new NullifierLeafPreimage(leaf, new Fr(nextKey), nextIndex);
     }
     static clone(preimage) {
-        return new NullifierLeafPreimage(preimage.nullifier, preimage.nextNullifier, preimage.nextIndex);
+        return preimage.clone();
     }
 }
 /**
@@ -88,6 +91,20 @@ import { z } from 'zod';
     toBuffer() {
         return this.nullifier.toBuffer();
     }
+    clone() {
+        return new NullifierLeaf(new Fr(this.nullifier));
+    }
+    toHashInputs() {
+        return [
+            Buffer.from(this.nullifier.toBuffer())
+        ];
+    }
+    static empty() {
+        return new NullifierLeaf(Fr.ZERO);
+    }
+    static random() {
+        return new NullifierLeaf(Fr.random());
+    }
     isEmpty() {
         return this.nullifier.isZero();
     }
@@ -98,6 +115,12 @@ import { z } from 'zod';
         return new NullifierLeaf(new Fr(key));
     }
     static fromBuffer(buf) {
-        return new NullifierLeaf(Fr.fromBuffer(buf));
+        const reader = BufferReader.asReader(buf);
+        return new NullifierLeaf(reader.readObject(Fr));
+    }
+    static get schema() {
+        return z.object({
+            nullifier: schemas.Fr
+        }).transform(({ nullifier })=>new NullifierLeaf(nullifier));
     }
 }

package/dest/trees/nullifier_membership_witness.d.ts

@@ -40,20 +40,32 @@ export declare class NullifierMembershipWitness {
     static get schema(): z.ZodEffects<z.ZodObject<{
         index: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         leafPreimage: z.ZodEffects<z.ZodObject<{
-            nullifier: z.ZodType<Fr, any, string>;
-            nextNullifier: z.ZodType<Fr, any, string>;
+            leaf: z.ZodEffects<z.ZodObject<{
+                nullifier: z.ZodType<Fr, any, string>;
+            }, "strip", z.ZodTypeAny, {
+                nullifier: Fr;
+            }, {
+                nullifier: string;
+            }>, import("./nullifier_leaf.js").NullifierLeaf, {
+                nullifier: string;
+            }>;
+            nextKey: z.ZodType<Fr, any, string>;
             nextIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            nullifier: Fr;
-            nextNullifier: Fr;
+            leaf: import("./nullifier_leaf.js").NullifierLeaf;
+            nextKey: Fr;
             nextIndex: bigint;
         }, {
-            nullifier: string;
-            nextNullifier: string;
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
         }>, NullifierLeafPreimage, {
-            nullifier: string;
-            nextNullifier: string;
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
         }>;
         siblingPath: z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer, string>, z.ZodEffects<z.ZodObject<{
@@ -77,30 +89,34 @@ export declare class NullifierMembershipWitness {
         }>;
     }, "strip", z.ZodTypeAny, {
         index: bigint;
-        siblingPath: SiblingPath<40>;
         leafPreimage: NullifierLeafPreimage;
+        siblingPath: SiblingPath<40>;
     }, {
         index: string | number | bigint;
+        leafPreimage: {
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
+            nextIndex: string | number | bigint;
+        };
         siblingPath: string | {
             type: "Buffer";
             data: number[];
         };
+    }>, NullifierMembershipWitness, {
+        index: string | number | bigint;
         leafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
+            leaf: {
+                nullifier: string;
+            };
+            nextKey: string;
             nextIndex: string | number | bigint;
         };
-    }>, NullifierMembershipWitness, {
-        index: string | number | bigint;
         siblingPath: string | {
             type: "Buffer";
             data: number[];
         };
-        leafPreimage: {
-            nullifier: string;
-            nextNullifier: string;
-            nextIndex: string | number | bigint;
-        };
     }>;
     static random(): NullifierMembershipWitness;
     /**

package/dest/trees/nullifier_membership_witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;;IAXtE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAGxE,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,CAAC,MAAM;IAQb;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAIvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;CAQrD"}
+{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;;IAXtE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAGxE,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,CAAC,MAAM;IAQb;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAIvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;CAQrD"}

package/dest/trees/protocol_contract_leaf.d.ts

@@ -62,7 +62,6 @@ export declare class ProtocolContractLeafPreimage implements IndexedTreeLeafPrei
     static random(): ProtocolContractLeafPreimage;
     static empty(): ProtocolContractLeafPreimage;
     static fromBuffer(buffer: Buffer | BufferReader): ProtocolContractLeafPreimage;
-    static fromLeaf(leaf: ProtocolContractLeaf, nextKey: bigint, nextIndex: bigint): ProtocolContractLeafPreimage;
 }
 /**
  * An address to be inserted or checked in the protocol contract tree.

package/dest/trees/protocol_contract_leaf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/protocol_contract_leaf.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,uBAAuB;IAExE;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,oBAAoB;IAI9B,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAKxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,KAAK,IAAI,4BAA4B;IAI5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,4BAA4B;IAS9E,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,4BAA4B;CAG9G;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,eAAe;IAExD;;OAEG;IACI,OAAO,EAAE,EAAE;;IAHlB;;OAEG;IACI,OAAO,EAAE,EAAE;IAGpB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,GAAG,oBAAoB;IAI9D,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;IAIpD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;CAGrD"}
+{"version":3,"file":"protocol_contract_leaf.d.ts","sourceRoot":"","sources":["../../src/trees/protocol_contract_leaf.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,uBAAuB;IAExE;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,SAAS,EAAE,MAAM;;IAXxB;;OAEG;IACI,OAAO,EAAE,EAAE;IAClB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,IAAI,MAAM;IAIhB,UAAU,IAAI,MAAM;IAIpB,YAAY,IAAI,MAAM;IAItB,MAAM,IAAI,oBAAoB;IAI9B,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,MAAM,EAAE;IAKxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,KAAK,IAAI,4BAA4B;IAI5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,4BAA4B;CAQ/E;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,eAAe;IAExD;;OAEG;IACI,OAAO,EAAE,EAAE;;IAHlB;;OAEG;IACI,OAAO,EAAE,EAAE;IAGpB,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,OAAO;IAIlB,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,GAAG,oBAAoB;IAI9D,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;IAIpD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB;CAGrD"}

package/dest/trees/protocol_contract_leaf.js

@@ -69,9 +69,6 @@ import { z } from 'zod';
         const reader = BufferReader.asReader(buffer);
         return new ProtocolContractLeafPreimage(reader.readObject(Fr), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
     }
-    static fromLeaf(leaf, nextKey, nextIndex) {
-        return new ProtocolContractLeafPreimage(leaf.address, new Fr(nextKey), nextIndex);
-    }
 }
 /**
  * An address to be inserted or checked in the protocol contract tree.