@aztec/simulator 0.65.2 → 0.67.0

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

@@ -1,9 +1,9 @@
 import { MerkleTreeId, NullifierMembershipWitness, } from '@aztec/circuit-types';
-import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent, Fr, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
+import { Fr, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
 import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent } from '@aztec/protocol-contracts';
 import { MessageLoadOracleInputs, } from '@aztec/simulator';
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
@@ -15,7 +15,7 @@ export class ContractsDataSourcePublicDB {
         this.instanceCache = new Map();
         this.classCache = new Map();
         this.bytecodeCommitmentCache = new Map();
-        this.log = createDebugLogger('aztec:sequencer:contracts-data-source');
+        this.log = createLogger('simulator:contracts-data-source');
     }
     /**
      * Add new contracts from a transaction
@@ -24,13 +24,19 @@ export class ContractsDataSourcePublicDB {
     addNewContracts(tx) {
         // Extract contract class and instance data from logs and add to cache for this block
         const logs = tx.contractClassLogs.unrollLogs();
-        ContractClassRegisteredEvent.fromLogs(logs, ProtocolContractAddress.ContractClassRegisterer).forEach(e => {
-            this.log.debug(`Adding class ${e.contractClassId.toString()} to public execution contract cache`);
-            this.classCache.set(e.contractClassId.toString(), e.toContractClassPublic());
+        logs
+            .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
+            .forEach(log => {
+            const event = ContractClassRegisteredEvent.fromLog(log.data);
+            this.log.debug(`Adding class ${event.contractClassId.toString()} to public execution contract cache`);
+            this.classCache.set(event.contractClassId.toString(), event.toContractClassPublic());
         });
-        // We store the contract instance deployed event log in enc logs, contract_instance_deployer_contract/src/main.nr
-        const encLogs = tx.encryptedLogs.unrollLogs();
-        ContractInstanceDeployedEvent.fromLogs(encLogs).forEach(e => {
+        // We store the contract instance deployed event log in private logs, contract_instance_deployer_contract/src/main.nr
+        const contractInstanceEvents = tx.data
+            .getNonEmptyPrivateLogs()
+            .filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log))
+            .map(ContractInstanceDeployedEvent.fromLog);
+        contractInstanceEvents.forEach(e => {
             this.log.debug(`Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to public execution contract cache`);
             this.instanceCache.set(e.address.toString(), e.toContractInstance());
         });
@@ -45,10 +51,18 @@ export class ContractsDataSourcePublicDB {
         // Let's say we have two txs adding the same contract on the same block. If the 2nd one reverts,
         // wouldn't that accidentally remove the contract added on the first one?
         const logs = tx.contractClassLogs.unrollLogs();
-        ContractClassRegisteredEvent.fromLogs(logs, ProtocolContractAddress.ContractClassRegisterer).forEach(e => this.classCache.delete(e.contractClassId.toString()));
-        // We store the contract instance deployed event log in enc logs, contract_instance_deployer_contract/src/main.nr
-        const encLogs = tx.encryptedLogs.unrollLogs();
-        ContractInstanceDeployedEvent.fromLogs(encLogs).forEach(e => this.instanceCache.delete(e.address.toString()));
+        logs
+            .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
+            .forEach(log => {
+            const event = ContractClassRegisteredEvent.fromLog(log.data);
+            this.classCache.delete(event.contractClassId.toString());
+        });
+        // We store the contract instance deployed event log in private logs, contract_instance_deployer_contract/src/main.nr
+        const contractInstanceEvents = tx.data
+            .getNonEmptyPrivateLogs()
+            .filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log))
+            .map(ContractInstanceDeployedEvent.fromLog);
+        contractInstanceEvents.forEach(e => this.instanceCache.delete(e.address.toString()));
         return Promise.resolve();
     }
     async getContractInstance(address) {
@@ -101,7 +115,7 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
     constructor(db, dataSource) {
         super(dataSource);
         this.db = db;
-        this.logger = createDebugLogger('aztec:sequencer:world-state-db');
+        this.logger = createLogger('simulator:world-state-db');
         this.publicCommittedWriteCache = new Map();
         this.publicCheckpointedWriteCache = new Map();
         this.publicUncommittedWriteCache = new Map();
@@ -265,4 +279,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":"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"}
+//# 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,5 +1,5 @@
 import { type FailedTx, type MerkleTreeWriteOperations, NestedProcessReturnValues, type ProcessedTx, type ProcessedTxHandler, Tx, type TxValidator } from '@aztec/circuit-types';
-import { type ContractDataSource, type GlobalVariables, type Header } from '@aztec/circuits.js';
+import { type BlockHeader, type ContractDataSource, type GlobalVariables } from '@aztec/circuits.js';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 import { WorldStateDB } from './public_db_sources.js';
 import { PublicTxSimulator } from './public_tx_simulator.js';
@@ -16,7 +16,7 @@ export declare class PublicProcessorFactory {
      * @param globalVariables - The global variables for the block being processed.
      * @returns A new instance of a PublicProcessor.
      */
-    create(merkleTree: MerkleTreeWriteOperations, maybeHistoricalHeader: Header | undefined, globalVariables: GlobalVariables): PublicProcessor;
+    create(merkleTree: MerkleTreeWriteOperations, maybeHistoricalHeader: BlockHeader | undefined, globalVariables: GlobalVariables): PublicProcessor;
 }
 /**
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
@@ -25,12 +25,12 @@ export declare class PublicProcessorFactory {
 export declare class PublicProcessor {
     protected db: MerkleTreeWriteOperations;
     protected globalVariables: GlobalVariables;
-    protected historicalHeader: Header;
+    protected historicalHeader: BlockHeader;
     protected worldStateDB: WorldStateDB;
     protected publicTxSimulator: PublicTxSimulator;
     private log;
     private metrics;
-    constructor(db: MerkleTreeWriteOperations, globalVariables: GlobalVariables, historicalHeader: Header, worldStateDB: WorldStateDB, publicTxSimulator: PublicTxSimulator, telemetryClient: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    constructor(db: MerkleTreeWriteOperations, globalVariables: GlobalVariables, historicalHeader: BlockHeader, worldStateDB: WorldStateDB, publicTxSimulator: PublicTxSimulator, 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.
@@ -40,10 +40,9 @@ export declare class PublicProcessor {
      */
     process(txs: Tx[], maxTransactions?: number, processedTxHandler?: ProcessedTxHandler, txValidator?: TxValidator<ProcessedTx>): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]>;
     /**
-     * Creates the final set of data update requests for the transaction. This includes the
-     * set of public data update requests as returned by the public kernel, plus a data update
-     * 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.
+     * Creates the public data write for paying the tx fee.
+     * This is used in private only txs, since for txs with public calls
+     * the avm handles the fee payment itself.
      */
     private getFeePaymentPublicDataWrite;
     private processPrivateOnlyTx;

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,EAGL,KAAK,kBAAkB,EAEvB,KAAK,eAAe,EACpB,KAAK,MAAM,EAKZ,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,MAAM,GAAG,SAAS,EACzC,eAAe,EAAE,eAAe,GAC/B,eAAe;CAenB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAGxB,SAAS,CAAC,EAAE,EAAE,yBAAyB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAClC,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,MAAM,EACxB,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EAC9C,eAAe,EAAE,eAAe,EACxB,GAAG,yCAAwD;IAKrE,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;IAyFpE;;;;;OAKG;YACW,4BAA4B;YAqC5B,oBAAoB;YAuBpB,wBAAwB;CAkDvC"}
+{"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"}

package/dest/public/public_processor.js

@@ -1,10 +1,10 @@
 import { __esDecorate, __runInitializers } from "tslib";
 import { MerkleTreeId, NestedProcessReturnValues, Tx, TxExecutionPhase, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls, } from '@aztec/circuit-types';
-import { ContractClassRegisteredEvent, Fr, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, PublicDataWrite, } from '@aztec/circuits.js';
+import { Fr, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, PublicDataWrite, } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { ContractClassRegisteredEvent, ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
 import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from './fee_payment.js';
 import { WorldStateDB } from './public_db_sources.js';
@@ -27,7 +27,8 @@ export class PublicProcessorFactory {
     create(merkleTree, maybeHistoricalHeader, globalVariables) {
         const historicalHeader = maybeHistoricalHeader ?? merkleTree.getInitialHeader();
         const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
-        const publicTxSimulator = new PublicTxSimulator(merkleTree, worldStateDB, this.telemetryClient, globalVariables);
+        const publicTxSimulator = new PublicTxSimulator(merkleTree, worldStateDB, this.telemetryClient, globalVariables, 
+        /*doMerkleOperations=*/ true);
         return new PublicProcessor(merkleTree, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, this.telemetryClient);
     }
 }
@@ -41,7 +42,7 @@ let PublicProcessor = (() => {
     let _processPrivateOnlyTx_decorators;
     let _processTxWithPublicCalls_decorators;
     return _a = class PublicProcessor {
-            constructor(db, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, telemetryClient, log = createDebugLogger('aztec:simulator:public-processor')) {
+            constructor(db, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, telemetryClient, log = createLogger('simulator:public-processor')) {
                 this.db = (__runInitializers(this, _instanceExtraInitializers), db);
                 this.globalVariables = globalVariables;
                 this.historicalHeader = historicalHeader;
@@ -74,11 +75,21 @@ let PublicProcessor = (() => {
                         const [processedTx, returnValues] = !tx.hasPublicCalls()
                             ? await this.processPrivateOnlyTx(tx)
                             : await this.processTxWithPublicCalls(tx);
-                        this.log.debug(`Processed tx`, {
+                        this.log.verbose(!tx.hasPublicCalls()
+                            ? `Processed tx ${processedTx.hash} with no public calls`
+                            : `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls`, {
                             txHash: processedTx.hash,
-                            historicalHeaderHash: processedTx.constants.historicalHeader.hash(),
-                            blockNumber: processedTx.constants.globalVariables.blockNumber,
-                            lastArchiveRoot: processedTx.constants.historicalHeader.lastArchive.root,
+                            txFee: processedTx.txEffect.transactionFee.toBigInt(),
+                            revertCode: processedTx.txEffect.revertCode.getCode(),
+                            revertReason: processedTx.revertReason,
+                            gasUsed: processedTx.gasUsed,
+                            publicDataWriteCount: processedTx.txEffect.publicDataWrites.length,
+                            nullifierCount: processedTx.txEffect.nullifiers.length,
+                            noteHashCount: processedTx.txEffect.noteHashes.length,
+                            contractClassLogCount: processedTx.txEffect.contractClassLogs.getTotalLogCount(),
+                            unencryptedLogCount: processedTx.txEffect.unencryptedLogs.getTotalLogCount(),
+                            privateLogCount: processedTx.txEffect.privateLogs.length,
+                            l2ToL1MessageCount: processedTx.txEffect.l2ToL1Msgs.length,
                         });
                         // Commit the state updates from this transaction
                         await this.worldStateDB.commit();
@@ -117,7 +128,7 @@ let PublicProcessor = (() => {
                                 this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
                             }
                         }
-                        await this.db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, processedTx.txEffect.publicDataWrites.map(x => x.toBuffer()), 0);
+                        await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, processedTx.txEffect.publicDataWrites.map(x => x.toBuffer()));
                         result.push(processedTx);
                         returns = returns.concat(returnValues ?? []);
                     }
@@ -134,12 +145,11 @@ let PublicProcessor = (() => {
                 return [result, failed, returns];
             }
             /**
-             * Creates the final set of data update requests for the transaction. This includes the
-             * set of public data update requests as returned by the public kernel, plus a data update
-             * 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.
+             * Creates the public data write for paying the tx fee.
+             * This is used in private only txs, since for txs with public calls
+             * the avm handles the fee payment itself.
              */
-            async getFeePaymentPublicDataWrite(publicDataWrites, txFee, feePayer) {
+            async getFeePaymentPublicDataWrite(txFee, feePayer) {
                 if (feePayer.isZero()) {
                     this.log.debug(`No one is paying the fee of ${txFee.toBigInt()}`);
                     return;
@@ -148,10 +158,7 @@ let PublicProcessor = (() => {
                 const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
                 const leafSlot = computeFeePayerBalanceLeafSlot(feePayer);
                 this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${feePayer}`);
-                const existingBalanceWrite = publicDataWrites.find(write => write.leafSlot.equals(leafSlot));
-                const balance = existingBalanceWrite
-                    ? existingBalanceWrite.value
-                    : await this.worldStateDB.storageRead(feeJuiceAddress, balanceSlot);
+                const balance = 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.toBigInt()} needs ${txFee.toBigInt()})`);
                 }
@@ -162,9 +169,12 @@ let PublicProcessor = (() => {
             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 feePaymentPublicDataWrite = await this.getFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
                 const processedTx = makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, this.globalVariables);
+                this.metrics.recordClassRegistration(...tx.contractClassLogs
+                    .unrollLogs()
+                    .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
+                    .map(log => ContractClassRegisteredEvent.fromLog(log.data)));
                 return [processedTx];
             }
             async processTxWithPublicCalls(tx) {
@@ -182,13 +192,14 @@ let PublicProcessor = (() => {
                         this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
                     }
                 });
-                this.metrics.recordClassRegistration(...ContractClassRegisteredEvent.fromLogs(tx.contractClassLogs.unrollLogs(), ProtocolContractAddress.ContractClassRegisterer));
+                this.metrics.recordClassRegistration(...tx.contractClassLogs
+                    .unrollLogs()
+                    .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
+                    .map(log => ContractClassRegisteredEvent.fromLog(log.data)));
                 const phaseCount = processedPhases.length;
                 const durationMs = timer.ms();
                 this.metrics.recordTx(phaseCount, durationMs);
-                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 processedTx = makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
                 const returnValues = processedPhases.find(({ phase }) => phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
                 return [processedTx, returnValues];
             }
@@ -208,4 +219,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":"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"}

package/dest/public/public_processor_metrics.d.ts

@@ -1,5 +1,5 @@
 import { type TxExecutionPhase } from '@aztec/circuit-types';
-import { type ContractClassRegisteredEvent } from '@aztec/circuits.js';
+import { type ContractClassRegisteredEvent } from '@aztec/protocol-contracts';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 export declare class PublicProcessorMetrics {
     readonly tracer: Tracer;

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,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"}
+{"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,2BAA2B,CAAC;AAC9E,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_tx_context.d.ts

@@ -1,6 +1,5 @@
 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 { type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
+import { type AztecAddress, Fr, Gas, type GasSettings, type GlobalVariables, 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 WorldStateDB } from './public_db_sources.js';
@@ -10,10 +9,10 @@ import { type WorldStateDB } from './public_db_sources.js';
 export declare class PublicTxContext {
     readonly state: PhaseStateManager;
     private readonly globalVariables;
-    private readonly historicalHeader;
     private readonly startStateReference;
-    private readonly startGasUsed;
     private readonly gasSettings;
+    private readonly gasUsedByPrivate;
+    private readonly gasAllocatedToPublic;
     private readonly setupCallRequests;
     private readonly appLogicCallRequests;
     private readonly teardownCallRequests;
@@ -22,16 +21,16 @@ export declare class PublicTxContext {
     private readonly teardownExecutionRequests;
     readonly nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData;
     readonly revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData;
+    readonly feePayer: AztecAddress;
     trace: PublicEnqueuedCallSideEffectTrace;
     private log;
-    private gasUsed;
+    private gasUsedByPublic;
     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);
+    constructor(state: PhaseStateManager, globalVariables: GlobalVariables, startStateReference: StateReference, gasSettings: GasSettings, gasUsedByPrivate: Gas, gasAllocatedToPublic: Gas, setupCallRequests: PublicCallRequest[], appLogicCallRequests: PublicCallRequest[], teardownCallRequests: PublicCallRequest[], setupExecutionRequests: PublicExecutionRequest[], appLogicExecutionRequests: PublicExecutionRequest[], teardownExecutionRequests: PublicExecutionRequest[], nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, feePayer: AztecAddress, trace: PublicEnqueuedCallSideEffectTrace);
     static create(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, tx: Tx, globalVariables: GlobalVariables, doMerkleOperations: boolean): Promise<PublicTxContext>;
     /**
      * Signal that the entire transaction execution is done.
@@ -68,13 +67,18 @@ export declare class PublicTxContext {
      */
     getExecutionRequestsForPhase(phase: TxExecutionPhase): PublicExecutionRequest[];
     /**
-     * How much gas is left for the specified phase?
+     * How much gas is left as of the specified phase?
      */
-    getGasLeftForPhase(phase: TxExecutionPhase): Gas;
+    getGasLeftAtPhase(phase: TxExecutionPhase): Gas;
     /**
      * Consume gas. Track gas for teardown phase separately.
      */
     consumeGas(phase: TxExecutionPhase, gas: Gas): void;
+    /**
+     * The gasUsed by public and private,
+     * as if the entire teardown gas limit was consumed.
+     */
+    getTotalGasUsed(): Gas;
     /**
      * Compute the gas used using the actual gas used during teardown instead
      * of the teardown gas limit.
@@ -82,10 +86,6 @@ export declare class PublicTxContext {
      * 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.
@@ -104,7 +104,6 @@ export declare class PublicTxContext {
      * Generate the proving request for the AVM circuit.
      */
     generateProvingRequest(endStateReference: StateReference): AvmProvingRequest;
-    updateProvingRequest(real: boolean, phase: TxExecutionPhase, fnName: string, stateManager: AvmPersistableStateManager, executionRequest: PublicExecutionRequest, result: AvmFinalizedCallResult, allocatedGas: Gas): void;
 }
 /**
  * Thin wrapper around the state manager to handle forking and merging for phases.

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

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