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

package/dest/tests/mocks.d.ts

@@ -2,27 +2,36 @@ import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '../abi/abi.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import { L2Block } from '../block/l2_block.js';
+import type { CommitteeAttestationsAndSigners } from '../block/proposal/attestations_and_signers.js';
+import { PublishedL2Block } from '../block/published_l2_block.js';
 import type { ContractInstanceWithAddress } from '../contract/index.js';
+import { GasFees } from '../gas/gas_fees.js';
 import { ExtendedNote, UniqueNote } from '../note/extended_note.js';
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { BlockProposal } from '../p2p/block_proposal.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { BlockHeader, PrivateCallExecutionResult, PrivateExecutionResult, Tx } from '../tx/index.js';
+import { BlockHeader, StateReference, Tx } from '../tx/index.js';
 import { TxSimulationResult } from '../tx/simulated_tx.js';
 import { TxHash } from '../tx/tx_hash.js';
 export declare const randomTxHash: () => TxHash;
-export declare const randomExtendedNote: ({ note, owner, contractAddress, txHash, storageSlot, noteTypeId, }?: Partial<ExtendedNote>) => Promise<ExtendedNote>;
-export declare const randomUniqueNote: ({ note, owner, contractAddress, txHash, storageSlot, noteTypeId, nonce, }?: Partial<UniqueNote>) => Promise<UniqueNote>;
-export declare const mockPrivateCallExecutionResult: (seed?: number, numberOfNonRevertiblePublicCallRequests?: number, numberOfRevertiblePublicCallRequests?: number, hasPublicTeardownCallRequest?: boolean) => Promise<PrivateCallExecutionResult>;
-export declare const mockPrivateExecutionResult: (seed?: number) => Promise<PrivateExecutionResult>;
-export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, hasPublicTeardownCallRequest, feePayer, clientIvcProof, }?: {
+export declare const randomExtendedNote: ({ note, recipient, contractAddress, txHash, storageSlot, }?: Partial<ExtendedNote>) => Promise<ExtendedNote>;
+export declare const randomUniqueNote: ({ note, recipient, contractAddress, txHash, storageSlot, noteNonce, }?: Partial<UniqueNote>) => Promise<UniqueNote>;
+export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, numberOfRevertibleNullifiers, hasPublicTeardownCallRequest, publicCalldataSize, feePayer, clientIvcProof, maxPriorityFeesPerGas, chainId, version, vkTreeRoot, protocolContractTreeRoot, }?: {
     numberOfNonRevertiblePublicCallRequests?: number;
     numberOfRevertiblePublicCallRequests?: number;
+    numberOfRevertibleNullifiers?: number;
     hasPublicTeardownCallRequest?: boolean;
+    publicCalldataSize?: number;
     feePayer?: AztecAddress;
     clientIvcProof?: ClientIvcProof;
+    maxPriorityFeesPerGas?: GasFees;
+    chainId?: Fr;
+    version?: Fr;
+    vkTreeRoot?: Fr;
+    protocolContractTreeRoot?: Fr;
 }) => Promise<Tx>;
-export declare const mockTxForRollup: (seed?: number) => Promise<Tx>;
+export declare const mockTxForRollup: (seed?: number, opts?: Parameters<typeof mockTx>[1]) => Promise<Tx>;
 export declare const mockSimulatedTx: (seed?: number) => Promise<TxSimulationResult>;
 export declare const randomContractArtifact: () => ContractArtifact;
 export declare const randomContractInstanceWithAddress: (opts?: {
@@ -34,10 +43,19 @@ export declare const randomDeployedContract: () => Promise<{
 }>;
 export interface MakeConsensusPayloadOptions {
     signer?: Secp256k1Signer;
+    attesterSigner?: Secp256k1Signer;
+    proposerSigner?: Secp256k1Signer;
     header?: BlockHeader;
     archive?: Fr;
+    stateReference?: StateReference;
     txHashes?: TxHash[];
+    txs?: Tx[];
 }
-export declare const makeBlockProposal: (options?: MakeConsensusPayloadOptions) => Promise<BlockProposal>;
-export declare const makeBlockAttestation: (options?: MakeConsensusPayloadOptions) => Promise<BlockAttestation>;
+export declare const makeAndSignCommitteeAttestationsAndSigners: (attestationsAndSigners: CommitteeAttestationsAndSigners, signer?: Secp256k1Signer) => import("../block/index.js").Signature;
+export declare const makeBlockProposal: (options?: MakeConsensusPayloadOptions) => BlockProposal;
+export declare const makeBlockAttestation: (options?: MakeConsensusPayloadOptions) => BlockAttestation;
+export declare const makeBlockAttestationFromBlock: (block: L2Block, attesterSigner?: Secp256k1Signer, proposerSigner?: Secp256k1Signer) => BlockAttestation;
+export declare function randomPublishedL2Block(l2BlockNumber: number, opts?: {
+    signers?: Secp256k1Signer[];
+}): Promise<PublishedL2Block>;
 //# sourceMappingURL=mocks.d.ts.map

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;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAWxE,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,EACL,WAAW,EAGX,0BAA0B,EAC1B,sBAAsB,EAEtB,EAAE,EACH,MAAM,gBAAgB,CAAC;AAExB,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,wEAO5B,QAAQ,YAAY,CAAC,0BASvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,+EAQ1B,QAAQ,UAAU,CAAC,wBAUrB,CAAC;AAEF,eAAO,MAAM,8BAA8B,iMA8C1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,oDAEtC,CAAC;AAEF,eAAO,MAAM,MAAM,+JAQd;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,gBAsDF,CAAC;AAEF,eAAO,MAAM,eAAe,gCAC2E,CAAC;AAExG,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAUxC,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":"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"}

package/dest/tests/mocks.js

@@ -1,15 +1,17 @@
-import { MAX_ENQUEUED_CALLS_PER_TX } from '@aztec/constants';
+import { MAX_ENQUEUED_CALLS_PER_TX, MAX_INCLUDE_BY_TIMESTAMP_DURATION } from '@aztec/constants';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import { times } from '@aztec/foundation/collection';
 import { Secp256k1Signer, randomBytes } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import { CommitteeAttestation, L1PublishedData } from '../block/index.js';
+import { L2Block } from '../block/l2_block.js';
+import { PublishedL2Block } from '../block/published_l2_block.js';
 import { computeContractAddressFromInstance } from '../contract/contract_address.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { SerializableContractInstance } from '../contract/contract_instance.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { GasSettings } from '../gas/gas_settings.js';
-import { computeVarArgsHash } from '../hash/hash.js';
 import { Nullifier } from '../kernel/nullifier.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import { PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
@@ -21,58 +23,36 @@ import { BlockProposal } from '../p2p/block_proposal.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { CallContext, CountedPublicExecutionRequest, PrivateCallExecutionResult, PrivateExecutionResult, PublicExecutionRequest, Tx } from '../tx/index.js';
+import { HashedValues, PrivateCallExecutionResult, PrivateExecutionResult, Tx } from '../tx/index.js';
 import { PublicSimulationOutput } from '../tx/public_simulation_output.js';
 import { TxSimulationResult, accumulatePrivateReturnValues } from '../tx/simulated_tx.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
-import { makeCombinedConstantData, makeGas, makeHeader, makePublicCallRequest } from './factories.js';
+import { makeGas, makeGlobalVariables, makeHeader, makePublicCallRequest } from './factories.js';
 export const randomTxHash = ()=>TxHash.random();
-export const randomExtendedNote = async ({ note = Note.random(), owner = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), noteTypeId = NoteSelector.random() } = {})=>{
-    return new ExtendedNote(note, owner ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, noteTypeId, txHash);
+export const randomExtendedNote = async ({ note = Note.random(), recipient = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random() } = {})=>{
+    return new ExtendedNote(note, recipient ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, txHash);
 };
-export const randomUniqueNote = async ({ note = Note.random(), owner = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), noteTypeId = NoteSelector.random(), nonce = Fr.random() } = {})=>{
-    return new UniqueNote(note, owner ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, noteTypeId, txHash, nonce);
+export const randomUniqueNote = async ({ note = Note.random(), recipient = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), noteNonce = Fr.random() } = {})=>{
+    return new UniqueNote(note, recipient ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, txHash, noteNonce);
 };
-export const mockPrivateCallExecutionResult = async (seed = 1, numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, hasPublicTeardownCallRequest = false)=>{
-    const totalPublicCallRequests = numberOfNonRevertiblePublicCallRequests + numberOfRevertiblePublicCallRequests + (hasPublicTeardownCallRequest ? 1 : 0);
-    const isForPublic = totalPublicCallRequests > 0;
-    let enqueuedPublicFunctionCalls = [];
-    let publicTeardownFunctionCall = PublicExecutionRequest.empty();
-    if (isForPublic) {
-        const publicCallRequests = times(totalPublicCallRequests, (i)=>makePublicCallRequest(seed + 0x102 + i)).reverse(); // Reverse it so that they are sorted by counters in descending order.
-        const publicFunctionArgs = times(totalPublicCallRequests, (i)=>[
-                new Fr(seed + i * 100),
-                new Fr(seed + i * 101)
-            ]);
-        for(let i = 0; i < publicCallRequests.length; i++){
-            const r = publicCallRequests[i];
-            r.argsHash = await computeVarArgsHash(publicFunctionArgs[i]);
-            i++;
-        }
-        if (hasPublicTeardownCallRequest) {
-            const request = publicCallRequests.shift();
-            const args = publicFunctionArgs.shift();
-            publicTeardownFunctionCall = new PublicExecutionRequest(CallContext.fromFields(request.toFields()), args);
-        }
-        enqueuedPublicFunctionCalls = publicCallRequests.map((r, i)=>new PublicExecutionRequest(CallContext.fromFields(r.toFields()), publicFunctionArgs[i]));
-    }
-    return new PrivateCallExecutionResult(Buffer.from(''), Buffer.from(''), new Map(), PrivateCircuitPublicInputs.empty(), new Map(), [], new Map(), [], [], enqueuedPublicFunctionCalls.map((call, index)=>new CountedPublicExecutionRequest(call, index)), publicTeardownFunctionCall, []);
-};
-export const mockPrivateExecutionResult = async (seed = 1)=>{
-    return new PrivateExecutionResult(await mockPrivateCallExecutionResult(seed), Fr.zero());
-};
-export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, hasPublicTeardownCallRequest = false, 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(), maxPriorityFeesPerGas, chainId = Fr.ZERO, version = Fr.ZERO, vkTreeRoot = Fr.ZERO, protocolContractTreeRoot = Fr.ZERO } = {})=>{
     const totalPublicCallRequests = numberOfNonRevertiblePublicCallRequests + numberOfRevertiblePublicCallRequests + (hasPublicTeardownCallRequest ? 1 : 0);
     const isForPublic = totalPublicCallRequests > 0;
     const data = PrivateKernelTailCircuitPublicInputs.empty();
     const firstNullifier = new Nullifier(new Fr(seed + 1), 0, Fr.ZERO);
     data.constants.txContext.gasSettings = GasSettings.default({
-        maxFeesPerGas: new GasFees(10, 10)
+        maxFeesPerGas: new GasFees(10, 10),
+        maxPriorityFeesPerGas
     });
     data.feePayer = feePayer ?? await AztecAddress.random();
-    let enqueuedPublicFunctionCalls = [];
-    let publicTeardownFunctionCall = PublicExecutionRequest.empty();
+    data.constants.txContext.chainId = chainId;
+    data.constants.txContext.version = version;
+    data.constants.vkTreeRoot = vkTreeRoot;
+    data.constants.protocolContractTreeRoot = protocolContractTreeRoot;
+    // Set includeByTimestamp to the maximum allowed duration from the current time.
+    data.includeByTimestamp = BigInt(Math.floor(Date.now() / 1000) + MAX_INCLUDE_BY_TIMESTAMP_DURATION);
+    const publicFunctionCalldata = [];
     if (!isForPublic) {
         data.forRollup.end.nullifiers[0] = firstNullifier.value;
     } else {
@@ -80,36 +60,41 @@ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests
         data.forPublic = PartialPrivateTailPublicInputsForPublic.empty();
         const revertibleBuilder = new PrivateToPublicAccumulatedDataBuilder();
         const nonRevertibleBuilder = new PrivateToPublicAccumulatedDataBuilder();
-        const publicCallRequests = times(totalPublicCallRequests, (i)=>makePublicCallRequest(seed + 0x102 + i)).reverse(); // Reverse it so that they are sorted by counters in descending order.
-        const publicFunctionArgs = times(totalPublicCallRequests, (i)=>[
-                new Fr(seed + i * 100),
-                new Fr(seed + i * 101)
-            ]);
+        const publicCallRequests = times(totalPublicCallRequests, (i)=>makePublicCallRequest(seed + 0x102 + i));
+        const calldata = times(totalPublicCallRequests, (i)=>times(publicCalldataSize, (j)=>new Fr(seed + (i * 13 + j))));
         for(let i = 0; i < publicCallRequests.length; i++){
-            const r = publicCallRequests[i];
-            r.argsHash = await computeVarArgsHash(publicFunctionArgs[i]);
+            const hashedCalldata = await HashedValues.fromCalldata(calldata[i]);
+            publicFunctionCalldata.push(hashedCalldata);
+            publicCallRequests[i].calldataHash = hashedCalldata.hash;
         }
         if (hasPublicTeardownCallRequest) {
-            const request = publicCallRequests.shift();
-            data.forPublic.publicTeardownCallRequest = request;
-            const args = publicFunctionArgs.shift();
-            publicTeardownFunctionCall = new PublicExecutionRequest(CallContext.fromFields(request.toFields()), args);
+            data.forPublic.publicTeardownCallRequest = publicCallRequests.pop();
         }
-        enqueuedPublicFunctionCalls = publicCallRequests.map((r, i)=>new PublicExecutionRequest(CallContext.fromFields(r.toFields()), publicFunctionArgs[i]));
         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();
     }
-    const tx = new Tx(data, clientIvcProof, [], enqueuedPublicFunctionCalls, publicTeardownFunctionCall);
-    return tx;
+    return await Tx.create({
+        data,
+        clientIvcProof,
+        contractClassLogFields: [],
+        publicFunctionCalldata
+    });
 };
-export const mockTxForRollup = (seed = 1)=>mockTx(seed, {
+export const mockTxForRollup = (seed = 1, opts = {})=>mockTx(seed, {
+        ...opts,
         numberOfNonRevertiblePublicCallRequests: 0,
         numberOfRevertiblePublicCallRequests: 0
     });
+const emptyPrivateCallExecutionResult = ()=>new PrivateCallExecutionResult(Buffer.from(''), Buffer.from(''), new Map(), PrivateCircuitPublicInputs.empty(), new Map(), [], new Map(), [], [], [], []);
+const emptyPrivateExecutionResult = ()=>new PrivateExecutionResult(emptyPrivateCallExecutionResult(), Fr.zero(), []);
 export const mockSimulatedTx = async (seed = 1)=>{
-    const privateExecutionResult = await mockPrivateExecutionResult(seed);
+    const privateExecutionResult = emptyPrivateExecutionResult();
     const tx = await mockTx(seed);
-    const output = new PublicSimulationOutput(undefined, makeCombinedConstantData(), await TxEffect.random(), [
+    const output = new PublicSimulationOutput(undefined, makeGlobalVariables(), await TxEffect.random(), [
         accumulatePrivateReturnValues(privateExecutionResult)
     ], {
         totalGas: makeGas(),
@@ -122,13 +107,13 @@ export const mockSimulatedTx = async (seed = 1)=>{
 export const randomContractArtifact = ()=>({
         name: randomBytes(4).toString('hex'),
         functions: [],
+        nonDispatchPublicFunctions: [],
         outputs: {
             structs: {},
             globals: {}
         },
         fileMap: {},
-        storageLayout: {},
-        notes: {}
+        storageLayout: {}
     });
 export const randomContractInstanceWithAddress = async (opts = {}, address)=>{
     const instance = await SerializableContractInstance.random(opts.contractClassId ? {
@@ -147,33 +132,83 @@ export const randomDeployedContract = async ()=>{
         })
     };
 };
-const makeAndSignConsensusPayload = async (domainSeparator, options)=>{
-    const { signer = Secp256k1Signer.random(), header = makeHeader(1), archive = Fr.random(), txHashes = [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5
-    ].map(()=>TxHash.random()) } = options ?? {};
+const makeAndSignConsensusPayload = (domainSeparator, options)=>{
+    const header = options?.header ?? makeHeader(1);
+    const { signer = Secp256k1Signer.random(), archive = Fr.random(), stateReference = header.state } = options ?? {};
     const payload = ConsensusPayload.fromFields({
-        header,
+        header: header.toPropose(),
         archive,
-        txHashes
+        stateReference
     });
-    const hash = await getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
+    const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
     const signature = signer.sign(hash);
     return {
+        blockNumber: header.globalVariables.blockNumber,
         payload,
         signature
     };
 };
-export const makeBlockProposal = async (options)=>{
-    const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
-    return new BlockProposal(payload, signature);
+export const makeAndSignCommitteeAttestationsAndSigners = (attestationsAndSigners, signer = Secp256k1Signer.random())=>{
+    const hash = getHashedSignaturePayloadEthSignedMessage(attestationsAndSigners, SignatureDomainSeparator.attestationsAndSigners);
+    return signer.sign(hash);
+};
+export const makeBlockProposal = (options)=>{
+    const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
+    const txHashes = options?.txHashes ?? [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5
+    ].map(()=>TxHash.random());
+    return new BlockProposal(payload, signature, txHashes, options?.txs ?? []);
 };
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
-export const makeBlockAttestation = async (options)=>{
-    const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
-    return new BlockAttestation(payload, signature);
+export const makeBlockAttestation = (options)=>{
+    const header = options?.header ?? makeHeader(1);
+    const { signer, attesterSigner = signer ?? Secp256k1Signer.random(), proposerSigner = signer ?? Secp256k1Signer.random(), archive = Fr.random(), stateReference = header.state } = options ?? {};
+    const payload = ConsensusPayload.fromFields({
+        header: header.toPropose(),
+        archive,
+        stateReference
+    });
+    // Sign as attester
+    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+    const attestationSignature = attesterSigner.sign(attestationHash);
+    // Sign as proposer
+    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+    const proposerSignature = proposerSigner.sign(proposalHash);
+    return new BlockAttestation(payload, attestationSignature, proposerSignature);
+};
+export const makeBlockAttestationFromBlock = (block, attesterSigner, proposerSigner)=>{
+    const header = block.header;
+    const archive = block.archive.root;
+    const stateReference = block.header.state;
+    const payload = ConsensusPayload.fromFields({
+        header: header.toPropose(),
+        archive,
+        stateReference
+    });
+    // Sign as attester
+    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+    const attestationSigner = attesterSigner ?? Secp256k1Signer.random();
+    const attestationSignature = attestationSigner.sign(attestationHash);
+    // Sign as proposer
+    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+    const proposalSignerToUse = proposerSigner ?? Secp256k1Signer.random();
+    const proposerSignature = proposalSignerToUse.sign(proposalHash);
+    return new BlockAttestation(payload, attestationSignature, proposerSignature);
 };
+export async function randomPublishedL2Block(l2BlockNumber, opts = {}) {
+    const block = await L2Block.random(l2BlockNumber);
+    const l1 = L1PublishedData.fromFields({
+        blockNumber: BigInt(block.number),
+        timestamp: block.header.globalVariables.timestamp,
+        blockHash: Buffer32.random().toString()
+    });
+    const signers = opts.signers ?? times(3, ()=>Secp256k1Signer.random());
+    const atts = await Promise.all(signers.map((signer)=>makeBlockAttestationFromBlock(block, signer)));
+    const attestations = atts.map((attestation, i)=>new CommitteeAttestation(signers[i].address, attestation.signature));
+    return new PublishedL2Block(block, l1, attestations);
+}

package/dest/trees/append_only_tree_snapshot.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import type { ViemAppendOnlyTreeSnapshot } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
@@ -55,14 +53,17 @@ export declare class AppendOnlyTreeSnapshot {
         nextAvailableLeafIndex: string | number | bigint;
     }>;
     getSize(): number;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
     toString(): string;
     static fromBuffer(buffer: Buffer | BufferReader): AppendOnlyTreeSnapshot;
     static fromString(str: string): AppendOnlyTreeSnapshot;
     static fromFields(fields: Fr[] | FieldReader): AppendOnlyTreeSnapshot;
-    static zero(): AppendOnlyTreeSnapshot;
-    isZero(): boolean;
+    static fromViem(snapshot: ViemAppendOnlyTreeSnapshot): AppendOnlyTreeSnapshot;
+    toViem(): ViemAppendOnlyTreeSnapshot;
+    toAbi(): [`0x${string}`, number];
+    static empty(): AppendOnlyTreeSnapshot;
+    isEmpty(): boolean;
     [inspect.custom](): string;
     equals(other: this): boolean;
     static random(): AppendOnlyTreeSnapshot;

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

@@ -1 +1 @@
-{"version":3,"file":"append_only_tree_snapshot.d.ts","sourceRoot":"","sources":["../../src/trees/append_only_tree_snapshot.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAG3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM;;IAbrC;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM;IAGvC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,OAAO;IAIP,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAKxE,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB;IAItD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sBAAsB;IAMrE,MAAM,CAAC,IAAI;IAIX,MAAM,IAAI,OAAO;IAIjB,CAAC,OAAO,CAAC,MAAM,CAAC;IAMT,MAAM,CAAC,KAAK,EAAE,IAAI;IAIzB,MAAM,CAAC,MAAM;CAGd"}
+{"version":3,"file":"append_only_tree_snapshot.d.ts","sourceRoot":"","sources":["../../src/trees/append_only_tree_snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAG3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM;;IAbrC;;OAEG;IACI,IAAI,EAAE,EAAE;IACf;;;;;;;;OAQG;IACI,sBAAsB,EAAE,MAAM;IAGvC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,OAAO;IAIP,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAKxE,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB;IAItD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sBAAsB;IAMrE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,0BAA0B;IAIpD,MAAM,IAAI,0BAA0B;IAOpC,KAAK,IAAI,CAAC,KAAK,MAAM,EAAE,EAAE,MAAM,CAAC;IAIhC,MAAM,CAAC,KAAK;IAIZ,OAAO,IAAI,OAAO;IAIlB,CAAC,OAAO,CAAC,MAAM,CAAC;IAMT,MAAM,CAAC,KAAK,EAAE,IAAI;IAIzB,MAAM,CAAC,MAAM;CAGd"}

package/dest/trees/append_only_tree_snapshot.js

@@ -57,10 +57,25 @@ import { z } from 'zod';
         const reader = FieldReader.asReader(fields);
         return new AppendOnlyTreeSnapshot(reader.readField(), Number(reader.readField().toBigInt()));
     }
-    static zero() {
+    static fromViem(snapshot) {
+        return new AppendOnlyTreeSnapshot(Fr.fromString(snapshot.root), snapshot.nextAvailableLeafIndex);
+    }
+    toViem() {
+        return {
+            root: this.root.toString(),
+            nextAvailableLeafIndex: this.nextAvailableLeafIndex
+        };
+    }
+    toAbi() {
+        return [
+            this.root.toString(),
+            this.nextAvailableLeafIndex
+        ];
+    }
+    static empty() {
         return new AppendOnlyTreeSnapshot(Fr.ZERO, 0);
     }
-    isZero() {
+    isEmpty() {
         return this.root.isZero() && this.nextAvailableLeafIndex === 0;
     }
     [inspect.custom]() {

package/dest/trees/database_public_state_source.d.ts

@@ -0,0 +1,11 @@
+import { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '../aztec-address/index.js';
+import type { MerkleTreeReadOperations } from '../interfaces/merkle_tree_operations.js';
+import type { PublicStateSource } from '../interfaces/public_state_source.js';
+export type { PublicStateSource };
+export declare class DatabasePublicStateSource implements PublicStateSource {
+    private db;
+    constructor(db: MerkleTreeReadOperations);
+    storageRead(contractAddress: AztecAddress, slot: Fr): Promise<Fr>;
+}
+//# sourceMappingURL=database_public_state_source.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"database_public_state_source.d.ts","sourceRoot":"","sources":["../../src/trees/database_public_state_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,qBAAa,yBAA0B,YAAW,iBAAiB;IACrD,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,wBAAwB;IAE1C,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;CAexE"}

package/dest/trees/database_public_state_source.js

@@ -0,0 +1,18 @@
+import { Fr } from '@aztec/foundation/fields';
+import { computePublicDataTreeLeafSlot } from '../hash/hash.js';
+import { MerkleTreeId } from './merkle_tree_id.js';
+export class DatabasePublicStateSource {
+    db;
+    constructor(db){
+        this.db = db;
+    }
+    async storageRead(contractAddress, slot) {
+        const leafSlot = (await computePublicDataTreeLeafSlot(contractAddress, slot)).toBigInt();
+        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+        if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
+            return Fr.ZERO;
+        }
+        const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        return preimage.leaf.value;
+    }
+}

package/dest/trees/index.d.ts

@@ -6,4 +6,5 @@ export * from './merkle_tree_id.js';
 export * from './nullifier_membership_witness.js';
 export * from './public_data_witness.js';
 export * from '../interfaces/merkle_tree_operations.js';
+export * from './database_public_state_source.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/trees/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yCAAyC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/trees/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yCAAyC,CAAC;AACxD,cAAc,mCAAmC,CAAC"}

package/dest/trees/index.js

@@ -6,3 +6,4 @@ export * from './merkle_tree_id.js';
 export * from './nullifier_membership_witness.js';
 export * from './public_data_witness.js';
 export * from '../interfaces/merkle_tree_operations.js';
+export * from './database_public_state_source.js';

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

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
@@ -12,11 +10,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 +23,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 +99,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"}