@aztec/simulator 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

package/dest/public/public_processor/public_processor.js

@@ -1,28 +1,397 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
+}
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
+var _dec, _dec1, _dec2, _initProto;
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider, Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
 import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { AvmCircuitInputs, AvmExecutionHints, PublicDataWrite } from '@aztec/stdlib/avm';
 import { computeTransactionFee } from '@aztec/stdlib/fees';
 import { Gas } from '@aztec/stdlib/gas';
+import { NullDebugLogStore } from '@aztec/stdlib/logs';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { NestedProcessReturnValues, Tx, TxExecutionPhase, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '@aztec/stdlib/tx';
+import { NestedProcessReturnValues, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '@aztec/stdlib/tx';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { ForkCheckpoint } from '@aztec/world-state/native';
 import { AssertionError } from 'assert';
 import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
-import { TelemetryPublicTxSimulator } from '../public_tx_simulator/index.js';
+import { TelemetryCppPublicTxSimulator } from '../public_tx_simulator/index.js';
 import { GuardedMerkleTreeOperations } from './guarded_merkle_tree.js';
 import { PublicProcessorMetrics } from './public_processor_metrics.js';
 /**
@@ -31,10 +400,12 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
     contractDataSource;
     dateProvider;
     telemetryClient;
-    constructor(contractDataSource, dateProvider = new DateProvider(), telemetryClient = getTelemetryClient()){
+    log;
+    constructor(contractDataSource, dateProvider = new DateProvider(), telemetryClient = getTelemetryClient(), bindings){
         this.contractDataSource = contractDataSource;
         this.dateProvider = dateProvider;
         this.telemetryClient = telemetryClient;
+        this.log = createLogger('simulator:public-processor-factory', bindings);
     }
     /**
    * Creates a new instance of a PublicProcessor.
@@ -42,19 +413,14 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
    * @param skipFeeEnforcement - Allows disabling balance checks for fee estimations.
    * @returns A new instance of a PublicProcessor.
    */ create(merkleTree, globalVariables, config) {
-        const contractsDB = new PublicContractsDB(this.contractDataSource);
+        const bindings = this.log.getBindings();
+        const contractsDB = new PublicContractsDB(this.contractDataSource, bindings);
         const guardedFork = new GuardedMerkleTreeOperations(merkleTree);
-        const publicTxSimulator = this.createPublicTxSimulator(guardedFork, contractsDB, globalVariables, {
-            proverId: config.proverId,
-            doMerkleOperations: true,
-            skipFeeEnforcement: config.skipFeeEnforcement,
-            clientInitiatedSimulation: config.clientInitiatedSimulation,
-            maxDebugLogMemoryReads: config.maxDebugLogMemoryReads
-        });
-        return new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
+        const publicTxSimulator = this.createPublicTxSimulator(guardedFork, contractsDB, globalVariables, config);
+        return new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient, createLogger('simulator:public-processor', bindings));
     }
     createPublicTxSimulator(merkleTree, contractsDB, globalVariables, config) {
-        return new TelemetryPublicTxSimulator(merkleTree, contractsDB, globalVariables, this.telemetryClient, config);
+        return new TelemetryCppPublicTxSimulator(merkleTree, contractsDB, globalVariables, this.telemetryClient, config, this.log.getBindings());
     }
 }
 class PublicProcessorTimeoutError extends Error {
@@ -63,6 +429,13 @@ class PublicProcessorTimeoutError extends Error {
         this.name = 'PublicProcessorTimeoutError';
     }
 }
+_dec = trackSpan('PublicProcessor.processTx', (tx)=>({
+        [Attributes.TX_HASH]: tx.getTxHash().toString()
+    })), _dec1 = trackSpan('PublicProcessor.processPrivateOnlyTx', (tx)=>({
+        [Attributes.TX_HASH]: tx.getTxHash().toString()
+    })), _dec2 = trackSpan('PublicProcessor.processTxWithPublicCalls', (tx)=>({
+        [Attributes.TX_HASH]: tx.getTxHash().toString()
+    }));
 /**
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
  * any public function calls in them. Txs with private calls only are unaffected.
@@ -74,8 +447,28 @@ class PublicProcessorTimeoutError extends Error {
     dateProvider;
     log;
     opts;
+    debugLogStore;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "processTx"
+            ],
+            [
+                _dec1,
+                2,
+                "processPrivateOnlyTx"
+            ],
+            [
+                _dec2,
+                2,
+                "processTxWithPublicCalls"
+            ]
+        ], []));
+    }
     metrics;
-    constructor(globalVariables, guardedMerkleTree, contractsDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log = createLogger('simulator:public-processor'), opts = {}){
+    constructor(globalVariables, guardedMerkleTree, contractsDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log, opts = {}, debugLogStore = new NullDebugLogStore()){
         this.globalVariables = globalVariables;
         this.guardedMerkleTree = guardedMerkleTree;
         this.contractsDB = contractsDB;
@@ -83,6 +476,8 @@ class PublicProcessorTimeoutError extends Error {
         this.dateProvider = dateProvider;
         this.log = log;
         this.opts = opts;
+        this.debugLogStore = debugLogStore;
+        _initProto(this);
         this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
     }
     get tracer() {
@@ -95,18 +490,19 @@ class PublicProcessorTimeoutError extends Error {
    * @param validator - Pre-process validator and nullifier cache to use for processing the txs.
    * @returns The list of processed txs with their circuit simulation outputs.
    */ async process(txs, limits = {}, validator = {}) {
-        const { maxTransactions, maxBlockSize, deadline, maxBlockGas, maxBlobFields } = limits;
+        const { maxTransactions, deadline, maxBlockGas, maxBlobFields, isBuildingProposal } = limits;
         const { preprocessValidator, nullifierCache } = validator;
         const result = [];
         const usedTxs = [];
         const failed = [];
+        const debugLogs = [];
         const timer = new Timer();
         let totalSizeInBytes = 0;
         let returns = [];
         let totalPublicGas = new Gas(0, 0);
         let totalBlockGas = new Gas(0, 0);
         let totalBlobFields = 0;
-        for await (const origTx of txs){
+        for await (const tx of txs){
             // Only process up to the max tx limit
             if (maxTransactions !== undefined && result.length >= maxTransactions) {
                 this.log.debug(`Stopping tx processing due to reaching the max tx limit.`);
@@ -117,21 +513,23 @@ class PublicProcessorTimeoutError extends Error {
                 this.log.warn(`Stopping tx processing due to timeout.`);
                 break;
             }
-            // Skip this tx if it'd exceed max block size
-            const txHash = origTx.getTxHash().toString();
-            const preTxSizeInBytes = origTx.getEstimatedPrivateTxEffectsSize();
-            if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
-                this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
+            const txHash = tx.getTxHash().toString();
+            // Skip this tx if its estimated blob fields would exceed the limit.
+            // Only done during proposal building: during re-execution we must process the exact txs from the proposal.
+            const txBlobFields = tx.getPrivateTxEffectsSizeInFields();
+            if (isBuildingProposal && maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
+                this.log.warn(`Skipping tx ${txHash} with ${txBlobFields} fields from private side effects due to blob fields limit`, {
                     txHash,
-                    sizeInBytes: preTxSizeInBytes,
-                    totalSizeInBytes,
-                    maxBlockSize
+                    txBlobFields,
+                    totalBlobFields,
+                    maxBlobFields
                 });
                 continue;
             }
-            // Skip this tx if its gas limit would exceed the block gas limit
-            const txGasLimit = origTx.data.constants.txContext.gasSettings.gasLimits;
-            if (maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
+            // Skip this tx if its gas limit would exceed the block gas limit (either da or l2).
+            // Only done during proposal building: during re-execution we must process the exact txs from the proposal.
+            const txGasLimit = tx.data.constants.txContext.gasSettings.gasLimits;
+            if (isBuildingProposal && maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
                 this.log.warn(`Skipping processing of tx ${txHash} due to block gas limit`, {
                     txHash,
                     txGasLimit,
@@ -140,8 +538,6 @@ class PublicProcessorTimeoutError extends Error {
                 });
                 continue;
             }
-            // The processor modifies the tx objects in place, so we need to clone them.
-            const tx = Tx.clone(origTx);
             // We validate the tx before processing it, to avoid unnecessary work.
             if (preprocessValidator) {
                 const result = await preprocessValidator.validateTx(tx);
@@ -171,23 +567,18 @@ class PublicProcessorTimeoutError extends Error {
             // Note: We use the underlying fork here not the guarded one, this ensures that it's not impacted by stopping the guarded version
             const checkpoint = await ForkCheckpoint.new(this.guardedMerkleTree.getUnderlyingFork());
             const startStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
+            this.contractsDB.createCheckpoint();
             try {
-                const [processedTx, returnValues] = await this.processTx(tx, deadline);
-                // If the actual size of this tx would exceed block size, skip it
-                const txSize = processedTx.txEffect.getDASize();
-                if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
-                    this.log.debug(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
-                        txHash,
-                        sizeInBytes: txSize,
-                        totalSizeInBytes,
-                        maxBlockSize
-                    });
-                    // Need to revert the checkpoint here and don't go any further
-                    await checkpoint.revert();
-                    continue;
+                const [processedTx, returnValues, txDebugLogs] = await this.processTx(tx, deadline);
+                // Inject a fake processing failure after N txs if requested
+                const fakeThrowAfter = this.opts.fakeThrowAfterProcessingTxCount;
+                if (fakeThrowAfter !== undefined && result.length + failed.length + 1 >= fakeThrowAfter) {
+                    throw new Error(`Fake error after processing ${fakeThrowAfter} txs`);
                 }
-                // If the actual blob fields of this tx would exceed the limit, skip it
-                const txBlobFields = processedTx.txEffect.toBlobFields().length;
+                const txBlobFields = processedTx.txEffect.getNumBlobFields();
+                const txSize = txBlobFields * Fr.SIZE_IN_BYTES;
+                // If the actual blob fields of this tx would exceed the limit, skip it.
+                // Note: maxBlobFields already accounts for block end blob fields and previous blocks in checkpoint.
                 if (maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
                     this.log.debug(`Skipping processed tx ${txHash} with ${txBlobFields} blob fields due to max blob fields limit.`, {
                         txHash,
@@ -197,41 +588,67 @@ class PublicProcessorTimeoutError extends Error {
                     });
                     // Need to revert the checkpoint here and don't go any further
                     await checkpoint.revert();
+                    this.contractsDB.revertCheckpoint();
                     continue;
                 }
+                // During re-execution, check if the actual gas used by this tx would push the block over the gas limit.
+                // Unlike the proposal-building check (which uses declared gas limits pessimistically before processing),
+                // this uses actual gas and stops processing when the limit is exceeded.
+                if (!isBuildingProposal && maxBlockGas !== undefined && totalBlockGas.add(processedTx.gasUsed.totalGas).gtAny(maxBlockGas)) {
+                    this.log.warn(`Stopping re-execution since tx ${txHash} would push block gas over limit`, {
+                        txHash,
+                        txGas: processedTx.gasUsed.totalGas,
+                        totalBlockGas,
+                        maxBlockGas
+                    });
+                    await checkpoint.revert();
+                    this.contractsDB.revertCheckpoint();
+                    break;
+                }
                 // FIXME(fcarreiro): it's ugly to have to notify the validator of nullifiers.
                 // I'd rather pass the validators the processedTx as well and let them deal with it.
                 nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map((n)=>n.toBuffer()));
                 result.push(processedTx);
                 usedTxs.push(tx);
                 returns = returns.concat(returnValues);
+                debugLogs.push(...txDebugLogs);
+                this.debugLogStore.storeLogs(processedTx.hash.toString(), txDebugLogs);
                 totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
                 totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
                 totalSizeInBytes += txSize;
                 totalBlobFields += txBlobFields;
+                // Commit the tx-level contracts checkpoint on success
+                this.contractsDB.commitCheckpoint();
             } catch (err) {
                 if (err?.name === 'PublicProcessorTimeoutError') {
                     this.log.warn(`Stopping tx processing due to timeout.`);
                     // We hit the transaction execution deadline.
-                    // There may still be a transaction executing. We stop the guarded fork to prevent any further access to the world state.
+                    // There may still be a transaction executing on a worker thread (C++ via NAPI).
+                    // Signal cancellation AND WAIT for the simulation to actually stop.
+                    // This is critical because C++ might be in the middle of a slow operation (e.g., pad_trees)
+                    // and won't check the cancellation flag until that operation completes.
+                    // Without waiting, we'd proceed to revert checkpoints while C++ is still writing to state.
+                    // Wait for C++ to stop gracefully.
+                    await this.publicTxSimulator.cancel?.();
+                    // Now stop the guarded fork to prevent any further TS-side access to the world state.
                     await this.guardedMerkleTree.stop();
                     // We now know there can't be any further access to world state. The fork is in a state where there is:
                     // 1. At least one outstanding checkpoint that has not been committed (the one created before we processed the tx).
                     // 2. Possible state updates on that checkpoint or any others created during execution.
-                    // First we revert a checkpoint as managed by the ForkCheckpoint. This will revert whatever is the current checkpoint
-                    // which may not be the one originally created by this object. But that is ok, we do this to fulfil the ForkCheckpoint
-                    // lifecycle expectations and ensure it doesn't attempt to commit later on.
-                    await checkpoint.revert();
-                    // Now we want to revert any/all remaining checkpoints, destroying any outstanding state updates.
-                    // This needs to be done directly on the underlying fork as the guarded fork has been stopped.
-                    await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
+                    // Revert all checkpoints at or above this checkpoint's depth (inclusive), destroying any outstanding state
+                    // updates from this tx and any nested checkpoints created during execution. This preserves any checkpoints
+                    // created by callers below our depth.
+                    await checkpoint.revertToCheckpoint();
+                    // Revert any contracts added to the DB for the tx.
+                    this.contractsDB.revertCheckpoint();
                     // Ensure we're at the same state as when we started processing this tx.
                     await this.checkWorldStateUnchanged(startStateReference, txHash, err);
                     break;
                 }
-                // Roll back state to start of TX before proceeding to next TX
-                await checkpoint.revert();
-                await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
+                // Roll back state to start of TX before proceeding to next TX.
+                // Reverts all checkpoints at or above this checkpoint's depth, preserving any caller checkpoints below.
+                await checkpoint.revertToCheckpoint();
+                this.contractsDB.revertCheckpoint();
                 const errorMessage = err instanceof Error || err instanceof AssertionError ? err.message : 'Unknown error';
                 this.log.warn(`Failed to process tx ${txHash.toString()}: ${errorMessage} ${err?.stack}`);
                 failed.push({
@@ -244,8 +661,6 @@ class PublicProcessorTimeoutError extends Error {
             } finally{
                 // Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was previously reverted
                 await checkpoint.commit();
-                // The tx-level contracts cache should not live on to the next tx
-                this.contractsDB.clearContractsForTx();
             }
         }
         const duration = timer.s();
@@ -262,7 +677,8 @@ class PublicProcessorTimeoutError extends Error {
             result,
             failed,
             usedTxs,
-            returns
+            returns,
+            debugLogs
         ];
     }
     async checkWorldStateUnchanged(startStateReference, txHash, cause) {
@@ -279,7 +695,7 @@ class PublicProcessorTimeoutError extends Error {
         }
     }
     async processTx(tx, deadline) {
-        const [time, [processedTx, returnValues]] = await elapsed(()=>this.processTxWithinDeadline(tx, deadline));
+        const [time, [processedTx, returnValues, debugLogs]] = await elapsed(()=>this.processTxWithinDeadline(tx, deadline));
         this.log.verbose(!tx.hasPublicCalls() ? `Processed tx ${processedTx.hash} with no public calls in ${time}ms` : `Processed tx ${processedTx.hash} with ${tx.numberOfPublicCalls()} public calls in ${time}ms`, {
             txHash: processedTx.hash,
             txFee: processedTx.txEffect.transactionFee.toBigInt(),
@@ -297,7 +713,8 @@ class PublicProcessorTimeoutError extends Error {
         });
         return [
             processedTx,
-            returnValues ?? []
+            returnValues ?? [],
+            debugLogs
         ];
     }
     async doTreeInsertionsForPrivateOnlyTx(processedTx) {
@@ -371,54 +788,42 @@ class PublicProcessorTimeoutError extends Error {
         this.metrics.recordClassPublication(...tx.getContractClassLogs().filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log)));
         // Fee payment insertion has already been done. Do the rest.
         await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
-        // Add any contracts registered/deployed in this private-only tx to the block-level cache
-        // (add to tx-level cache and then commit to block-level cache)
         await this.contractsDB.addNewContracts(tx);
-        this.contractsDB.commitContractsForTx();
         return [
             processedTx,
-            undefined
+            undefined,
+            []
         ];
     }
     async processTxWithPublicCalls(tx) {
         const timer = new Timer();
-        const { avmProvingRequest, gasUsed, revertCode, revertReason, processedPhases } = await this.publicTxSimulator.simulate(tx);
-        if (!avmProvingRequest) {
-            this.metrics.recordFailedTx();
-            throw new Error('Avm proving result was not generated.');
-        }
-        processedPhases.forEach((phase)=>{
-            if (phase.reverted) {
-                this.metrics.recordRevertedPhase(phase.phase);
-            } else {
-                this.metrics.recordPhaseDuration(phase.phase, phase.durationMs ?? 0);
-            }
-        });
+        const result = await this.publicTxSimulator.simulate(tx);
+        // TODO: use the callStackMetadata here to extract more data about public execution
+        const { hints, publicInputs, publicTxEffect, gasUsed, revertCode/*callStackMetadata*/  } = result;
         const contractClassLogs = revertCode.isOK() ? tx.getContractClassLogs() : tx.getSplitContractClassLogs(false);
         this.metrics.recordClassPublication(...contractClassLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log)));
-        const phaseCount = processedPhases.length;
+        // TODO(fcarreiro): remove phase count metric.
         const durationMs = timer.ms();
-        this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
-        const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
-        const returnValues = processedPhases.find(({ phase })=>phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
+        this.metrics.recordTx(/*phaseCount=*/ 1, durationMs, gasUsed.publicGas);
+        // Extract the return values from the call stack metadata.
+        const appLogicReturnValues = result.getAppLogicReturnValues();
+        // Extract the revert reason from the call stack metadata.
+        const revertReason = result.findRevertReason();
+        // Create proving request if we have hints and public inputs.
+        const avmProvingRequest = hints && publicInputs ? PublicProcessor.generateProvingRequest(publicInputs, hints) : undefined;
+        const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, this.globalVariables, avmProvingRequest, publicTxEffect, gasUsed, revertCode, revertReason);
         return [
             processedTx,
-            returnValues
+            appLogicReturnValues,
+            result.logs ?? []
         ];
     }
+    /**
+   * Generate the proving request for the AVM circuit.
+   */ static generateProvingRequest(publicInputs, hints = AvmExecutionHints.empty()) {
+        return {
+            type: ProvingRequestType.PUBLIC_VM,
+            inputs: new AvmCircuitInputs(hints, publicInputs)
+        };
+    }
 }
-_ts_decorate([
-    trackSpan('PublicProcessor.processTx', (tx)=>({
-            [Attributes.TX_HASH]: tx.getTxHash().toString()
-        }))
-], PublicProcessor.prototype, "processTx", null);
-_ts_decorate([
-    trackSpan('PublicProcessor.processPrivateOnlyTx', (tx)=>({
-            [Attributes.TX_HASH]: tx.getTxHash().toString()
-        }))
-], PublicProcessor.prototype, "processPrivateOnlyTx", null);
-_ts_decorate([
-    trackSpan('PublicProcessor.processTxWithPublicCalls', (tx)=>({
-            [Attributes.TX_HASH]: tx.getTxHash().toString()
-        }))
-], PublicProcessor.prototype, "processTxWithPublicCalls", null);