@aztec/simulator 0.67.1 → 0.68.1

package/dest/public/executor_metrics.js

@@ -16,6 +16,11 @@ export class ExecutorMetrics {
             unit: 'mana/s',
             valueType: ValueType.INT,
         });
+        this.privateEffectsInsertions = meter.createHistogram(Metrics.PUBLIC_EXECUTION_PRIVATE_EFFECTS_INSERTION, {
+            description: 'Private effects insertion time',
+            unit: 'us',
+            valueType: ValueType.INT,
+        });
     }
     recordFunctionSimulation(durationMs, manaUsed, fnName) {
         this.fnCount.add(1, {
@@ -36,5 +41,10 @@ export class ExecutorMetrics {
             [Attributes.OK]: false,
         });
     }
+    recordPrivateEffectsInsertion(durationUs, type) {
+        this.privateEffectsInsertions.record(Math.ceil(durationUs), {
+            [Attributes.REVERTIBILITY]: type,
+        });
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUVWLE9BQU8sRUFJUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxNQUFNLE9BQU8sZUFBZTtJQU0xQixZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGdCQUFnQjtRQUMxRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsZ0NBQWdDLEVBQUU7WUFDakYsV0FBVyxFQUFFLDhCQUE4QjtTQUM1QyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLG1DQUFtQyxFQUFFO1lBQ25GLFdBQVcsRUFBRSx5Q0FBeUM7WUFDdEQsSUFBSSxFQUFFLElBQUk7WUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywwQ0FBMEMsRUFBRTtZQUM3RixXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLElBQUksRUFBRSxRQUFRO1lBQ2QsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCx3QkFBd0IsQ0FBQyxVQUFrQixFQUFFLFFBQWdCLEVBQUUsTUFBYztRQUMzRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDbEIsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSTtZQUNyQixDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU07WUFDckMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsUUFBUTtTQUNqQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDOUMsSUFBSSxVQUFVLEdBQUcsQ0FBQyxJQUFJLFFBQVEsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxHQUFHLFVBQVUsQ0FBQyxDQUFDO1lBQ2pFLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRTtnQkFDdkMsQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxNQUFNO2FBQ3RDLENBQUMsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0lBRUQsK0JBQStCO1FBQzdCLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUNsQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLO1NBQ3ZCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUVWLE9BQU8sRUFJUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxNQUFNLE9BQU8sZUFBZTtJQU8xQixZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGdCQUFnQjtRQUMxRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsZ0NBQWdDLEVBQUU7WUFDakYsV0FBVyxFQUFFLDhCQUE4QjtTQUM1QyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLG1DQUFtQyxFQUFFO1lBQ25GLFdBQVcsRUFBRSx5Q0FBeUM7WUFDdEQsSUFBSSxFQUFFLElBQUk7WUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywwQ0FBMEMsRUFBRTtZQUM3RixXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLElBQUksRUFBRSxRQUFRO1lBQ2QsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyx3QkFBd0IsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywwQ0FBMEMsRUFBRTtZQUN4RyxXQUFXLEVBQUUsZ0NBQWdDO1lBQzdDLElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCx3QkFBd0IsQ0FBQyxVQUFrQixFQUFFLFFBQWdCLEVBQUUsTUFBYztRQUMzRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDbEIsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSTtZQUNyQixDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU07WUFDckMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsUUFBUTtTQUNqQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDOUMsSUFBSSxVQUFVLEdBQUcsQ0FBQyxJQUFJLFFBQVEsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxHQUFHLFVBQVUsQ0FBQyxDQUFDO1lBQ2pFLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRTtnQkFDdkMsQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxNQUFNO2FBQ3RDLENBQUMsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0lBRUQsK0JBQStCO1FBQzdCLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUNsQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLO1NBQ3ZCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCw2QkFBNkIsQ0FBQyxVQUFrQixFQUFFLElBQXFDO1FBQ3JGLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUMxRCxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsRUFBRSxJQUFJO1NBQ2pDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRiJ9

package/dest/public/fee_payment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee_payment.d.ts","sourceRoot":"","sources":["../../src/public/fee_payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,MAEvE;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,CAMzE"}
+{"version":3,"file":"fee_payment.d.ts","sourceRoot":"","sources":["../../src/public/fee_payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,MAEvE;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,CAMzE"}

package/dest/public/fee_payment.js

@@ -1,11 +1,12 @@
 import { computePublicDataTreeLeafSlot, deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
 import { Fr } from '@aztec/foundation/fields';
-import { ProtocolContractAddress, ProtocolContractArtifact } from '@aztec/protocol-contracts';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { FeeJuiceArtifact } from '@aztec/protocol-contracts/fee-juice';
 /**
  * Computes the storage slot within the Fee Juice contract for the balance of the fee payer.
  */
 export function computeFeePayerBalanceStorageSlot(feePayer) {
-    return deriveStorageSlotInMap(ProtocolContractArtifact.FeeJuice.storageLayout.balances.slot, feePayer);
+    return deriveStorageSlotInMap(FeeJuiceArtifact.storageLayout.balances.slot, feePayer);
 }
 /**
  * Computes the leaf slot in the public data tree for the balance of the fee payer in the Fee Juice.
@@ -17,4 +18,4 @@ export function computeFeePayerBalanceLeafSlot(feePayer) {
     const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
     return computePublicDataTreeLeafSlot(ProtocolContractAddress.FeeJuice, balanceSlot);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2ZlZV9wYXltZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWhHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU5Rjs7R0FFRztBQUNILE1BQU0sVUFBVSxpQ0FBaUMsQ0FBQyxRQUFzQjtJQUN0RSxPQUFPLHNCQUFzQixDQUFDLHdCQUF3QixDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQztBQUN6RyxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsOEJBQThCLENBQUMsUUFBc0I7SUFDbkUsSUFBSSxRQUFRLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQztRQUN0QixPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDakIsQ0FBQztJQUNELE1BQU0sV0FBVyxHQUFHLGlDQUFpQyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2hFLE9BQU8sNkJBQTZCLENBQUMsdUJBQXVCLENBQUMsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQ3RGLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2ZlZV9wYXltZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWhHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUV2RTs7R0FFRztBQUNILE1BQU0sVUFBVSxpQ0FBaUMsQ0FBQyxRQUFzQjtJQUN0RSxPQUFPLHNCQUFzQixDQUFDLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3hGLENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSw4QkFBOEIsQ0FBQyxRQUFzQjtJQUNuRSxJQUFJLFFBQVEsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1FBQ3RCLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQztJQUNqQixDQUFDO0lBQ0QsTUFBTSxXQUFXLEdBQUcsaUNBQWlDLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEUsT0FBTyw2QkFBNkIsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDdEYsQ0FBQyJ9

package/dest/public/fixtures/index.d.ts

@@ -1,32 +1,38 @@
-import { PublicExecutionRequest, Tx } from '@aztec/circuit-types';
-import { type AvmCircuitInputs, type ContractClassPublic, type ContractInstanceWithAddress, FunctionSelector, Gas, type PublicFunction } from '@aztec/circuits.js';
+import { type MerkleTreeWriteOperations, PublicExecutionRequest, Tx } from '@aztec/circuit-types';
+import { type AvmCircuitInputs, type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, FunctionSelector, Gas, type PublicFunction } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-export declare function simulateAvmTestContractGenerateCircuitInputs(functionName: string, calldata?: Fr[], expectRevert?: boolean, assertionErrString?: string): Promise<AvmCircuitInputs>;
+export declare function simulateAvmTestContractGenerateCircuitInputs(functionName: string, args?: Fr[], expectRevert?: boolean, contractDataSource?: MockedAvmTestContractDataSource, assertionErrString?: string): Promise<AvmCircuitInputs>;
+export declare function simulateAvmTestContractCall(functionName: string, args?: Fr[], expectRevert?: boolean, contractDataSource?: MockedAvmTestContractDataSource): Promise<void>;
 /**
  * Craft a carrier transaction for a public call for simulation by PublicTxSimulator.
  */
 export declare function createTxForPublicCall(executionRequest: PublicExecutionRequest, gasUsedByPrivate?: Gas, isTeardown?: boolean): Tx;
-export declare class MockedAvmTestContractDataSource {
+export declare class MockedAvmTestContractDataSource implements ContractDataSource {
+    private skipContractDeployments;
     private fnName;
-    private bytecode;
     fnSelector: FunctionSelector;
+    private bytecode;
     private publicFn;
-    private contractClass;
-    contractInstance: ContractInstanceWithAddress;
     private bytecodeCommitment;
+    private contractClasses;
+    contractInstances: Map<string, ContractInstanceWithAddress>;
+    firstContractInstance: ContractInstanceWithAddress;
+    instanceSameClassAsFirstContract: ContractInstanceWithAddress;
     otherContractInstance: ContractInstanceWithAddress;
-    constructor();
+    constructor(skipContractDeployments?: boolean);
+    deployContracts(merkleTrees: MerkleTreeWriteOperations): Promise<void>;
+    static create(merkleTrees: MerkleTreeWriteOperations, skipContractDeployments?: boolean): Promise<MockedAvmTestContractDataSource>;
     getPublicFunction(_address: AztecAddress, _selector: FunctionSelector): Promise<PublicFunction>;
     getBlockNumber(): Promise<number>;
-    getContractClass(_id: Fr): Promise<ContractClassPublic>;
+    getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
     getBytecodeCommitment(_id: Fr): Promise<Fr>;
     addContractClass(_contractClass: ContractClassPublic): Promise<void>;
-    getContract(address: AztecAddress): Promise<ContractInstanceWithAddress>;
+    getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
     getContractClassIds(): Promise<Fr[]>;
     getContractArtifact(_address: AztecAddress): Promise<ContractArtifact | undefined>;
     getContractFunctionName(_address: AztecAddress, _selector: FunctionSelector): Promise<string>;
-    addContractArtifact(_address: AztecAddress, _contract: ContractArtifact): Promise<void>;
+    registerContractFunctionNames(_address: AztecAddress, _names: Record<string, string>): Promise<void>;
 }
 //# sourceMappingURL=index.d.ts.map

package/dest/public/fixtures/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,sBAAsB,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EACL,KAAK,gBAAgB,EAGrB,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAGhC,gBAAgB,EAChB,GAAG,EAOH,KAAK,cAAc,EAOpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AASrD,wBAAsB,4CAA4C,CAChE,YAAY,EAAE,MAAM,EACpB,QAAQ,GAAE,EAAE,EAAO,EACnB,YAAY,GAAE,OAAe,EAC7B,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CA4D3B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,sBAAsB,EACxC,gBAAgB,GAAE,GAAiB,EACnC,UAAU,GAAE,OAAe,GAC1B,EAAE,CAgCJ;AAED,qBAAa,+BAA+B;IAC1C,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAS;IAClB,UAAU,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,aAAa,CAAsB;IACpC,gBAAgB,EAAE,2BAA2B,CAAC;IACrD,OAAO,CAAC,kBAAkB,CAAK;IACxB,qBAAqB,EAAE,2BAA2B,CAAC;;IA0B1D,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAI/F,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,gBAAgB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAIvD,qBAAqB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAI3C,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAQxE,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAIlF,uBAAuB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7F,mBAAmB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,yBAAyB,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EACL,KAAK,gBAAgB,EAGrB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAGhC,gBAAgB,EAChB,GAAG,EAQH,KAAK,cAAc,EAOpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AAmBrD,wBAAsB,4CAA4C,CAChE,YAAY,EAAE,MAAM,EACpB,IAAI,GAAE,EAAE,EAAO,EACf,YAAY,GAAE,OAAe,EAC7B,kBAAkB,kCAAwC,EAC1D,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CA4C3B;AAED,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,MAAM,EACpB,IAAI,GAAE,EAAE,EAAO,EACf,YAAY,GAAE,OAAe,EAC7B,kBAAkB,kCAAwC,iBAkC3D;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,sBAAsB,EACxC,gBAAgB,GAAE,GAAiB,EACnC,UAAU,GAAE,OAAe,GAC1B,EAAE,CAgCJ;AAED,qBAAa,+BAAgC,YAAW,kBAAkB;IAmB5D,OAAO,CAAC,uBAAuB;IAlB3C,OAAO,CAAC,MAAM,CAAqB;IAC5B,UAAU,EAAE,gBAAgB,CAAmD;IACtF,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,kBAAkB,CAAK;IAG/B,OAAO,CAAC,eAAe,CAA+C;IAE/D,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAa;IAExE,qBAAqB,EAAE,2BAA2B,CAEvD;IACK,gCAAgC,EAAE,2BAA2B,CACa;IAC1E,qBAAqB,EAAE,2BAA2B,CAAC;gBAEtC,uBAAuB,GAAE,OAAe;IAuCtD,eAAe,CAAC,WAAW,EAAE,yBAAyB;WA6BxC,MAAM,CACxB,WAAW,EAAE,yBAAyB,EACtC,uBAAuB,GAAE,OAAe,GACvC,OAAO,CAAC,+BAA+B,CAAC;IAQ3C,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAI/F,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIlE,qBAAqB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAI3C,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAapF,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAIlF,uBAAuB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7F,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrG"}

package/dest/public/fixtures/index.js

@@ -1,37 +1,31 @@
 import { MerkleTreeId, PublicExecutionRequest, Tx } from '@aztec/circuit-types';
-import { BlockHeader, CallContext, DEFAULT_GAS_LIMIT, DEPLOYER_CONTRACT_ADDRESS, FunctionSelector, Gas, GasFees, GasSettings, GlobalVariables, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PublicKeys, RollupValidationRequests, SerializableContractInstance, TxConstantData, TxContext, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
+import { BlockHeader, CallContext, DEFAULT_GAS_LIMIT, DEPLOYER_CONTRACT_ADDRESS, FunctionSelector, Gas, GasFees, GasSettings, GlobalVariables, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PublicKeys, RollupValidationRequests, SerializableContractInstance, TxConstantData, TxContext, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
 import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
-import { AvmTestContractArtifact } from '@aztec/noir-contracts.js';
-import { PublicTxSimulator, WorldStateDB } from '@aztec/simulator';
+import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
+import { AvmEphemeralForest, AvmSimulator, PublicEnqueuedCallSideEffectTrace, PublicTxSimulator, WorldStateDB, } from '@aztec/simulator';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { MerkleTrees } from '@aztec/world-state';
 import { strict as assert } from 'assert';
-export async function simulateAvmTestContractGenerateCircuitInputs(functionName, calldata = [], expectRevert = false, assertionErrString) {
-    const sender = AztecAddress.random();
-    const functionSelector = getAvmTestContractFunctionSelector(functionName);
-    calldata = [functionSelector.toField(), ...calldata];
-    const globalVariables = GlobalVariables.empty();
-    globalVariables.gasFees = GasFees.empty();
-    globalVariables.timestamp = new Fr(99833);
-    const telemetry = new NoopTelemetryClient();
-    const merkleTrees = await (await MerkleTrees.new(openTmpStore(), telemetry)).fork();
-    const contractDataSource = new MockedAvmTestContractDataSource();
+import { initContext, initExecutionEnvironment, initPersistableStateManager } from '../../avm/fixtures/index.js';
+const TIMESTAMP = new Fr(99833);
+export async function simulateAvmTestContractGenerateCircuitInputs(functionName, args = [], expectRevert = false, contractDataSource = new MockedAvmTestContractDataSource(), assertionErrString) {
+    const globals = GlobalVariables.empty();
+    globals.timestamp = TIMESTAMP;
+    const merkleTrees = await (await MerkleTrees.new(openTmpStore(), new NoopTelemetryClient())).fork();
+    await contractDataSource.deployContracts(merkleTrees);
     const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
-    const contractInstance = contractDataSource.contractInstance;
-    const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractInstance.address.toField());
-    await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()], 0);
-    // other contract address used by the bulk test's GETCONTRACTINSTANCE test
-    const otherContractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractDataSource.otherContractInstance.address.toField());
-    await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [otherContractAddressNullifier.toBuffer()], 0);
-    const simulator = new PublicTxSimulator(merkleTrees, worldStateDB, new NoopTelemetryClient(), globalVariables, 
+    const simulator = new PublicTxSimulator(merkleTrees, worldStateDB, new NoopTelemetryClient(), globals, 
     /*doMerkleOperations=*/ true);
-    const callContext = new CallContext(sender, contractInstance.address, contractDataSource.fnSelector, 
+    const sender = AztecAddress.random();
+    const functionSelector = getAvmTestContractFunctionSelector(functionName);
+    args = [functionSelector.toField(), ...args];
+    const callContext = new CallContext(sender, contractDataSource.firstContractInstance.address, contractDataSource.fnSelector, 
     /*isStaticCall=*/ false);
-    const executionRequest = new PublicExecutionRequest(callContext, calldata);
+    const executionRequest = new PublicExecutionRequest(callContext, args);
     const tx = createTxForPublicCall(executionRequest);
     const avmResult = await simulator.simulate(tx);
     if (!expectRevert) {
@@ -48,6 +42,35 @@ export async function simulateAvmTestContractGenerateCircuitInputs(functionName,
     const avmCircuitInputs = avmResult.avmProvingRequest.inputs;
     return avmCircuitInputs;
 }
+export async function simulateAvmTestContractCall(functionName, args = [], expectRevert = false, contractDataSource = new MockedAvmTestContractDataSource()) {
+    const globals = GlobalVariables.empty();
+    globals.timestamp = TIMESTAMP;
+    const merkleTrees = await (await MerkleTrees.new(openTmpStore(), new NoopTelemetryClient())).fork();
+    await contractDataSource.deployContracts(merkleTrees);
+    const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
+    const trace = new PublicEnqueuedCallSideEffectTrace();
+    const ephemeralTrees = await AvmEphemeralForest.create(worldStateDB.getMerkleInterface());
+    const persistableState = initPersistableStateManager({
+        worldStateDB,
+        trace,
+        merkleTrees: ephemeralTrees,
+        doMerkleOperations: true,
+    });
+    const sender = AztecAddress.random();
+    const functionSelector = getAvmTestContractFunctionSelector(functionName);
+    args = [functionSelector.toField(), ...args];
+    const environment = initExecutionEnvironment({
+        calldata: args,
+        globals,
+        address: contractDataSource.firstContractInstance.address,
+        sender,
+    });
+    const context = initContext({ env: environment, persistableState });
+    // First we simulate (though it's not needed in this simple case).
+    const simulator = new AvmSimulator(context);
+    const results = await simulator.execute();
+    expect(results.reverted).toBe(expectRevert);
+}
 /**
  * Craft a carrier transaction for a public call for simulation by PublicTxSimulator.
  */
@@ -65,7 +88,7 @@ export function createTxForPublicCall(executionRequest, gasUsedByPrivate = Gas.e
         forPublic.revertibleAccumulatedData.publicCallRequests[0] = callRequest;
     }
     const teardownGasLimits = isTeardown ? gasLimits : Gas.empty();
-    const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty());
+    const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
     const txContext = new TxContext(Fr.zero(), Fr.zero(), gasSettings);
     const constantData = new TxConstantData(BlockHeader.empty(), txContext, Fr.zero(), Fr.zero());
     const txData = new PrivateKernelTailCircuitPublicInputs(constantData, RollupValidationRequests.empty(), 
@@ -77,14 +100,33 @@ export function createTxForPublicCall(executionRequest, gasUsedByPrivate = Gas.e
     return tx;
 }
 export class MockedAvmTestContractDataSource {
-    constructor() {
+    constructor(skipContractDeployments = false) {
+        this.skipContractDeployments = skipContractDeployments;
         this.fnName = 'public_dispatch';
+        this.fnSelector = getAvmTestContractFunctionSelector(this.fnName);
+        // maps contract class ID to class
+        this.contractClasses = new Map();
+        // maps contract instance address to instance
+        this.contractInstances = new Map();
+        this.firstContractInstance = SerializableContractInstance.default().withAddress(AztecAddress.fromNumber(0));
+        this.instanceSameClassAsFirstContract = SerializableContractInstance.default().withAddress(AztecAddress.fromNumber(0));
         this.bytecode = getAvmTestContractBytecode(this.fnName);
         this.fnSelector = getAvmTestContractFunctionSelector(this.fnName);
         this.publicFn = { bytecode: this.bytecode, selector: this.fnSelector };
-        this.contractClass = makeContractClassPublic(0, this.publicFn);
-        this.contractInstance = makeContractInstanceFromClassId(this.contractClass.id);
         this.bytecodeCommitment = computePublicBytecodeCommitment(this.bytecode);
+        // create enough unique classes to hit the limit (plus two extra)
+        for (let i = 0; i < MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS + 1; i++) {
+            const contractClass = makeContractClassPublic(/*seed=*/ i, this.publicFn);
+            const contractInstance = makeContractInstanceFromClassId(contractClass.id, /*seed=*/ i);
+            this.contractClasses.set(contractClass.id.toString(), contractClass);
+            this.contractInstances.set(contractInstance.address.toString(), contractInstance);
+            if (i === 0) {
+                this.firstContractInstance = contractInstance;
+            }
+        }
+        // a contract with the same class but different instance/address as the first contract
+        this.instanceSameClassAsFirstContract = makeContractInstanceFromClassId(this.firstContractInstance.contractClassId, 
+        /*seed=*/ 1000);
         // The values here should match those in `avm_simulator.test.ts`
         // Used for GETCONTRACTINSTANCE test
         this.otherContractInstance = new SerializableContractInstance({
@@ -96,14 +138,34 @@ export class MockedAvmTestContractDataSource {
             publicKeys: new PublicKeys(new Point(new Fr(0x131415), new Fr(0x161718), false), new Point(new Fr(0x192021), new Fr(0x222324), false), new Point(new Fr(0x252627), new Fr(0x282930), false), new Point(new Fr(0x313233), new Fr(0x343536), false)),
         }).withAddress(AztecAddress.fromNumber(0x4444));
     }
+    async deployContracts(merkleTrees) {
+        if (!this.skipContractDeployments) {
+            for (const contractInstance of this.contractInstances.values()) {
+                const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractInstance.address.toField());
+                await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()], 0);
+            }
+            const instanceSameClassAsFirstContractNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), this.instanceSameClassAsFirstContract.address.toField());
+            await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [instanceSameClassAsFirstContractNullifier.toBuffer()], 0);
+            // other contract address used by the bulk test's GETCONTRACTINSTANCE test
+            const otherContractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), this.otherContractInstance.address.toField());
+            await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [otherContractAddressNullifier.toBuffer()], 0);
+        }
+    }
+    static async create(merkleTrees, skipContractDeployments = false) {
+        const dataSource = new MockedAvmTestContractDataSource(skipContractDeployments);
+        if (!skipContractDeployments) {
+            await dataSource.deployContracts(merkleTrees);
+        }
+        return dataSource;
+    }
     getPublicFunction(_address, _selector) {
         return Promise.resolve(this.publicFn);
     }
     getBlockNumber() {
         throw new Error('Method not implemented.');
     }
-    getContractClass(_id) {
-        return Promise.resolve(this.contractClass);
+    getContractClass(id) {
+        return Promise.resolve(this.contractClasses.get(id.toString()));
     }
     getBytecodeCommitment(_id) {
         return Promise.resolve(this.bytecodeCommitment);
@@ -112,12 +174,18 @@ export class MockedAvmTestContractDataSource {
         return Promise.resolve();
     }
     getContract(address) {
-        if (address.equals(this.contractInstance.address)) {
-            return Promise.resolve(this.contractInstance);
-        }
-        else {
-            return Promise.resolve(this.otherContractInstance);
+        if (!this.skipContractDeployments) {
+            if (address.equals(this.otherContractInstance.address)) {
+                return Promise.resolve(this.otherContractInstance);
+            }
+            else if (address.equals(this.instanceSameClassAsFirstContract.address)) {
+                return Promise.resolve(this.instanceSameClassAsFirstContract);
+            }
+            else {
+                return Promise.resolve(this.contractInstances.get(address.toString()));
+            }
         }
+        return Promise.resolve(undefined);
     }
     getContractClassIds() {
         throw new Error('Method not implemented.');
@@ -128,7 +196,7 @@ export class MockedAvmTestContractDataSource {
     getContractFunctionName(_address, _selector) {
         return Promise.resolve(this.fnName);
     }
-    addContractArtifact(_address, _contract) {
+    registerContractFunctionNames(_address, _names) {
         return Promise.resolve();
     }
 }
@@ -147,4 +215,4 @@ function getAvmTestContractBytecode(functionName) {
     const artifact = getAvmTestContractArtifact(functionName);
     return artifact.bytecode;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"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"}

package/dest/public/public_db_sources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}

package/dest/public/public_db_sources.js

@@ -3,7 +3,8 @@ import { Fr, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
 import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent } from '@aztec/protocol-contracts';
+import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
+import { ContractInstanceDeployedEvent } from '@aztec/protocol-contracts/instance-deployer';
 import { MessageLoadOracleInputs, } from '@aztec/simulator';
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
@@ -159,7 +160,7 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
     }
     async getNullifierMembershipWitnessAtLatestBlock(nullifier) {
         const timer = new Timer();
-        const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [nullifier.toBuffer()]))[0];
         if (!index) {
             return undefined;
         }
@@ -178,7 +179,7 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
     }
     async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
         const timer = new Timer();
-        const messageIndex = await this.db.findLeafIndex(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageHash);
+        const messageIndex = (await this.db.findLeafIndices(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [messageHash]))[0];
         if (messageIndex === undefined) {
             throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
         }
@@ -207,7 +208,7 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
     }
     async getCommitmentIndex(commitment) {
         const timer = new Timer();
-        const index = await this.db.findLeafIndex(MerkleTreeId.NOTE_HASH_TREE, commitment);
+        const index = (await this.db.findLeafIndices(MerkleTreeId.NOTE_HASH_TREE, [commitment]))[0];
         this.logger.debug(`[DB] Fetched commitment index`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
@@ -227,7 +228,7 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
     }
     async getNullifierIndex(nullifier) {
         const timer = new Timer();
-        const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [nullifier.toBuffer()]))[0];
         this.logger.debug(`[DB] Fetched nullifier index`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
@@ -279,4 +280,4 @@ export async function readPublicState(db, contract, slot) {
     const preimage = (await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
     return preimage.value;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_db_sources.js","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,0BAA0B,GAE3B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAKL,EAAE,EAMF,+BAA+B,GAChC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AACxG,OAAO,EAEL,uBAAuB,GAGxB,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,MAAM,OAAO,2BAA2B;IAOtC,YAAoB,UAA8B;QAA9B,eAAU,GAAV,UAAU,CAAoB;QAN1C,kBAAa,GAAG,IAAI,GAAG,EAAuC,CAAC;QAC/D,eAAU,GAAG,IAAI,GAAG,EAA+B,CAAC;QACpD,4BAAuB,GAAG,IAAI,GAAG,EAAc,CAAC;QAEhD,QAAG,GAAG,YAAY,CAAC,iCAAiC,CAAC,CAAC;IAET,CAAC;IACtD;;;OAGG;IACI,eAAe,CAAC,EAAM;QAC3B,qFAAqF;QACrF,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAC/C,IAAI;aACD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACpF,OAAO,CAAC,GAAG,CAAC,EAAE;YACb,MAAM,KAAK,GAAG,4BAA4B,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,qCAAqC,CAAC,CAAC;YACtG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,qBAAqB,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;QAEL,qHAAqH;QACrH,MAAM,sBAAsB,GAAG,EAAE,CAAC,IAAI;aACnC,sBAAsB,EAAE;aACxB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;aACjF,GAAG,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC;QAC9C,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,mBAAmB,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,eAAe,CAAC,QAAQ,EAAE,qCAAqC,CACxH,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,EAAM;QAC9B,yFAAyF;QACzF,gGAAgG;QAChG,yEAAyE;QACzE,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAC/C,IAAI;aACD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACpF,OAAO,CAAC,GAAG,CAAC,EAAE;YACb,MAAM,KAAK,GAAG,4BAA4B,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7D,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEL,qHAAqH;QACrH,MAAM,sBAAsB,GAAG,EAAE,CAAC,IAAI;aACnC,sBAAsB,EAAE;aACxB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;aACjF,GAAG,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC;QAC9C,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAErF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAqB;QACpD,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IACpG,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,eAAmB;QAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC;IACtH,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,eAAmB;QACpD,8BAA8B;QAC9B,MAAM,GAAG,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,yBAAyB;QACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;QAC/E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACjD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,gEAAgE;QAChE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACnE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,KAAK,GAAG,+BAA+B,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqB,EAAE,QAA0B;QACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC5E,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC;IACxF,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,OAAqB,EAAE,QAA0B;QACjF,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1E,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,2BAA2B;IAO3D,YAAoB,EAA6B,EAAE,UAA8B;QAC/E,KAAK,CAAC,UAAU,CAAC,CAAC;QADA,OAAE,GAAF,EAAE,CAA2B;QANzC,WAAM,GAAG,YAAY,CAAC,0BAA0B,CAAC,CAAC;QAElD,8BAAyB,GAAoB,IAAI,GAAG,EAAE,CAAC;QACvD,iCAA4B,GAAoB,IAAI,GAAG,EAAE,CAAC;QAC1D,gCAA2B,GAAoB,IAAI,GAAG,EAAE,CAAC;IAIjE,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,WAAW,CAAC,QAAsB,EAAE,IAAQ;QACvD,MAAM,QAAQ,GAAG,6BAA6B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC;QACrE,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED;;;;;;OAMG;IACI,YAAY,CAAC,QAAsB,EAAE,IAAQ,EAAE,QAAY;QAChE,MAAM,KAAK,GAAG,6BAA6B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC;QAClE,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACtD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,0CAA0C,CACrD,SAAa;QAEb,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACxF,MAAM,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC,cAAc,CAC/C,YAAY,CAAC,cAAc,EAC3B,MAAM,CAAC,KAAK,CAAC,CACd,CAAC;QAEF,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEjG,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;YACrD,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,kDAAkD;SAChC,CAAC,CAAC;QAEjC,OAAO,IAAI,0BAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,YAAqC,EAAE,WAAW,CAAC,CAAC;IAC3G,CAAC;IAEM,KAAK,CAAC,0BAA0B,CACrC,eAA6B,EAC7B,WAAe,EACf,MAAU;QAEV,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAE1B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC;QAClG,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,8CAA8C,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,eAAe,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7F,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAEtE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxG,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAC9C,YAAY,CAAC,qBAAqB,EAClC,YAAY,CACb,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE;YAC5D,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,yCAAyC;SACvB,CAAC,CAAC;QAEjC,OAAO,IAAI,uBAAuB,CAAkC,YAAY,EAAE,WAAW,CAAC,CAAC;IACjG,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,SAAiB;QAC/C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QAC5F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE;YAC5D,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,iCAAiC;SACf,CAAC,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,UAAc;QAC5C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QACnF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE;YACjD,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,sBAAsB;SACJ,CAAC,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,SAAiB;QAC/C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QACrF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;YACtD,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,2BAA2B;SACT,CAAC,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,SAAa;QAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE;YAChD,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,qBAAqB;SACH,CAAC,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACH,MAAM;QACJ,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACvD,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,8DAA8D;QAC9D,iCAAiC;QACjC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACtD,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB;QACpB,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,IAAI,CAAC,4BAA4B,GAAG,IAAI,GAAG,EAAc,CAAC;QAC1D,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,UAAU;QACR,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACtD,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACrC,CAAC;IAED,oBAAoB;QAClB,IAAI,CAAC,2BAA2B,GAAG,IAAI,GAAG,EAAc,CAAC;QACzD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAA4B,EAAE,QAAsB,EAAE,IAAQ;IAClG,MAAM,QAAQ,GAAG,6BAA6B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE1E,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,qBAAqB,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAC9F,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QACpD,OAAO,EAAE,CAAC,IAAI,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,eAAe,CACxC,YAAY,CAAC,gBAAgB,EAC7B,aAAa,CAAC,KAAK,CACpB,CAA+B,CAAC;IAEjC,OAAO,QAAQ,CAAC,KAAK,CAAC;AACxB,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_db_sources.js","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}

package/dest/public/public_processor.d.ts

@@ -1,6 +1,7 @@
-import { type FailedTx, type MerkleTreeWriteOperations, NestedProcessReturnValues, type ProcessedTx, type ProcessedTxHandler, Tx, type TxValidator } from '@aztec/circuit-types';
+import { type FailedTx, type MerkleTreeWriteOperations, NestedProcessReturnValues, type ProcessedTx, Tx, type TxValidator } from '@aztec/circuit-types';
 import { type BlockHeader, type ContractDataSource, type GlobalVariables } from '@aztec/circuits.js';
-import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
+import { type DateProvider } from '@aztec/foundation/timer';
+import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { WorldStateDB } from './public_db_sources.js';
 import { PublicTxSimulator } from './public_tx_simulator.js';
 /**
@@ -8,29 +9,33 @@ import { PublicTxSimulator } from './public_tx_simulator.js';
  */
 export declare class PublicProcessorFactory {
     private contractDataSource;
+    private dateProvider;
     private telemetryClient;
-    constructor(contractDataSource: ContractDataSource, telemetryClient: TelemetryClient);
+    constructor(contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient: TelemetryClient);
     /**
      * Creates a new instance of a PublicProcessor.
      * @param historicalHeader - The header of a block previous to the one in which the tx is included.
      * @param globalVariables - The global variables for the block being processed.
+     * @param enforceFeePayment - Allows disabling balance checks for fee estimations.
      * @returns A new instance of a PublicProcessor.
      */
-    create(merkleTree: MerkleTreeWriteOperations, maybeHistoricalHeader: BlockHeader | undefined, globalVariables: GlobalVariables): PublicProcessor;
+    create(merkleTree: MerkleTreeWriteOperations, maybeHistoricalHeader: BlockHeader | undefined, globalVariables: GlobalVariables, enforceFeePayment: boolean): PublicProcessor;
+    protected createPublicTxSimulator(db: MerkleTreeWriteOperations, worldStateDB: WorldStateDB, telemetryClient: TelemetryClient, globalVariables: GlobalVariables, doMerkleOperations: boolean, enforceFeePayment: boolean): PublicTxSimulator;
 }
 /**
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
  * any public function calls in them. Txs with private calls only are unaffected.
  */
-export declare class PublicProcessor {
+export declare class PublicProcessor implements Traceable {
     protected db: MerkleTreeWriteOperations;
     protected globalVariables: GlobalVariables;
     protected historicalHeader: BlockHeader;
     protected worldStateDB: WorldStateDB;
     protected publicTxSimulator: PublicTxSimulator;
+    private dateProvider;
     private log;
     private metrics;
-    constructor(db: MerkleTreeWriteOperations, globalVariables: GlobalVariables, historicalHeader: BlockHeader, worldStateDB: WorldStateDB, publicTxSimulator: PublicTxSimulator, telemetryClient: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    constructor(db: MerkleTreeWriteOperations, globalVariables: GlobalVariables, historicalHeader: BlockHeader, worldStateDB: WorldStateDB, publicTxSimulator: PublicTxSimulator, dateProvider: DateProvider, telemetryClient: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     get tracer(): Tracer;
     /**
      * Run each tx through the public circuit and the public kernel circuit if needed.
@@ -38,7 +43,10 @@ export declare class PublicProcessor {
      * @param processedTxHandler - Handler for processed txs in the context of block building or proving.
      * @returns The list of processed txs with their circuit simulation outputs.
      */
-    process(txs: Tx[], maxTransactions?: number, processedTxHandler?: ProcessedTxHandler, txValidator?: TxValidator<ProcessedTx>): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]>;
+    process(txs: Tx[], maxTransactions?: number, txValidator?: TxValidator<ProcessedTx>, deadline?: Date): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]>;
+    private processTx;
+    /** Processes the given tx within deadline. Returns timeout if deadline is hit. */
+    private processTxWithinDeadline;
     /**
      * Creates the public data write for paying the tx fee.
      * This is used in private only txs, since for txs with public calls

package/dest/public/public_processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,yBAAyB,EAC9B,yBAAyB,EACzB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,kBAAkB,EAEvB,KAAK,eAAe,EAKrB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAGnG,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,sBAAsB;IACrB,OAAO,CAAC,kBAAkB;IAAsB,OAAO,CAAC,eAAe;gBAA/D,kBAAkB,EAAE,kBAAkB,EAAU,eAAe,EAAE,eAAe;IAEpG;;;;;OAKG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,qBAAqB,EAAE,WAAW,GAAG,SAAS,EAC9C,eAAe,EAAE,eAAe,GAC/B,eAAe;CAqBnB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAGxB,SAAS,CAAC,EAAE,EAAE,yBAAyB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,WAAW;IACvC,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAE9C,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,EAAE,EAAE,yBAAyB,EAC7B,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,WAAW,EAC7B,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EAC9C,eAAe,EAAE,eAAe,EACxB,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,OAAO,CAClB,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,SAAa,EAC5B,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,WAAW,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GACrC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;IAsGpE;;;;OAIG;YACW,4BAA4B;YA6B5B,oBAAoB;YAyBpB,wBAAwB;CAoCvC"}
+{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,yBAAyB,EAC9B,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,kBAAkB,EAGvB,KAAK,eAAe,EAKrB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAG5F,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAGnH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe;IAG1C;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,qBAAqB,EAAE,WAAW,GAAG,SAAS,EAC9C,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,OAAO,GACzB,eAAe;IAwBlB,SAAS,CAAC,uBAAuB,CAC/B,EAAE,EAAE,yBAAyB,EAC7B,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,iBAAiB,EAAE,OAAO;CAW7B;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,EAAE,EAAE,yBAAyB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,WAAW;IACvC,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IATb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,EAAE,EAAE,yBAAyB,EAC7B,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,WAAW,EAC7B,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,EAAE,eAAe,EACxB,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,OAAO,CAClB,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,SAAa,EAC5B,WAAW,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,EACtC,QAAQ,CAAC,EAAE,IAAI,GACd,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAwCtD,SAAS;IA+EvB,kFAAkF;YACpE,uBAAuB;IA8BrC;;;;OAIG;YACW,4BAA4B;YA6B5B,oBAAoB;YAyBpB,wBAAwB;CAoCvC"}