@aztec/pxe 0.86.0 → 0.87.0

package/dest/pxe_service/pxe_service.js

@@ -48,6 +48,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     protocolContractsProvider;
     log;
     jobQueue;
+    #nodeInfo;
     constructor(node, synchronizer, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, privateEventDataProvider, simulator, packageVersion, proverEnabled, proofCreator, protocolContractsProvider, log, jobQueue){
         this.node = node;
         this.synchronizer = synchronizer;
@@ -443,21 +444,45 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         // We disable proving concurrently mostly out of caution, since it accesses some of our stores. Proving is so
         // computationally demanding that it'd be rare for someone to try to do it concurrently regardless.
         return this.#putInJobQueue(async ()=>{
+            const totalTimer = new Timer();
             try {
-                const { publicInputs, clientIvcProof } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
+                let syncTime;
+                if (!privateExecutionResult) {
+                    const syncTimer = new Timer();
+                    await this.synchronizer.sync();
+                    syncTime = syncTimer.ms();
+                    privateExecutionResult = await this.#executePrivate(txRequest);
+                }
+                const { publicInputs, clientIvcProof, executionSteps, timings: { proving } = {} } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                     simulate: false,
                     skipFeeEnforcement: false,
                     profileMode: 'none'
                 });
-                return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof);
+                const totalTime = totalTimer.ms();
+                const perFunction = executionSteps.map(({ functionName, timings: { witgen } })=>({
+                        functionName,
+                        time: witgen
+                    }));
+                const timings = {
+                    total: totalTime,
+                    sync: syncTime,
+                    proving,
+                    perFunction,
+                    unaccounted: totalTime - ((syncTime ?? 0) + (proving ?? 0) + perFunction.reduce((acc, { time })=>acc + time, 0))
+                };
+                this.log.info(`Proving completed in ${totalTime}ms`, {
+                    timings
+                });
+                return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof, timings);
             } catch (err) {
                 throw this.#contextualizeError(err, inspect(txRequest), inspect(privateExecutionResult));
             }
         });
     }
-    profileTx(txRequest, profileMode, msgSender) {
+    profileTx(txRequest, profileMode, skipProofGeneration = true, msgSender) {
         // We disable concurrent profiles for consistency with simulateTx.
         return this.#putInJobQueue(async ()=>{
+            const totalTimer = new Timer();
             try {
                 const txInfo = {
                     origin: txRequest.origin,
@@ -469,14 +494,30 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
                 };
                 this.log.info(`Profiling transaction execution request to ${txRequest.functionSelector} at ${txRequest.origin}`, txInfo);
+                const syncTimer = new Timer();
                 await this.synchronizer.sync();
+                const syncTime = syncTimer.ms();
                 const privateExecutionResult = await this.#executePrivate(txRequest, msgSender);
-                const { executionSteps } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
-                    simulate: true,
+                const { executionSteps, timings: { proving } = {} } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
+                    simulate: skipProofGeneration,
                     skipFeeEnforcement: false,
                     profileMode
                 });
-                return new TxProfileResult(executionSteps);
+                const totalTime = totalTimer.ms();
+                const perFunction = executionSteps.map(({ functionName, timings: { witgen } })=>({
+                        functionName,
+                        time: witgen
+                    }));
+                // Gate computation is time is not relevant for profiling, so we subtract it from the total time.
+                const gateCountComputationTime = executionSteps.reduce((acc, { timings })=>acc + (timings.gateCount ?? 0), 0) ?? 0;
+                const timings = {
+                    total: totalTime - gateCountComputationTime,
+                    sync: syncTime,
+                    proving,
+                    perFunction,
+                    unaccounted: totalTime - ((syncTime ?? 0) + (proving ?? 0) + perFunction.reduce((acc, { time })=>acc + time, 0) + gateCountComputationTime)
+                };
+                return new TxProfileResult(executionSteps, timings);
             } catch (err) {
                 throw this.#contextualizeError(err, inspect(txRequest), `profileMode=${profileMode}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`);
             }
@@ -489,6 +530,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         // delete the same read value, or reading values that another simulation is currently modifying).
         return this.#putInJobQueue(async ()=>{
             try {
+                const totalTimer = new Timer();
                 const txInfo = {
                     origin: txRequest.origin,
                     functionSelector: txRequest.functionSelector,
@@ -499,40 +541,61 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
                 };
                 this.log.info(`Simulating transaction execution request to ${txRequest.functionSelector} at ${txRequest.origin}`, txInfo);
-                const timer = new Timer();
+                const syncTimer = new Timer();
                 await this.synchronizer.sync();
+                const syncTime = syncTimer.ms();
                 const privateExecutionResult = await this.#executePrivate(txRequest, msgSender, scopes);
-                const { publicInputs } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
+                const { publicInputs, executionSteps } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                     simulate: true,
                     skipFeeEnforcement,
                     profileMode: 'none'
                 });
                 const privateSimulationResult = new PrivateSimulationResult(privateExecutionResult, publicInputs);
                 const simulatedTx = privateSimulationResult.toSimulatedTx();
+                let publicSimulationTime;
                 let publicOutput;
                 if (simulatePublic && publicInputs.forPublic) {
+                    const publicSimulationTimer = new Timer();
                     publicOutput = await this.#simulatePublicCalls(simulatedTx, skipFeeEnforcement);
+                    publicSimulationTime = publicSimulationTimer.ms();
                 }
+                let validationTime;
                 if (!skipTxValidation) {
+                    const validationTimer = new Timer();
                     const validationResult = await this.node.isValidTx(simulatedTx, {
                         isSimulation: true,
                         skipFeeEnforcement
                     });
+                    validationTime = validationTimer.ms();
                     if (validationResult.result === 'invalid') {
                         throw new Error('The simulated transaction is unable to be added to state and is invalid.');
                     }
                 }
                 const txHash = await simulatedTx.getTxHash();
-                this.log.info(`Simulation completed for ${txHash.toString()} in ${timer.ms()}ms`, {
+                const totalTime = totalTimer.ms();
+                const perFunction = executionSteps.map(({ functionName, timings: { witgen } })=>({
+                        functionName,
+                        time: witgen
+                    }));
+                const timings = {
+                    total: totalTime,
+                    sync: syncTime,
+                    publicSimulation: publicSimulationTime,
+                    validation: validationTime,
+                    perFunction,
+                    unaccounted: totalTime - (syncTime + (publicSimulationTime ?? 0) + (validationTime ?? 0) + perFunction.reduce((acc, { time })=>acc + time, 0))
+                };
+                this.log.info(`Simulation completed for ${txHash.toString()} in ${totalTime}ms`, {
                     txHash,
                     ...txInfo,
                     ...publicOutput ? {
                         gasUsed: publicOutput.gasUsed,
                         revertCode: publicOutput.txEffect.revertCode.getCode(),
                         revertReason: publicOutput.revertReason
-                    } : {}
+                    } : {},
+                    timings
                 });
-                return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput);
+                return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, timings);
             } catch (err) {
                 throw this.#contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
             }
@@ -556,12 +619,32 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         // delete the same read value, or reading values that another simulation is currently modifying).
         return this.#putInJobQueue(async ()=>{
             try {
+                const totalTimer = new Timer();
+                const syncTimer = new Timer();
                 await this.synchronizer.sync();
+                const syncTime = syncTimer.ms();
                 // TODO - Should check if `from` has the permission to call the view function.
                 const functionCall = await this.#getFunctionCall(functionName, args, to);
+                const functionTimer = new Timer();
                 const executionResult = await this.#simulateUtility(functionCall, authwits ?? [], scopes);
-                // TODO - Return typed result based on the function artifact.
-                return executionResult;
+                const functionTime = functionTimer.ms();
+                const totalTime = totalTimer.ms();
+                const perFunction = [
+                    {
+                        functionName,
+                        time: functionTime
+                    }
+                ];
+                const timings = {
+                    total: totalTime,
+                    sync: syncTime,
+                    perFunction,
+                    unaccounted: totalTime - (syncTime + perFunction.reduce((acc, { time })=>acc + time, 0))
+                };
+                return {
+                    result: executionResult,
+                    timings
+                };
             } catch (err) {
                 const stringifiedArgs = args.map((arg)=>arg.toString()).join(', ');
                 throw this.#contextualizeError(err, `simulateUtility ${to}:${functionName}(${stringifiedArgs})`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
@@ -569,23 +652,28 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         });
     }
     async getNodeInfo() {
-        const [nodeVersion, rollupVersion, chainId, enr, contractAddresses, protocolContractAddresses] = await Promise.all([
-            this.node.getNodeVersion(),
-            this.node.getVersion(),
-            this.node.getChainId(),
-            this.node.getEncodedEnr(),
-            this.node.getL1ContractAddresses(),
-            this.node.getProtocolContractAddresses()
-        ]);
-        const nodeInfo = {
-            nodeVersion,
-            l1ChainId: chainId,
-            rollupVersion,
-            enr,
-            l1ContractAddresses: contractAddresses,
-            protocolContractAddresses: protocolContractAddresses
-        };
-        return nodeInfo;
+        // This assumes we're connected to a single node, so we cache the info to avoid repeated calls.
+        // Load balancers and a myriad other configurations can break this assumption, so review this!
+        // Temporary mesure to avoid hammering full nodes with requests on testnet.
+        if (!this.#nodeInfo) {
+            const [nodeVersion, rollupVersion, chainId, enr, contractAddresses, protocolContractAddresses] = await Promise.all([
+                this.node.getNodeVersion(),
+                this.node.getVersion(),
+                this.node.getChainId(),
+                this.node.getEncodedEnr(),
+                this.node.getL1ContractAddresses(),
+                this.node.getProtocolContractAddresses()
+            ]);
+            this.#nodeInfo = {
+                nodeVersion,
+                l1ChainId: chainId,
+                rollupVersion,
+                enr,
+                l1ContractAddresses: contractAddresses,
+                protocolContractAddresses: protocolContractAddresses
+            };
+        }
+        return this.#nodeInfo;
     }
     getPXEInfo() {
         return Promise.resolve({
@@ -619,18 +707,17 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         const decodedEvents = logs.map((log)=>{
             // +1 for the event selector
             const expectedLength = eventMetadataDef.fieldNames.length + 1;
-            const logFields = log.log.log.slice(0, expectedLength);
+            if (log.log.emittedLength !== expectedLength) {
+                throw new Error(`Something is weird here, we have matching EventSelectors, but the actual payload has mismatched length. Expected ${expectedLength}. Got ${log.log.emittedLength}.`);
+            }
+            const logFields = log.log.getEmittedFields();
             // We are assuming here that event logs are the last 4 bytes of the event. This is not enshrined but is a function of aztec.nr raw log emission.
             if (!EventSelector.fromField(logFields[logFields.length - 1]).equals(eventMetadataDef.eventSelector)) {
                 return undefined;
             }
-            // If any of the remaining fields, are non-zero, the payload does match expected:
-            if (log.log.log.slice(expectedLength + 1).find((f)=>!f.isZero())) {
-                throw new Error('Something is weird here, we have matching EventSelectors, but the actual payload has mismatched length');
-            }
             return decodeFromAbi([
                 eventMetadataDef.abiType
-            ], log.log.log);
+            ], log.log.fields);
         }).filter((log)=>log !== undefined);
         return decodedEvents;
     }

package/dest/storage/note_data_provider/note_dao.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 { NoteData } from '@aztec/simulator/client';

package/dest/storage/note_data_provider/note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_dao.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;;IAzC9B,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;IAGhC,QAAQ,IAAI,MAAM;IAgBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,SAAqB,GACtB,GAAE,OAAO,CAAC,OAAO,CAAM;CAezB"}
+{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_dao.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;;IAzC9B,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;IAGhC,QAAQ,IAAI,MAAM;IAgBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,SAAqB,GACtB,GAAE,OAAO,CAAC,OAAO,CAAM;CAezB"}

package/dest/storage/note_data_provider/note_data_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,qBAAa,gBAAiB,YAAW,YAAY;;IAsBnD,OAAO;WAsBa,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWlE,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBtD,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,GAAE,YAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjF,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB9C,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAgGvD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA2DtF,OAAO;CAGd"}
+{"version":3,"file":"note_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,qBAAa,gBAAiB,YAAW,YAAY;;IAsBnD,OAAO;WAsBa,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWlE,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBtD,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,GAAE,YAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjF,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB9C,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAkGvD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA2DtF,OAAO;CAGd"}

package/dest/synchronizer/synchronizer.js

@@ -87,7 +87,7 @@ import { L2BlockStream } from '@aztec/stdlib/block';
         let currentHeader;
         try {
             currentHeader = await this.syncDataProvider.getBlockHeader();
-        } catch (e) {
+        } catch  {
             this.log.debug('Header is not set, requesting from the node');
         }
         if (!currentHeader) {

package/dest/test/pxe_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pxe_test_suite.d.ts","sourceRoot":"","sources":["../../src/test/pxe_test_suite.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAS3D,eAAO,MAAM,YAAY,aAAc,MAAM,YAAY,MAAM,QAAQ,GAAG,CAAC,SAmG1E,CAAC"}
+{"version":3,"file":"pxe_test_suite.d.ts","sourceRoot":"","sources":["../../src/test/pxe_test_suite.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAS3D,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,EAAE,UAAU,MAAM,OAAO,CAAC,GAAG,CAAC,SAmG1E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -57,19 +57,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.86.0",
-    "@aztec/bb.js": "0.86.0",
-    "@aztec/builder": "0.86.0",
-    "@aztec/constants": "0.86.0",
-    "@aztec/ethereum": "0.86.0",
-    "@aztec/foundation": "0.86.0",
-    "@aztec/key-store": "0.86.0",
-    "@aztec/kv-store": "0.86.0",
-    "@aztec/noir-protocol-circuits-types": "0.86.0",
-    "@aztec/noir-types": "0.86.0",
-    "@aztec/protocol-contracts": "0.86.0",
-    "@aztec/simulator": "0.86.0",
-    "@aztec/stdlib": "0.86.0",
+    "@aztec/bb-prover": "0.87.0",
+    "@aztec/bb.js": "0.87.0",
+    "@aztec/builder": "0.87.0",
+    "@aztec/constants": "0.87.0",
+    "@aztec/ethereum": "0.87.0",
+    "@aztec/foundation": "0.87.0",
+    "@aztec/key-store": "0.87.0",
+    "@aztec/kv-store": "0.87.0",
+    "@aztec/noir-protocol-circuits-types": "0.87.0",
+    "@aztec/noir-types": "0.87.0",
+    "@aztec/protocol-contracts": "0.87.0",
+    "@aztec/simulator": "0.87.0",
+    "@aztec/stdlib": "0.87.0",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
@@ -78,17 +78,17 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "0.86.0",
+    "@aztec/noir-test-contracts.js": "0.87.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",
     "@types/lodash.times": "^4.3.9",
-    "@types/node": "^18.7.23",
+    "@types/node": "^22.15.17",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
     "lodash.times": "^4.3.2",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -97,6 +97,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/config/package_info.ts

@@ -1,3 +1,3 @@
 export function getPackageInfo() {
-  return { version: '0.85.0', name: '@aztec/pxe' };
+  return { version: '0.86.0', name: '@aztec/pxe' };
 }

package/src/private_kernel/hints/build_private_kernel_reset_private_inputs.ts

@@ -419,8 +419,8 @@ export class PrivateKernelResetPrivateInputsBuilder {
         const overflownData = noteHashWillOverflow
           ? 'note hashes'
           : nullifierWillOverflow
-          ? 'nullifiers'
-          : 'private logs';
+            ? 'nullifiers'
+            : 'private logs';
         throw new Error(`Number of ${overflownData} exceeds the limit.`);
       }
       // Clearing the read requests might not be enough to squash the overflown data.

package/src/private_kernel/private_kernel_execution_prover.ts

@@ -116,14 +116,18 @@ export class PrivateKernelExecutionProver {
         );
         while (resetBuilder.needsReset()) {
           const privateInputs = await resetBuilder.build(this.oracle, noteHashLeafIndexMap);
-          output = simulate
-            ? await this.proofCreator.simulateReset(privateInputs)
-            : await this.proofCreator.generateResetOutput(privateInputs);
+          const witgenTimer = new Timer();
+          output = generateWitnesses
+            ? await this.proofCreator.generateResetOutput(privateInputs)
+            : await this.proofCreator.simulateReset(privateInputs);
           executionSteps.push({
             functionName: 'private_kernel_reset',
             bytecode: output.bytecode,
             witness: output.outputWitness,
             vk: output.verificationKey.keyAsBytes,
+            timings: {
+              witgen: witgenTimer.ms(),
+            },
           });
           resetBuilder = new PrivateKernelResetPrivateInputsBuilder(
             output,
@@ -148,6 +152,9 @@ export class PrivateKernelExecutionProver {
         bytecode: currentExecution.acir,
         witness: currentExecution.partialWitness,
         vk: currentExecution.vk,
+        timings: {
+          witgen: currentExecution.profileResult?.timings.witgen ?? 0,
+        },
       });
 
       const privateCallData = await this.createPrivateCallData(currentExecution);
@@ -167,6 +174,7 @@ export class PrivateKernelExecutionProver {
 
         pushTestData('private-kernel-inputs-init', proofInput);
 
+        const witgenTimer = new Timer();
         output = generateWitnesses
           ? await this.proofCreator.generateInitOutput(proofInput)
           : await this.proofCreator.simulateInit(proofInput);
@@ -176,6 +184,9 @@ export class PrivateKernelExecutionProver {
           bytecode: output.bytecode,
           witness: output.outputWitness,
           vk: output.verificationKey.keyAsBytes,
+          timings: {
+            witgen: witgenTimer.ms(),
+          },
         });
       } else {
         const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(
@@ -190,7 +201,7 @@ export class PrivateKernelExecutionProver {
         const proofInput = new PrivateKernelInnerCircuitPrivateInputs(previousKernelData, privateCallData);
 
         pushTestData('private-kernel-inputs-inner', proofInput);
-
+        const witgenTimer = new Timer();
         output = generateWitnesses
           ? await this.proofCreator.generateInnerOutput(proofInput)
           : await this.proofCreator.simulateInner(proofInput);
@@ -200,6 +211,9 @@ export class PrivateKernelExecutionProver {
           bytecode: output.bytecode,
           witness: output.outputWitness,
           vk: output.verificationKey.keyAsBytes,
+          timings: {
+            witgen: witgenTimer.ms(),
+          },
         });
       }
       firstIteration = false;
@@ -214,6 +228,7 @@ export class PrivateKernelExecutionProver {
     );
     while (resetBuilder.needsReset()) {
       const privateInputs = await resetBuilder.build(this.oracle, noteHashLeafIndexMap);
+      const witgenTimer = new Timer();
       output = generateWitnesses
         ? await this.proofCreator.generateResetOutput(privateInputs)
         : await this.proofCreator.simulateReset(privateInputs);
@@ -223,6 +238,9 @@ export class PrivateKernelExecutionProver {
         bytecode: output.bytecode,
         witness: output.outputWitness,
         vk: output.verificationKey.keyAsBytes,
+        timings: {
+          witgen: witgenTimer.ms(),
+        },
       });
 
       resetBuilder = new PrivateKernelResetPrivateInputsBuilder(
@@ -256,6 +274,7 @@ export class PrivateKernelExecutionProver {
 
     pushTestData('private-kernel-inputs-ordering', privateInputs);
 
+    const witgenTimer = new Timer();
     const tailOutput = generateWitnesses
       ? await this.proofCreator.generateTailOutput(privateInputs)
       : await this.proofCreator.simulateTail(privateInputs);
@@ -265,12 +284,17 @@ export class PrivateKernelExecutionProver {
       bytecode: tailOutput.bytecode,
       witness: tailOutput.outputWitness,
       vk: tailOutput.verificationKey.keyAsBytes,
+      timings: {
+        witgen: witgenTimer.ms(),
+      },
     });
 
     if (profileMode == 'gates' || profileMode == 'full') {
       for (const entry of executionSteps) {
+        const gateCountTimer = new Timer();
         const gateCount = await this.proofCreator.computeGateCountForCircuit(entry.bytecode, entry.functionName);
         entry.gateCount = gateCount;
+        entry.timings.gateCount = gateCountTimer.ms();
       }
     }
     if (profileMode === 'gates') {
@@ -287,8 +311,11 @@ export class PrivateKernelExecutionProver {
 
     let clientIvcProof: ClientIvcProof;
     // TODO(#7368) how do we 'bincode' encode these inputs?
+    let provingTime;
     if (!skipProofGeneration) {
+      const provingTimer = new Timer();
       clientIvcProof = await this.proofCreator.createClientIvcProof(executionSteps);
+      provingTime = provingTimer.ms();
     } else {
       clientIvcProof = ClientIvcProof.random();
     }
@@ -298,6 +325,7 @@ export class PrivateKernelExecutionProver {
       executionSteps,
       clientIvcProof,
       vk: tailOutput.verificationKey.keyAsBytes,
+      timings: provingTime ? { proving: provingTime } : undefined,
     };
   }
 

package/src/private_kernel/private_kernel_oracle_impl.ts

@@ -99,9 +99,8 @@ export class PrivateKernelOracleImpl implements PrivateKernelOracle {
   }
 
   public async getUpdatedClassIdHints(contractAddress: AztecAddress): Promise<UpdatedClassIdHints> {
-    const { sharedMutableSlot, sharedMutableHashSlot } = await SharedMutableValuesWithHash.getContractUpdateSlots(
-      contractAddress,
-    );
+    const { sharedMutableSlot, sharedMutableHashSlot } =
+      await SharedMutableValuesWithHash.getContractUpdateSlots(contractAddress);
 
     const hashLeafSlot = await computePublicDataTreeLeafSlot(
       ProtocolContractAddress.ContractInstanceDeployer,

package/src/pxe_oracle_interface/pxe_oracle_interface.ts

@@ -21,6 +21,7 @@ import {
   IndexedTaggingSecret,
   LogWithTxData,
   PendingTaggedLog,
+  PublicLog,
   TxScopedL2Log,
   deriveEcdhSharedSecret,
 } from '@aztec/stdlib/logs';
@@ -585,11 +586,11 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     contractAddress: AztecAddress,
     capsuleArrayBaseSlot: Fr,
     recipient: AztecAddress,
-    logs: TxScopedL2Log[],
+    privateLogs: TxScopedL2Log[],
   ) {
     // Build all pending tagged logs upfront with their tx effects
     const pendingTaggedLogs = await Promise.all(
-      logs.map(async scopedLog => {
+      privateLogs.map(async scopedLog => {
         // TODO(#9789): get these effects along with the log
         const txEffect = await this.aztecNode.getTxEffect(scopedLog.txHash);
         if (!txEffect) {
@@ -597,7 +598,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
         }
 
         const pendingTaggedLog = new PendingTaggedLog(
-          scopedLog.log.toFields(),
+          scopedLog.log.fields,
           scopedLog.txHash,
           txEffect.data.noteHashes,
           txEffect.data.nullifiers[0],
@@ -724,12 +725,11 @@ export class PXEOracleInterface implements ExecutionDataProvider {
       throw new Error(`Unexpected: failed to retrieve tx effects for tx ${scopedLog.txHash} which is known to exist`);
     }
 
-    // Public logs always take up all available fields by padding with zeroes, and the length of the originally emitted
-    // log is lost. Until this is improved, we simply remove all of the zero elements we find at the end.
-    // TODO(#11636): use the actual log length.
-    const trimmedLog = trimTrailingZeros(scopedLog.log.toFields());
+    const logContent = (scopedLog.isFromPublic ? [(scopedLog.log as PublicLog).contractAddress.toField()] : []).concat(
+      scopedLog.log.getEmittedFields(),
+    );
 
-    return new LogWithTxData(trimmedLog, scopedLog.txHash, txEffect.data.noteHashes, txEffect.data.nullifiers[0]);
+    return new LogWithTxData(logContent, scopedLog.txHash, txEffect.data.noteHashes, txEffect.data.nullifiers[0]);
   }
 
   public async removeNullifiedNotes(contractAddress: AztecAddress) {
@@ -833,15 +833,3 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     );
   }
 }
-
-// TODO(#11636): remove once we have the actual log length and we don't need to trim it anymore
-export function trimTrailingZeros(array: Fr[]): Fr[] {
-  // Make a copy to avoid modifying the original one
-  const toReturn = [...array];
-
-  while (toReturn.length > 0 && toReturn[toReturn.length - 1].isZero()) {
-    toReturn.pop();
-  }
-
-  return toReturn;
-}