@aztec/simulator 0.62.0 → 0.63.0

package/dest/public/public_processor.js

@@ -1,24 +1,22 @@
 import { __esDecorate, __runInitializers } from "tslib";
-import { NestedProcessReturnValues, Tx, makeProcessedTx, validateProcessedTx, } from '@aztec/circuit-types';
-import { ContractClassRegisteredEvent, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest, } from '@aztec/circuits.js';
-import { times } from '@aztec/foundation/collection';
+import { MerkleTreeId, NestedProcessReturnValues, Tx, TxExecutionPhase, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls, } from '@aztec/circuit-types';
+import { ContractClassRegisteredEvent, Fr, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_HEIGHT, PublicDataWrite, } from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
-import { EnqueuedCallsProcessor } from './enqueued_calls_processor.js';
 import { PublicExecutor } from './executor.js';
 import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from './fee_payment.js';
 import { WorldStateDB } from './public_db_sources.js';
-import { RealPublicKernelCircuitSimulator } from './public_kernel.js';
 import { PublicProcessorMetrics } from './public_processor_metrics.js';
+import { PublicTxSimulator } from './public_tx_simulator.js';
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
  */
 export class PublicProcessorFactory {
-    constructor(contractDataSource, simulator, telemetryClient) {
+    constructor(contractDataSource, telemetryClient) {
         this.contractDataSource = contractDataSource;
-        this.simulator = simulator;
         this.telemetryClient = telemetryClient;
     }
     /**
@@ -32,8 +30,7 @@ export class PublicProcessorFactory {
         const historicalHeader = maybeHistoricalHeader ?? merkleTree.getInitialHeader();
         const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
         const publicExecutor = new PublicExecutor(worldStateDB, telemetryClient);
-        const publicKernelSimulator = new RealPublicKernelCircuitSimulator(this.simulator);
-        return PublicProcessor.create(merkleTree, publicExecutor, publicKernelSimulator, globalVariables, historicalHeader, worldStateDB, this.telemetryClient);
+        return PublicProcessor.create(merkleTree, publicExecutor, globalVariables, historicalHeader, worldStateDB, this.telemetryClient);
     }
 }
 /**
@@ -45,20 +42,18 @@ let PublicProcessor = (() => {
     let _instanceExtraInitializers = [];
     let _processTxWithPublicCalls_decorators;
     return _a = class PublicProcessor {
-            constructor(db, publicExecutor, publicKernel, globalVariables, historicalHeader, worldStateDB, enqueuedCallsProcessor, telemetryClient, log = createDebugLogger('aztec:sequencer:public-processor')) {
+            constructor(db, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, telemetryClient, log = createDebugLogger('aztec:sequencer:public-processor')) {
                 this.db = (__runInitializers(this, _instanceExtraInitializers), db);
-                this.publicExecutor = publicExecutor;
-                this.publicKernel = publicKernel;
                 this.globalVariables = globalVariables;
                 this.historicalHeader = historicalHeader;
                 this.worldStateDB = worldStateDB;
-                this.enqueuedCallsProcessor = enqueuedCallsProcessor;
+                this.publicTxSimulator = publicTxSimulator;
                 this.log = log;
                 this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
             }
-            static create(db, publicExecutor, publicKernelSimulator, globalVariables, historicalHeader, worldStateDB, telemetryClient) {
-                const enqueuedCallsProcessor = EnqueuedCallsProcessor.create(db, publicExecutor, publicKernelSimulator, globalVariables, historicalHeader, worldStateDB);
-                return new _a(db, publicExecutor, publicKernelSimulator, globalVariables, historicalHeader, worldStateDB, enqueuedCallsProcessor, telemetryClient);
+            static create(db, publicExecutor, globalVariables, historicalHeader, worldStateDB, telemetryClient) {
+                const publicTxSimulator = PublicTxSimulator.create(db, publicExecutor, globalVariables, worldStateDB);
+                return new _a(db, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, telemetryClient);
             }
             get tracer() {
                 return this.metrics.tracer;
@@ -82,19 +77,16 @@ let PublicProcessor = (() => {
                     }
                     try {
                         const [processedTx, returnValues] = !tx.hasPublicCalls()
-                            ? [makeProcessedTx(tx, tx.data.toKernelCircuitPublicInputs())]
+                            ? await this.processPrivateOnlyTx(tx)
                             : await this.processTxWithPublicCalls(tx);
                         this.log.debug(`Processed tx`, {
                             txHash: processedTx.hash,
-                            historicalHeaderHash: processedTx.data.constants.historicalHeader.hash(),
-                            blockNumber: processedTx.data.constants.globalVariables.blockNumber,
-                            lastArchiveRoot: processedTx.data.constants.historicalHeader.lastArchive.root,
+                            historicalHeaderHash: processedTx.constants.historicalHeader.hash(),
+                            blockNumber: processedTx.constants.globalVariables.blockNumber,
+                            lastArchiveRoot: processedTx.constants.historicalHeader.lastArchive.root,
                         });
-                        // Set fee payment update request into the processed tx
-                        processedTx.finalPublicDataUpdateRequests = await this.createFinalDataUpdateRequests(processedTx);
                         // Commit the state updates from this transaction
                         await this.worldStateDB.commit();
-                        validateProcessedTx(processedTx);
                         // Re-validate the transaction
                         if (txValidator) {
                             // Only accept processed transactions that are not double-spends,
@@ -110,6 +102,28 @@ let PublicProcessor = (() => {
                         if (processedTxHandler) {
                             await processedTxHandler.addNewTx(processedTx);
                         }
+                        // Update the state so that the next tx in the loop has the correct .startState
+                        // NB: before this change, all .startStates were actually incorrect, but the issue was never caught because we either:
+                        // a) had only 1 tx with public calls per block, so this loop had len 1
+                        // b) always had a txHandler with the same db passed to it as this.db, which updated the db in buildBaseRollupHints in this loop
+                        // To see how this ^ happens, move back to one shared db in test_context and run orchestrator_multi_public_functions.test.ts
+                        // The below is taken from buildBaseRollupHints:
+                        await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
+                        try {
+                            await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(n => n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+                        }
+                        catch (error) {
+                            if (txValidator) {
+                                // Ideally the validator has already caught this above, but just in case:
+                                throw new Error(`Transaction ${processedTx.hash} invalid after processing public functions`);
+                            }
+                            else {
+                                // We have no validator and assume this call should blindly process txs with duplicates being caught later
+                                this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
+                            }
+                        }
+                        const allPublicDataWrites = padArrayEnd(processedTx.txEffect.publicDataWrites, PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+                        await this.db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, allPublicDataWrites.map(x => x.toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
                         result.push(processedTx);
                         returns = returns.concat(returnValues ?? []);
                     }
@@ -131,38 +145,39 @@ let PublicProcessor = (() => {
              * request for updating fee balance. It also updates the local public state db.
              * See build_or_patch_payment_update_request in base_rollup_inputs.nr for more details.
              */
-            async createFinalDataUpdateRequests(tx) {
-                const finalPublicDataUpdateRequests = [
-                    ...tx.data.end.publicDataUpdateRequests,
-                    ...times(PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, () => PublicDataUpdateRequest.empty()),
-                ];
-                const feePayer = tx.data.feePayer;
+            async getFeePaymentPublicDataWrite(publicDataWrites, txFee, feePayer) {
                 if (feePayer.isZero()) {
-                    return finalPublicDataUpdateRequests;
+                    return;
                 }
                 const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
                 const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
                 const leafSlot = computeFeePayerBalanceLeafSlot(feePayer);
-                const txFee = tx.data.getTransactionFee(this.globalVariables.gasFees);
                 this.log.debug(`Deducting ${txFee} balance in Fee Juice for ${feePayer}`);
-                const existingBalanceWriteIndex = finalPublicDataUpdateRequests.findIndex(request => request.leafSlot.equals(leafSlot));
-                const balance = existingBalanceWriteIndex > -1
-                    ? finalPublicDataUpdateRequests[existingBalanceWriteIndex].newValue
+                const existingBalanceWrite = publicDataWrites.find(write => write.leafSlot.equals(leafSlot));
+                const balance = existingBalanceWrite
+                    ? existingBalanceWrite.value
                     : await this.worldStateDB.storageRead(feeJuiceAddress, balanceSlot);
                 if (balance.lt(txFee)) {
                     throw new Error(`Not enough balance for fee payer to pay for transaction (got ${balance} needs ${txFee})`);
                 }
                 const updatedBalance = balance.sub(txFee);
                 await this.worldStateDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
-                finalPublicDataUpdateRequests[existingBalanceWriteIndex > -1 ? existingBalanceWriteIndex : MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = new PublicDataUpdateRequest(leafSlot, updatedBalance, 0);
-                return finalPublicDataUpdateRequests;
+                return new PublicDataWrite(leafSlot, updatedBalance);
+            }
+            async processPrivateOnlyTx(tx) {
+                const gasFees = this.globalVariables.gasFees;
+                const transactionFee = tx.data.gasUsed.computeFee(gasFees);
+                const accumulatedData = tx.data.forRollup.end;
+                const feePaymentPublicDataWrite = await this.getFeePaymentPublicDataWrite(accumulatedData.publicDataWrites, transactionFee, tx.data.feePayer);
+                const processedTx = makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, this.globalVariables);
+                return [processedTx];
             }
             async processTxWithPublicCalls(tx) {
                 const timer = new Timer();
-                const { avmProvingRequest, tailKernelOutput, returnValues, revertReason, gasUsed, processedPhases } = await this.enqueuedCallsProcessor.process(tx);
-                if (!tailKernelOutput) {
+                const { avmProvingRequest, gasUsed, revertCode, revertReason, processedPhases } = await this.publicTxSimulator.simulate(tx);
+                if (!avmProvingRequest) {
                     this.metrics.recordFailedTx();
-                    throw new Error('Final public kernel was not executed.');
+                    throw new Error('Avm proving result was not generated.');
                 }
                 processedPhases.forEach(phase => {
                     if (phase.revertReason) {
@@ -172,10 +187,13 @@ let PublicProcessor = (() => {
                         this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
                     }
                 });
-                this.metrics.recordClassRegistration(...ContractClassRegisteredEvent.fromLogs(tx.unencryptedLogs.unrollLogs(), ProtocolContractAddress.ContractClassRegisterer));
+                this.metrics.recordClassRegistration(...ContractClassRegisteredEvent.fromLogs(tx.contractClassLogs.unrollLogs(), ProtocolContractAddress.ContractClassRegisterer));
                 const phaseCount = processedPhases.length;
                 this.metrics.recordTx(phaseCount, timer.ms());
-                const processedTx = makeProcessedTx(tx, tailKernelOutput, { avmProvingRequest, revertReason, gasUsed });
+                const data = avmProvingRequest.inputs.output;
+                const feePaymentPublicDataWrite = await this.getFeePaymentPublicDataWrite(data.accumulatedData.publicDataWrites, data.transactionFee, tx.data.feePayer);
+                const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, feePaymentPublicDataWrite, gasUsed, revertCode, revertReason);
+                const returnValues = processedPhases.find(({ phase }) => phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
                 return [processedTx, returnValues];
             }
         },
@@ -190,4 +208,4 @@ let PublicProcessor = (() => {
         _a;
 })();
 export { PublicProcessor };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,YAAY,EAEZ,yBAAyB,EAGzB,EAAE,EACF,gBAAgB,EAEhB,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,4BAA4B,EAE5B,EAAE,EAGF,sBAAsB,EACtB,qBAAqB,EACrB,4CAA4C,EAC5C,wBAAwB,EACxB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAqC,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEnG,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,8BAA8B,EAAE,iCAAiC,EAAE,MAAM,kBAAkB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,MAAM,OAAO,sBAAsB;IACjC,YAAoB,kBAAsC,EAAU,eAAgC;QAAhF,uBAAkB,GAAlB,kBAAkB,CAAoB;QAAU,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAExG;;;;;OAKG;IACI,MAAM,CACX,UAAqC,EACrC,qBAAyC,EACzC,eAAgC;QAEhC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QACjC,MAAM,gBAAgB,GAAG,qBAAqB,IAAI,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAEhF,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAEzE,OAAO,eAAe,CAAC,MAAM,CAC3B,UAAU,EACV,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,IAAI,CAAC,eAAe,CACrB,CAAC;IACJ,CAAC;CACF;AAED;;;GAGG;IACU,eAAe;;;;sBAAf,eAAe;YAE1B,YACY,EAA6B,EAC7B,eAAgC,EAChC,gBAAwB,EACxB,YAA0B,EAC1B,iBAAoC,EAC9C,eAAgC,EACxB,MAAM,iBAAiB,CAAC,kCAAkC,CAAC;gBANzD,OAAE,IAHH,mDAAe,EAGd,EAAE,EAA2B;gBAC7B,oBAAe,GAAf,eAAe,CAAiB;gBAChC,qBAAgB,GAAhB,gBAAgB,CAAQ;gBACxB,iBAAY,GAAZ,YAAY,CAAc;gBAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;gBAEtC,QAAG,GAAH,GAAG,CAAwD;gBAEnE,IAAI,CAAC,OAAO,GAAG,IAAI,sBAAsB,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;YAChF,CAAC;YAED,MAAM,CAAC,MAAM,CACX,EAA6B,EAC7B,cAA8B,EAC9B,eAAgC,EAChC,gBAAwB,EACxB,YAA0B,EAC1B,eAAgC;gBAEhC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;gBAEtG,OAAO,IAAI,EAAe,CAAC,EAAE,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;YACtH,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7B,CAAC;YAED;;;;;eAKG;YACI,KAAK,CAAC,OAAO,CAClB,GAAS,EACT,eAAe,GAAG,GAAG,CAAC,MAAM,EAC5B,kBAAuC,EACvC,WAAsC;gBAEtC,4EAA4E;gBAC5E,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBAClC,MAAM,MAAM,GAAkB,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAe,EAAE,CAAC;gBAC9B,IAAI,OAAO,GAAgC,EAAE,CAAC;gBAE9C,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,4CAA4C;oBAC5C,IAAI,MAAM,CAAC,MAAM,IAAI,eAAe,EAAE,CAAC;wBACrC,MAAM;oBACR,CAAC;oBACD,IAAI,CAAC;wBACH,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE;4BACtD,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;4BACrC,CAAC,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;wBAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE;4BAC7B,MAAM,EAAE,WAAW,CAAC,IAAI;4BACxB,oBAAoB,EAAE,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE;4BACnE,WAAW,EAAE,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,WAAW;4BAC9D,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI;yBACzE,CAAC,CAAC;wBAEH,iDAAiD;wBACjD,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;wBAEjC,8BAA8B;wBAC9B,IAAI,WAAW,EAAE,CAAC;4BAChB,iEAAiE;4BACjE,+EAA+E;4BAC/E,oFAAoF;4BACpF,iFAAiF;4BACjF,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;4BAClE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gCACnB,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,4CAA4C,CAAC,CAAC;4BAC9F,CAAC;wBACH,CAAC;wBACD,2FAA2F;wBAC3F,IAAI,kBAAkB,EAAE,CAAC;4BACvB,MAAM,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;wBACjD,CAAC;wBACD,+EAA+E;wBAC/E,sHAAsH;wBACtH,uEAAuE;wBACvE,gIAAgI;wBAChI,4HAA4H;wBAC5H,gDAAgD;wBAChD,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CACxB,YAAY,CAAC,cAAc,EAC3B,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAC9E,CAAC;wBACF,IAAI,CAAC;4BACH,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CACvB,YAAY,CAAC,cAAc,EAC3B,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EACnG,wBAAwB,CACzB,CAAC;wBACJ,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,IAAI,WAAW,EAAE,CAAC;gCAChB,yEAAyE;gCACzE,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,CAAC,IAAI,4CAA4C,CAAC,CAAC;4BAC/F,CAAC;iCAAM,CAAC;gCACN,0GAA0G;gCAC1G,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6DAA6D,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC;4BAClG,CAAC;wBACH,CAAC;wBAED,MAAM,mBAAmB,GAAG,WAAW,CACrC,WAAW,CAAC,QAAQ,CAAC,gBAAgB,EACrC,eAAe,CAAC,KAAK,EAAE,EACvB,4CAA4C,CAC7C,CAAC;wBACF,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CACvB,YAAY,CAAC,gBAAgB,EAC7B,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EAC1C,0BAA0B,CAC3B,CAAC;wBACF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBACzB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,MAAM,YAAY,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;wBAC1E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,SAAS,EAAE,KAAK,YAAY,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;wBAEvF,MAAM,CAAC,IAAI,CAAC;4BACV,EAAE;4BACF,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC;yBAC5D,CAAC,CAAC;wBACH,OAAO,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;gBAED,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACnC,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,4BAA4B,CACxC,gBAAmC,EACnC,KAAS,EACT,QAAsB;gBAEtB,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;oBACtB,OAAO;gBACT,CAAC;gBAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,QAAQ,CAAC;gBACzD,MAAM,WAAW,GAAG,iCAAiC,CAAC,QAAQ,CAAC,CAAC;gBAChE,MAAM,QAAQ,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAC;gBAE1D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,KAAK,6BAA6B,QAAQ,EAAE,CAAC,CAAC;gBAE1E,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAE7F,MAAM,OAAO,GAAG,oBAAoB;oBAClC,CAAC,CAAC,oBAAoB,CAAC,KAAK;oBAC5B,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;gBAEtE,IAAI,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,gEAAgE,OAAO,UAAU,KAAK,GAAG,CAAC,CAAC;gBAC7G,CAAC;gBAED,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC1C,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;gBAEnF,OAAO,IAAI,eAAe,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;YACvD,CAAC;YAEO,KAAK,CAAC,oBAAoB,CAAC,EAAM;gBACvC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC7C,MAAM,cAAc,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAE3D,MAAM,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,SAAU,CAAC,GAAG,CAAC;gBAC/C,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACvE,eAAe,CAAC,gBAAgB,EAChC,cAAc,EACd,EAAE,CAAC,IAAI,CAAC,QAAQ,CACjB,CAAC;gBAEF,MAAM,WAAW,GAAG,gCAAgC,CAClD,EAAE,EACF,cAAc,EACd,yBAAyB,EACzB,IAAI,CAAC,eAAe,CACrB,CAAC;gBACF,OAAO,CAAC,WAAW,CAAC,CAAC;YACvB,CAAC;YAKO,KAAK,CAAC,wBAAwB,CAAC,EAAM;gBAC3C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAE1B,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,GAC7E,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAE5C,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;gBAC3D,CAAC;gBAED,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC9B,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;wBACvB,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAChD,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;oBAClE,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAClC,GAAG,4BAA4B,CAAC,QAAQ,CACtC,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,EACjC,uBAAuB,CAAC,uBAAuB,CAChD,CACF,CAAC;gBAEF,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC;gBAC1C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;gBAE9C,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAC7C,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACvE,IAAI,CAAC,eAAe,CAAC,gBAAgB,EACrC,IAAI,CAAC,cAAc,EACnB,EAAE,CAAC,IAAI,CAAC,QAAQ,CACjB,CAAC;gBAEF,MAAM,WAAW,GAAG,oCAAoC,CACtD,EAAE,EACF,iBAAiB,EACjB,yBAAyB,EACzB,OAAO,EACP,UAAU,EACV,YAAY,CACb,CAAC;gBAEF,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,gBAAgB,CAAC,SAAS,CAAC,EAAE,YAAY,IAAI,EAAE,CAAC;gBAEnH,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACrC,CAAC;;;;oDAnDA,SAAS,CAAC,0CAA0C,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBAC5D,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;iBAChD,CAAC,CAAC;YACH,yNAAc,wBAAwB,6DAgDrC;;;;;SApPU,eAAe"}

package/dest/public/public_processor_metrics.d.ts

@@ -1,4 +1,4 @@
-import { type PublicKernelPhase } from '@aztec/circuit-types';
+import { type TxExecutionPhase } from '@aztec/circuit-types';
 import { type ContractClassRegisteredEvent } from '@aztec/circuits.js';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 export declare class PublicProcessorMetrics {
@@ -10,10 +10,10 @@ export declare class PublicProcessorMetrics {
     private phaseCount;
     private bytecodeDeployed;
     constructor(client: TelemetryClient, name?: string);
-    recordPhaseDuration(phaseName: PublicKernelPhase, durationMs: number): void;
+    recordPhaseDuration(phaseName: TxExecutionPhase, durationMs: number): void;
     recordTx(phaseCount: number, durationMs: number): void;
     recordFailedTx(): void;
-    recordRevertedPhase(phaseName: PublicKernelPhase): void;
+    recordRevertedPhase(phaseName: TxExecutionPhase): void;
     recordClassRegistration(...events: ContractClassRegisteredEvent[]): void;
 }
 //# sourceMappingURL=public_processor_metrics.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"public_processor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/public_processor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,sBAAsB;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,gBAAgB,CAAY;gBAExB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAoB;IAkC7D,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM;IAKpE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQ/C,cAAc;IAMd,mBAAmB,CAAC,SAAS,EAAE,iBAAiB;IAIhD,uBAAuB,CAAC,GAAG,MAAM,EAAE,4BAA4B,EAAE;CAUlE"}
+{"version":3,"file":"public_processor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/public_processor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,sBAAsB;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,gBAAgB,CAAY;gBAExB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAoB;IAkC7D,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM;IAKnE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQ/C,cAAc;IAMd,mBAAmB,CAAC,SAAS,EAAE,gBAAgB;IAI/C,uBAAuB,CAAC,GAAG,MAAM,EAAE,4BAA4B,EAAE;CAUlE"}

package/dest/public/public_processor_metrics.js

@@ -56,4 +56,4 @@ export class PublicProcessorMetrics {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfcHJvY2Vzc29yX21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUNMLFVBQVUsRUFFVixPQUFPLEVBSVAsU0FBUyxHQUNWLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxPQUFPLHNCQUFzQjtJQVlqQyxZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGlCQUFpQjtRQUMzRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLDRCQUE0QixFQUFFO1lBQzVFLFdBQVcsRUFBRSw0Q0FBNEM7WUFDekQsSUFBSSxFQUFFLElBQUk7WUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLHlCQUF5QixFQUFFO1lBQzFFLFdBQVcsRUFBRSxrQ0FBa0M7U0FDaEQsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLCtCQUErQixFQUFFO1lBQ3JGLFdBQVcsRUFBRSw0QkFBNEI7U0FDMUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywrQkFBK0IsRUFBRTtZQUNsRixXQUFXLEVBQUUsc0NBQXNDO1lBQ25ELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsRUFBRTtZQUNoRixXQUFXLEVBQUUseUJBQXlCO1NBQ3ZDLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxxQ0FBcUMsRUFBRTtZQUMzRixXQUFXLEVBQUUsMkJBQTJCO1lBQ3hDLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELG1CQUFtQixDQUFDLFNBQTRCLEVBQUUsVUFBa0I7UUFDbEUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDekYsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUYsQ0FBQztJQUVELFFBQVEsQ0FBQyxVQUFrQixFQUFFLFVBQWtCO1FBQzdDLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM5QyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDbEIsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSTtTQUN0QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsY0FBYztRQUNaLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUNsQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLO1NBQ3ZCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxTQUE0QjtRQUM5QyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUM1RixDQUFDO0lBRUQsdUJBQXVCLENBQUMsR0FBRyxNQUFzQztRQUMvRCxJQUFJLGFBQWEsR0FBRyxDQUFDLENBQUM7UUFDdEIsS0FBSyxNQUFNLEtBQUssSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUMzQixhQUFhLElBQUksS0FBSyxDQUFDLG9CQUFvQixDQUFDLE1BQU0sQ0FBQztRQUNyRCxDQUFDO1FBRUQsSUFBSSxhQUFhLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM5QyxDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfcHJvY2Vzc29yX21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUNMLFVBQVUsRUFFVixPQUFPLEVBSVAsU0FBUyxHQUNWLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxPQUFPLHNCQUFzQjtJQVlqQyxZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGlCQUFpQjtRQUMzRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLDRCQUE0QixFQUFFO1lBQzVFLFdBQVcsRUFBRSw0Q0FBNEM7WUFDekQsSUFBSSxFQUFFLElBQUk7WUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLHlCQUF5QixFQUFFO1lBQzFFLFdBQVcsRUFBRSxrQ0FBa0M7U0FDaEQsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLCtCQUErQixFQUFFO1lBQ3JGLFdBQVcsRUFBRSw0QkFBNEI7U0FDMUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywrQkFBK0IsRUFBRTtZQUNsRixXQUFXLEVBQUUsc0NBQXNDO1lBQ25ELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsRUFBRTtZQUNoRixXQUFXLEVBQUUseUJBQXlCO1NBQ3ZDLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxxQ0FBcUMsRUFBRTtZQUMzRixXQUFXLEVBQUUsMkJBQTJCO1lBQ3hDLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELG1CQUFtQixDQUFDLFNBQTJCLEVBQUUsVUFBa0I7UUFDakUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDekYsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUYsQ0FBQztJQUVELFFBQVEsQ0FBQyxVQUFrQixFQUFFLFVBQWtCO1FBQzdDLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM5QyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDbEIsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSTtTQUN0QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsY0FBYztRQUNaLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUNsQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLO1NBQ3ZCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxTQUEyQjtRQUM3QyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUM1RixDQUFDO0lBRUQsdUJBQXVCLENBQUMsR0FBRyxNQUFzQztRQUMvRCxJQUFJLGFBQWEsR0FBRyxDQUFDLENBQUM7UUFDdEIsS0FBSyxNQUFNLEtBQUssSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUMzQixhQUFhLElBQUksS0FBSyxDQUFDLG9CQUFvQixDQUFDLE1BQU0sQ0FBQztRQUNyRCxDQUFDO1FBRUQsSUFBSSxhQUFhLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM5QyxDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=

package/dest/public/public_tx_context.d.ts

@@ -0,0 +1,130 @@
+import { type AvmProvingRequest, type MerkleTreeReadOperations, type PublicExecutionRequest, type SimulationError, type Tx, TxExecutionPhase, TxHash } from '@aztec/circuit-types';
+import { Fr, Gas, type GasSettings, type GlobalVariables, type Header, type PrivateToPublicAccumulatedData, type PublicCallRequest, RevertCode, type StateReference } from '@aztec/circuits.js';
+import { AvmPersistableStateManager } from '../avm/index.js';
+import { PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
+import { type EnqueuedPublicCallExecutionResult } from './execution.js';
+import { type WorldStateDB } from './public_db_sources.js';
+/**
+ * The transaction-level context for public execution.
+ */
+export declare class PublicTxContext {
+    readonly state: PhaseStateManager;
+    private readonly globalVariables;
+    private readonly historicalHeader;
+    private readonly startStateReference;
+    private readonly startGasUsed;
+    private readonly gasSettings;
+    private readonly setupCallRequests;
+    private readonly appLogicCallRequests;
+    private readonly teardownCallRequests;
+    private readonly setupExecutionRequests;
+    private readonly appLogicExecutionRequests;
+    private readonly teardownExecutionRequests;
+    private readonly nonRevertibleAccumulatedDataFromPrivate;
+    private readonly revertibleAccumulatedDataFromPrivate;
+    trace: PublicEnqueuedCallSideEffectTrace;
+    private log;
+    private gasUsed;
+    teardownGasUsed: Gas;
+    private halted;
+    private revertCode;
+    revertReason: SimulationError | undefined;
+    avmProvingRequest: AvmProvingRequest | undefined;
+    constructor(state: PhaseStateManager, globalVariables: GlobalVariables, historicalHeader: Header, // FIXME(dbanks12): remove
+    startStateReference: StateReference, startGasUsed: Gas, gasSettings: GasSettings, setupCallRequests: PublicCallRequest[], appLogicCallRequests: PublicCallRequest[], teardownCallRequests: PublicCallRequest[], setupExecutionRequests: PublicExecutionRequest[], appLogicExecutionRequests: PublicExecutionRequest[], teardownExecutionRequests: PublicExecutionRequest[], nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, trace: PublicEnqueuedCallSideEffectTrace);
+    static create(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, tx: Tx, globalVariables: GlobalVariables): Promise<PublicTxContext>;
+    /**
+     * Signal that the entire transaction execution is done.
+     * All phases have been processed.
+     * Actual transaction fee and actual total consumed gas can now be queried.
+     */
+    halt(): void;
+    /**
+     * Revert execution a phase. Populate revertReason & revertCode.
+     * If in setup, throw an error (transaction will be thrown out).
+     * NOTE: this does not "halt" the entire transaction execution.
+     */
+    revert(phase: TxExecutionPhase, revertReason?: SimulationError | undefined, culprit?: string): void;
+    /**
+     * Get the revert code.
+     * @returns The revert code.
+     */
+    getFinalRevertCode(): RevertCode;
+    /**
+     * Construct & return transaction hash.
+     * @returns The transaction's hash.
+     */
+    getTxHash(): TxHash;
+    /**
+     * Are there any call requests for the speciiied phase?
+     */
+    hasPhase(phase: TxExecutionPhase): boolean;
+    /**
+     * Get the call requests for the specified phase (including args hashes).
+     */
+    getCallRequestsForPhase(phase: TxExecutionPhase): PublicCallRequest[];
+    /**
+     * Get the call requests for the specified phase (including actual args).
+     */
+    getExecutionRequestsForPhase(phase: TxExecutionPhase): PublicExecutionRequest[];
+    /**
+     * How much gas is left for the specified phase?
+     */
+    getGasLeftForPhase(phase: TxExecutionPhase): Gas;
+    /**
+     * Consume gas. Track gas for teardown phase separately.
+     */
+    consumeGas(phase: TxExecutionPhase, gas: Gas): void;
+    /**
+     * Compute the gas used using the actual gas used during teardown instead
+     * of the teardown gas limit.
+     * Note that this.gasUsed is initialized from private's gasUsed which includes
+     * teardown gas limit.
+     */
+    getActualGasUsed(): Gas;
+    /**
+     * The gasUsed as if the entire teardown gas limit was consumed.
+     */
+    getGasUsedForFee(): Gas;
+    /**
+     * Get the transaction fee as is available to the specified phase.
+     * Only teardown should have access to the actual transaction fee.
+     */
+    getTransactionFee(phase: TxExecutionPhase): Fr;
+    /**
+     * Compute the transaction fee.
+     * Should only be called during or after teardown.
+     */
+    private getTransactionFeeUnsafe;
+    /**
+     * Generate the public inputs for the AVM circuit.
+     */
+    private generateAvmCircuitPublicInputs;
+    /**
+     * Generate the proving request for the AVM circuit.
+     */
+    generateProvingRequest(endStateReference: StateReference): AvmProvingRequest;
+    updateProvingRequest(real: boolean, phase: TxExecutionPhase, worldStateDB: WorldStateDB, stateManager: AvmPersistableStateManager, executionRequest: PublicExecutionRequest, result: EnqueuedPublicCallExecutionResult, allocatedGas: Gas): Promise<void>;
+}
+/**
+ * Thin wrapper around the state manager to handle forking and merging for phases.
+ *
+ * This lets us keep track of whether the state has already been forked
+ * so that we can conditionally fork at the start of a phase.
+ *
+ * There is a state manager that lives at the level of the entire transaction,
+ * but for setup and teardown the active state manager will be a fork of the
+ * transaction level one.
+ */
+declare class PhaseStateManager {
+    private readonly txStateManager;
+    private currentlyActiveStateManager;
+    constructor(txStateManager: AvmPersistableStateManager);
+    fork(): void;
+    getActiveStateManager(): AvmPersistableStateManager;
+    isForked(): boolean;
+    mergeForkedState(): void;
+    discardForkedState(): void;
+}
+export {};
+//# sourceMappingURL=public_tx_context.d.ts.map

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

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