@aztec/sequencer-client 0.24.0 → 0.26.1

package/src/simulator/public_executor.ts

@@ -1,14 +1,30 @@
-import { ContractDataSource, ExtendedContractData, L1ToL2MessageSource, MerkleTreeId, Tx } from '@aztec/circuit-types';
+import {
+  ContractDataSource,
+  ExtendedContractData,
+  L1ToL2MessageSource,
+  MerkleTreeId,
+  NullifierMembershipWitness,
+  Tx,
+  UnencryptedL2Log,
+} from '@aztec/circuit-types';
 import {
   AztecAddress,
+  ContractClassRegisteredEvent,
+  ContractInstanceDeployedEvent,
   EthAddress,
   Fr,
   FunctionSelector,
   L1_TO_L2_MSG_TREE_HEIGHT,
+  NULLIFIER_TREE_HEIGHT,
+  NullifierLeafPreimage,
   PublicDataTreeLeafPreimage,
 } from '@aztec/circuits.js';
-import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/abis';
+import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
+import { InstanceDeployerAddress } from '@aztec/protocol-contracts/instance-deployer';
 import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator';
+import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
 /**
@@ -16,7 +32,11 @@ import { MerkleTreeOperations } from '@aztec/world-state';
  * Progressively records contracts in transaction as they are processed in a block.
  */
 export class ContractsDataSourcePublicDB implements PublicContractsDB {
-  cache = new Map<string, ExtendedContractData>();
+  private cache = new Map<string, ExtendedContractData>();
+  private instanceCache = new Map<string, ContractInstanceWithAddress>();
+  private classCache = new Map<string, ContractClassPublic>();
+
+  private log = createDebugLogger('aztec:sequencer:contracts-data-source');
 
   constructor(private db: ContractDataSource) {}
 
@@ -35,6 +55,19 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
       this.cache.set(contractAddress.toString(), contract);
     }
 
+    // Extract contract class and instance data from logs and add to cache for this block
+    const logs = tx.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
+    ContractClassRegisteredEvent.fromLogs(logs, ClassRegistererAddress).forEach(e => {
+      this.log(`Adding class ${e.contractClassId.toString()} to public execution contract cache`);
+      this.classCache.set(e.contractClassId.toString(), e.toContractClassPublic());
+    });
+    ContractInstanceDeployedEvent.fromLogs(logs, InstanceDeployerAddress).forEach(e => {
+      this.log(
+        `Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to public execution contract cache`,
+      );
+      this.instanceCache.set(e.address.toString(), e.toContractInstance());
+    });
+
     return Promise.resolve();
   }
 
@@ -52,6 +85,17 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
 
       this.cache.delete(contractAddress.toString());
     }
+
+    // TODO(@spalladino): Can this inadvertently delete a valid contract added by another tx?
+    // 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.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
+    ContractClassRegisteredEvent.fromLogs(logs, ClassRegistererAddress).forEach(e =>
+      this.classCache.delete(e.contractClassId.toString()),
+    );
+    ContractInstanceDeployedEvent.fromLogs(logs, InstanceDeployerAddress).forEach(e =>
+      this.instanceCache.delete(e.address.toString()),
+    );
     return Promise.resolve();
   }
 
@@ -59,17 +103,42 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
     const contract = await this.#getContract(address);
     return contract?.getPublicFunction(selector)?.bytecode;
   }
+
   async getIsInternal(address: AztecAddress, selector: FunctionSelector): Promise<boolean | undefined> {
     const contract = await this.#getContract(address);
     return contract?.getPublicFunction(selector)?.isInternal;
   }
+
   async getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined> {
     const contract = await this.#getContract(address);
     return contract?.contractData.portalContractAddress;
   }
 
   async #getContract(address: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return this.cache.get(address.toString()) ?? (await this.db.getExtendedContractData(address));
+    return (
+      this.cache.get(address.toString()) ??
+      (await this.#makeExtendedContractDataFor(address)) ??
+      (await this.db.getExtendedContractData(address))
+    );
+  }
+
+  async #makeExtendedContractDataFor(address: AztecAddress): Promise<ExtendedContractData | undefined> {
+    const instance = this.instanceCache.get(address.toString());
+    if (!instance) {
+      return undefined;
+    }
+
+    const contractClass =
+      this.classCache.get(instance.contractClassId.toString()) ??
+      (await this.db.getContractClass(instance.contractClassId));
+    if (!contractClass) {
+      this.log.warn(
+        `Contract class ${instance.contractClassId.toString()} for address ${address.toString()} not found`,
+      );
+      return undefined;
+    }
+
+    return ExtendedContractData.fromClassAndInstance(contractClass, instance);
   }
 }
 
@@ -151,19 +220,48 @@ export class WorldStatePublicDB implements PublicStateDB {
 export class WorldStateDB implements CommitmentsDB {
   constructor(private db: MerkleTreeOperations, private l1ToL2MessageSource: L1ToL2MessageSource) {}
 
-  public async getL1ToL2Message(messageKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    // todo: #697 - make this one lookup.
-    const message = await this.l1ToL2MessageSource.getConfirmedL1ToL2Message(messageKey);
-    const index = (await this.db.findLeafIndex(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageKey.toBuffer()))!;
+  public async getNullifierMembershipWitnessAtLatestBlock(
+    nullifier: Fr,
+  ): Promise<NullifierMembershipWitness | undefined> {
+    const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+    if (!index) {
+      return undefined;
+    }
+
+    const leafPreimagePromise = this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
+    const siblingPathPromise = this.db.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(
+      MerkleTreeId.NULLIFIER_TREE,
+      BigInt(index),
+    );
+
+    const [leafPreimage, siblingPath] = await Promise.all([leafPreimagePromise, siblingPathPromise]);
+
+    if (!leafPreimage) {
+      return undefined;
+    }
+
+    return new NullifierMembershipWitness(BigInt(index), leafPreimage as NullifierLeafPreimage, siblingPath);
+  }
+
+  public async getL1ToL2MembershipWitness(
+    entryKey: Fr,
+  ): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
+    const index = (await this.db.findLeafIndex(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, entryKey.toBuffer()))!;
+    if (index === undefined) {
+      throw new Error(`Message ${entryKey.toString()} not found`);
+    }
     const siblingPath = await this.db.getSiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>(
       MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
       index,
     );
-
-    return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(message, index, siblingPath);
+    return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(index, siblingPath);
   }
 
   public async getCommitmentIndex(commitment: Fr): Promise<bigint | undefined> {
     return await this.db.findLeafIndex(MerkleTreeId.NOTE_HASH_TREE, commitment.toBuffer());
   }
+
+  public async getNullifierIndex(nullifier: Fr): Promise<bigint | undefined> {
+    return await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+  }
 }

package/src/simulator/public_kernel.ts

@@ -2,7 +2,11 @@ import { CircuitSimulationStats } from '@aztec/circuit-types/stats';
 import { PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
-import { executePublicKernelAppLogic, executePublicKernelSetup } from '@aztec/noir-protocol-circuits-types';
+import {
+  executePublicKernelAppLogic,
+  executePublicKernelSetup,
+  executePublicKernelTeardown,
+} from '@aztec/noir-protocol-circuits-types';
 
 import { PublicKernelCircuitSimulator } from './index.js';
 
@@ -13,20 +17,20 @@ export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
   private log = createDebugLogger('aztec:public-kernel-simulator');
 
   /**
-   * Simulates the public kernel circuit (with a previous private kernel circuit run) from its inputs.
+   * Simulates the public kernel setup circuit from its inputs.
    * @param input - Inputs to the circuit.
    * @returns The public inputs as outputs of the simulation.
    */
-  public async publicKernelCircuitPrivateInput(
+  public async publicKernelCircuitSetup(
     input: PublicKernelCircuitPrivateInputs,
   ): Promise<PublicKernelCircuitPublicInputs> {
-    if (!input.previousKernel.publicInputs.isPrivate) {
-      throw new Error(`Expected private kernel previous inputs`);
+    if (!input.previousKernel.publicInputs.needsSetup) {
+      throw new Error(`Expected previous kernel inputs to need setup`);
     }
     const [duration, result] = await elapsed(() => executePublicKernelSetup(input));
-    this.log(`Simulated public kernel circuit with private input`, {
+    this.log(`Simulated public kernel setup circuit`, {
       eventName: 'circuit-simulation',
-      circuitName: 'public-kernel-private-input',
+      circuitName: 'public-kernel-setup',
       duration,
       inputSize: input.toBuffer().length,
       outputSize: result.toBuffer().length,
@@ -35,20 +39,42 @@ export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
   }
 
   /**
-   * Simulates the public kernel circuit (with no previous public kernel circuit run) from its inputs.
+   * Simulates the public kernel app logic circuit from its inputs.
    * @param input - Inputs to the circuit.
    * @returns The public inputs as outputs of the simulation.
    */
-  public async publicKernelCircuitNonFirstIteration(
+  public async publicKernelCircuitAppLogic(
     input: PublicKernelCircuitPrivateInputs,
   ): Promise<PublicKernelCircuitPublicInputs> {
-    if (input.previousKernel.publicInputs.isPrivate) {
-      throw new Error(`Expected public kernel previous inputs`);
+    if (!input.previousKernel.publicInputs.needsAppLogic) {
+      throw new Error(`Expected previous kernel inputs to need app logic`);
     }
     const [duration, result] = await elapsed(() => executePublicKernelAppLogic(input));
-    this.log(`Simulated public kernel circuit non-first iteration`, {
+    this.log(`Simulated public kernel app logic circuit`, {
       eventName: 'circuit-simulation',
-      circuitName: 'public-kernel-non-first-iteration',
+      circuitName: 'public-kernel-app-logic',
+      duration,
+      inputSize: input.toBuffer().length,
+      outputSize: result.toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    return result;
+  }
+
+  /**
+   * Simulates the public kernel teardown circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  public async publicKernelCircuitTeardown(
+    input: PublicKernelCircuitPrivateInputs,
+  ): Promise<PublicKernelCircuitPublicInputs> {
+    if (!input.previousKernel.publicInputs.needsTeardown) {
+      throw new Error(`Expected previous kernel inputs to need teardown`);
+    }
+    const [duration, result] = await elapsed(() => executePublicKernelTeardown(input));
+    this.log(`Simulated public kernel teardown circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'public-kernel-teardown',
       duration,
       inputSize: input.toBuffer().length,
       outputSize: result.toBuffer().length,

package/dest/sequencer/application_logic_phase_manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"application_logic_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/application_logic_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAGxH,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,oBAAoB;IAElE,SAAS,CAAC,EAAE,EAAE,oBAAoB;IAClC,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,YAAY,EAAE,4BAA4B;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAClC,SAAS,CAAC,iBAAiB,EAAE,2BAA2B;IACxD,SAAS,CAAC,aAAa,EAAE,aAAa;IAEtC,SAAS,CAAC,GAAG;gBATH,EAAE,EAAE,oBAAoB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,4BAA4B,EAC1C,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,aAAa,EAE5B,GAAG,8CAAyD;IAKxE,0BAA0B,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,EAAE;IASjD,MAAM,CACV,EAAE,EAAE,EAAE,EACN,0BAA0B,CAAC,EAAE,+BAA+B,EAC5D,yBAAyB,CAAC,EAAE,KAAK,GAChC,OAAO,CAAC;QACT;;WAEG;QACH,kBAAkB,CAAC,EAAE,+BAA+B,CAAC;QACrD;;WAEG;QACH,iBAAiB,CAAC,EAAE,KAAK,CAAC;KAC3B,CAAC;IA2BF,SAAS;IAaH,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;CAWxD"}

package/dest/sequencer/application_logic_phase_manager.js

@@ -1,64 +0,0 @@
-import { isArrayEmpty } from '@aztec/foundation/collection';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { FeeDistributionPhaseManager } from './fee_distribution_phase_manager.js';
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class ApplicationLogicPhaseManager extends AbstractPhaseManager {
-    constructor(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, publicContractsDB, publicStateDB, log = createDebugLogger('aztec:sequencer:application-logic')) {
-        super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-        this.db = db;
-        this.publicExecutor = publicExecutor;
-        this.publicKernel = publicKernel;
-        this.publicProver = publicProver;
-        this.globalVariables = globalVariables;
-        this.historicalHeader = historicalHeader;
-        this.publicContractsDB = publicContractsDB;
-        this.publicStateDB = publicStateDB;
-        this.log = log;
-    }
-    extractEnqueuedPublicCalls(tx) {
-        if (!tx.enqueuedPublicFunctionCalls) {
-            throw new Error(`Missing preimages for enqueued public calls`);
-        }
-        // Note: the first enqueued public call is for fee payments
-        // TODO(dbanks12): why must these be reversed?
-        return tx.enqueuedPublicFunctionCalls.slice().reverse();
-    }
-    async handle(tx, previousPublicKernelOutput, previousPublicKernelProof) {
-        // add new contracts to the contracts db so that their functions may be found and called
-        this.log(`Processing tx ${await tx.getTxHash()}`);
-        await this.publicContractsDB.addNewContracts(tx);
-        if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isEmpty())) {
-            const outputAndProof = this.getKernelOutputAndProof(tx, previousPublicKernelOutput, previousPublicKernelProof);
-            this.log(`Executing enqueued public calls for tx ${await tx.getTxHash()}`);
-            const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(this.extractEnqueuedPublicCalls(tx), outputAndProof.publicKernelPublicInput, outputAndProof.publicKernelProof);
-            tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
-            // commit the state updates from this transaction
-            await this.publicStateDB.commit();
-            return { publicKernelOutput, publicKernelProof };
-        }
-        else {
-            return {
-                publicKernelOutput: undefined,
-                publicKernelProof: undefined,
-            };
-        }
-    }
-    nextPhase() {
-        return new FeeDistributionPhaseManager(this.db, this.publicExecutor, this.publicKernel, this.publicProver, this.globalVariables, this.historicalHeader, this.publicContractsDB, this.publicStateDB);
-    }
-    async rollback(tx, err) {
-        this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-        // remove contracts on failure
-        await this.publicContractsDB.removeNewContracts(tx);
-        // rollback any state updates from this failed transaction
-        await this.publicStateDB.rollback();
-        return {
-            tx,
-            error: err instanceof Error ? err : new Error('Unknown error'),
-        };
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbGljYXRpb25fbG9naWNfcGhhc2VfbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvYXBwbGljYXRpb25fbG9naWNfcGhhc2VfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFPMUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHbEY7O0dBRUc7QUFDSCxNQUFNLE9BQU8sNEJBQTZCLFNBQVEsb0JBQW9CO0lBQ3BFLFlBQ1ksRUFBd0IsRUFDeEIsY0FBOEIsRUFDOUIsWUFBMEMsRUFDMUMsWUFBMEIsRUFDMUIsZUFBZ0MsRUFDaEMsZ0JBQXdCLEVBQ3hCLGlCQUE4QyxFQUM5QyxhQUE0QixFQUU1QixNQUFNLGlCQUFpQixDQUFDLG1DQUFtQyxDQUFDO1FBRXRFLEtBQUssQ0FBQyxFQUFFLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFYL0UsT0FBRSxHQUFGLEVBQUUsQ0FBc0I7UUFDeEIsbUJBQWMsR0FBZCxjQUFjLENBQWdCO1FBQzlCLGlCQUFZLEdBQVosWUFBWSxDQUE4QjtRQUMxQyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUMxQixvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFRO1FBQ3hCLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBNkI7UUFDOUMsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFFNUIsUUFBRyxHQUFILEdBQUcsQ0FBeUQ7SUFHeEUsQ0FBQztJQUVELDBCQUEwQixDQUFDLEVBQU07UUFD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

package/dest/sequencer/fee_distribution_phase_manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fee_distribution_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/fee_distribution_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAExH,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,oBAAoB;IAEjE,SAAS,CAAC,EAAE,EAAE,oBAAoB;IAClC,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,YAAY,EAAE,4BAA4B;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAClC,SAAS,CAAC,iBAAiB,EAAE,2BAA2B;IACxD,SAAS,CAAC,aAAa,EAAE,aAAa;IAEtC,SAAS,CAAC,GAAG;gBATH,EAAE,EAAE,oBAAoB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,4BAA4B,EAC1C,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,aAAa,EAE5B,GAAG,8CAAwD;IAMvE,0BAA0B,CAAC,GAAG,EAAE,EAAE,GAAG,iBAAiB,EAAE;IAKlD,MAAM,CACV,EAAE,EAAE,EAAE,EACN,0BAA0B,CAAC,EAAE,+BAA+B,EAC5D,yBAAyB,CAAC,EAAE,KAAK,GAChC,OAAO,CAAC;QACT;;WAEG;QACH,kBAAkB,CAAC,EAAE,+BAA+B,CAAC;QACrD;;WAEG;QACH,iBAAiB,CAAC,EAAE,KAAK,CAAC;KAC3B,CAAC;IAQF,SAAS;IAIH,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;CAOxD"}

package/dest/sequencer/fee_distribution_phase_manager.js

@@ -1,42 +0,0 @@
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class FeeDistributionPhaseManager extends AbstractPhaseManager {
-    constructor(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, publicContractsDB, publicStateDB, log = createDebugLogger('aztec:sequencer:fee-distribution')) {
-        super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-        this.db = db;
-        this.publicExecutor = publicExecutor;
-        this.publicKernel = publicKernel;
-        this.publicProver = publicProver;
-        this.globalVariables = globalVariables;
-        this.historicalHeader = historicalHeader;
-        this.publicContractsDB = publicContractsDB;
-        this.publicStateDB = publicStateDB;
-        this.log = log;
-    }
-    // this is a no-op for now
-    extractEnqueuedPublicCalls(_tx) {
-        return [];
-    }
-    // this is a no-op for now
-    async handle(tx, previousPublicKernelOutput, previousPublicKernelProof) {
-        this.log.debug(`Handle ${await tx.getTxHash()} with no-op`);
-        return {
-            publicKernelOutput: previousPublicKernelOutput,
-            publicKernelProof: previousPublicKernelProof,
-        };
-    }
-    nextPhase() {
-        return undefined;
-    }
-    async rollback(tx, err) {
-        this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-        return {
-            tx,
-            error: err instanceof Error ? err : new Error('Unknown error'),
-        };
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2Rpc3RyaWJ1dGlvbl9waGFzZV9tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9mZWVfZGlzdHJpYnV0aW9uX3BoYXNlX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFPMUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHbkU7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMkJBQTRCLFNBQVEsb0JBQW9CO0lBQ25FLFlBQ1ksRUFBd0IsRUFDeEIsY0FBOEIsRUFDOUIsWUFBMEMsRUFDMUMsWUFBMEIsRUFDMUIsZUFBZ0MsRUFDaEMsZ0JBQXdCLEVBQ3hCLGlCQUE4QyxFQUM5QyxhQUE0QixFQUU1QixNQUFNLGlCQUFpQixDQUFDLGtDQUFrQyxDQUFDO1FBRXJFLEtBQUssQ0FBQyxFQUFFLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFYL0UsT0FBRSxHQUFGLEVBQUUsQ0FBc0I7UUFDeEIsbUJBQWMsR0FBZCxjQUFjLENBQWdCO1FBQzlCLGlCQUFZLEdBQVosWUFBWSxDQUE4QjtRQUMxQyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUMxQixvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFRO1FBQ3hCLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBNkI7UUFDOUMsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFFNUIsUUFBRyxHQUFILEdBQUcsQ0FBd0Q7SUFHdkUsQ0FBQztJQUVELDBCQUEwQjtJQUMxQiwwQkFBMEIsQ0FBQyxHQUFPO1FBQ2hDLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELDBCQUEwQjtJQUMxQixLQUFLLENBQUMsTUFBTSxDQUNWLEVBQU0sRUFDTiwwQkFBNEQsRUFDNUQseUJBQWlDO1FBV2pDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLFVBQVUsTUFBTSxFQUFFLENBQUMsU0FBUyxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQzVELE9BQU87WUFDTCxrQkFBa0IsRUFBRSwwQkFBMEI7WUFDOUMsaUJBQWlCLEVBQUUseUJBQXlCO1NBQzdDLENBQUM7SUFDSixDQUFDO0lBRUQsU0FBUztRQUNQLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUSxDQUFDLEVBQU0sRUFBRSxHQUFZO1FBQ2pDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLHVCQUF1QixNQUFNLEVBQUUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ3JFLE9BQU87WUFDTCxFQUFFO1lBQ0YsS0FBSyxFQUFFLEdBQUcsWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDO1NBQy9ELENBQUM7SUFDSixDQUFDO0NBQ0YifQ==

package/dest/sequencer/fee_preparation_phase_manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fee_preparation_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/fee_preparation_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAExH,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,oBAAoB;IAEhE,SAAS,CAAC,EAAE,EAAE,oBAAoB;IAClC,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,YAAY,EAAE,4BAA4B;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAClC,SAAS,CAAC,iBAAiB,EAAE,2BAA2B;IACxD,SAAS,CAAC,aAAa,EAAE,aAAa;IAEtC,SAAS,CAAC,GAAG;gBATH,EAAE,EAAE,oBAAoB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,4BAA4B,EAC1C,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,aAAa,EAE5B,GAAG,8CAAuD;IAKtE,0BAA0B,CAAC,GAAG,EAAE,EAAE,GAAG,iBAAiB,EAAE;IAKlD,MAAM,CACV,EAAE,EAAE,EAAE,EACN,0BAA0B,CAAC,EAAE,+BAA+B,EAC5D,yBAAyB,CAAC,EAAE,KAAK,GAChC,OAAO,CAAC;QACT;;WAEG;QACH,kBAAkB,CAAC,EAAE,+BAA+B,CAAC;QACrD;;WAEG;QACH,iBAAiB,CAAC,EAAE,KAAK,CAAC;KAC3B,CAAC;IAQF,SAAS,IAAI,oBAAoB;IAa3B,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;CAOxD"}

package/dest/sequencer/fee_preparation_phase_manager.js

@@ -1,42 +0,0 @@
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { ApplicationLogicPhaseManager } from './application_logic_phase_manager.js';
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class FeePreparationPhaseManager extends AbstractPhaseManager {
-    constructor(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, publicContractsDB, publicStateDB, log = createDebugLogger('aztec:sequencer:fee-preparation')) {
-        super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-        this.db = db;
-        this.publicExecutor = publicExecutor;
-        this.publicKernel = publicKernel;
-        this.publicProver = publicProver;
-        this.globalVariables = globalVariables;
-        this.historicalHeader = historicalHeader;
-        this.publicContractsDB = publicContractsDB;
-        this.publicStateDB = publicStateDB;
-        this.log = log;
-    }
-    extractEnqueuedPublicCalls(_tx) {
-        return [];
-    }
-    // this is a no-op for now
-    async handle(tx, previousPublicKernelOutput, previousPublicKernelProof) {
-        this.log.debug(`Handle ${await tx.getTxHash()} with no-op`);
-        return {
-            publicKernelOutput: previousPublicKernelOutput,
-            publicKernelProof: previousPublicKernelProof,
-        };
-    }
-    nextPhase() {
-        return new ApplicationLogicPhaseManager(this.db, this.publicExecutor, this.publicKernel, this.publicProver, this.globalVariables, this.historicalHeader, this.publicContractsDB, this.publicStateDB);
-    }
-    async rollback(tx, err) {
-        this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-        return {
-            tx,
-            error: err instanceof Error ? err : new Error('Unknown error'),
-        };
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3ByZXBhcmF0aW9uX3BoYXNlX21hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL2ZlZV9wcmVwYXJhdGlvbl9waGFzZV9tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBTzFELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ25FLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBR3BGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLDBCQUEyQixTQUFRLG9CQUFvQjtJQUNsRSxZQUNZLEVBQXdCLEVBQ3hCLGNBQThCLEVBQzlCLFlBQTBDLEVBQzFDLFlBQTBCLEVBQzFCLGVBQWdDLEVBQ2hDLGdCQUF3QixFQUN4QixpQkFBOEMsRUFDOUMsYUFBNEIsRUFFNUIsTUFBTSxpQkFBaUIsQ0FBQyxpQ0FBaUMsQ0FBQztRQUVwRSxLQUFLLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsWUFBWSxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1FBWC9FLE9BQUUsR0FBRixFQUFFLENBQXNCO1FBQ3hCLG1CQUFjLEdBQWQsY0FBYyxDQUFnQjtRQUM5QixpQkFBWSxHQUFaLFlBQVksQ0FBOEI7UUFDMUMsaUJBQVksR0FBWixZQUFZLENBQWM7UUFDMUIsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQ2hDLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBUTtRQUN4QixzQkFBaUIsR0FBakIsaUJBQWlCLENBQTZCO1FBQzlDLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBRTVCLFFBQUcsR0FBSCxHQUFHLENBQXVEO0lBR3RFLENBQUM7SUFFRCwwQkFBMEIsQ0FBQyxHQUFPO1FBQ2hDLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELDBCQUEwQjtJQUMxQixLQUFLLENBQUMsTUFBTSxDQUNWLEVBQU0sRUFDTiwwQkFBNEQsRUFDNUQseUJBQWlDO1FBV2pDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLFVBQVUsTUFBTSxFQUFFLENBQUMsU0FBUyxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQzVELE9BQU87WUFDTCxrQkFBa0IsRUFBRSwwQkFBMEI7WUFDOUMsaUJBQWlCLEVBQUUseUJBQXlCO1NBQzdDLENBQUM7SUFDSixDQUFDO0lBRUQsU0FBUztRQUNQLE9BQU8sSUFBSSw0QkFBNEIsQ0FDckMsSUFBSSxDQUFDLEVBQUUsRUFDUCxJQUFJLENBQUMsY0FBYyxFQUNuQixJQUFJLENBQUMsWUFBWSxFQUNqQixJQUFJLENBQUMsWUFBWSxFQUNqQixJQUFJLENBQUMsZUFBZSxFQUNwQixJQUFJLENBQUMsZ0JBQWdCLEVBQ3JCLElBQUksQ0FBQyxpQkFBaUIsRUFDdEIsSUFBSSxDQUFDLGFBQWEsQ0FDbkIsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUSxDQUFDLEVBQU0sRUFBRSxHQUFZO1FBQ2pDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLHVCQUF1QixNQUFNLEVBQUUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ3JFLE9BQU87WUFDTCxFQUFFO1lBQ0YsS0FBSyxFQUFFLEdBQUcsWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDO1NBQy9ELENBQUM7SUFDSixDQUFDO0NBQ0YifQ==

package/src/sequencer/application_logic_phase_manager.ts

@@ -1,107 +0,0 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { isArrayEmpty } from '@aztec/foundation/collection';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
-
-import { PublicProver } from '../prover/index.js';
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { FeeDistributionPhaseManager } from './fee_distribution_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
-
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class ApplicationLogicPhaseManager extends AbstractPhaseManager {
-  constructor(
-    protected db: MerkleTreeOperations,
-    protected publicExecutor: PublicExecutor,
-    protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
-    protected globalVariables: GlobalVariables,
-    protected historicalHeader: Header,
-    protected publicContractsDB: ContractsDataSourcePublicDB,
-    protected publicStateDB: PublicStateDB,
-
-    protected log = createDebugLogger('aztec:sequencer:application-logic'),
-  ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-  }
-
-  extractEnqueuedPublicCalls(tx: Tx): PublicCallRequest[] {
-    if (!tx.enqueuedPublicFunctionCalls) {
-      throw new Error(`Missing preimages for enqueued public calls`);
-    }
-    // Note: the first enqueued public call is for fee payments
-    // TODO(dbanks12): why must these be reversed?
-    return tx.enqueuedPublicFunctionCalls.slice().reverse();
-  }
-
-  async handle(
-    tx: Tx,
-    previousPublicKernelOutput?: PublicKernelCircuitPublicInputs,
-    previousPublicKernelProof?: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput?: PublicKernelCircuitPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof?: Proof;
-  }> {
-    // add new contracts to the contracts db so that their functions may be found and called
-    this.log(`Processing tx ${await tx.getTxHash()}`);
-    await this.publicContractsDB.addNewContracts(tx);
-    if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isEmpty())) {
-      const outputAndProof = this.getKernelOutputAndProof(tx, previousPublicKernelOutput, previousPublicKernelProof);
-
-      this.log(`Executing enqueued public calls for tx ${await tx.getTxHash()}`);
-      const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(
-        this.extractEnqueuedPublicCalls(tx),
-        outputAndProof.publicKernelPublicInput,
-        outputAndProof.publicKernelProof,
-      );
-      tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
-
-      // commit the state updates from this transaction
-      await this.publicStateDB.commit();
-
-      return { publicKernelOutput, publicKernelProof };
-    } else {
-      return {
-        publicKernelOutput: undefined,
-        publicKernelProof: undefined,
-      };
-    }
-  }
-
-  nextPhase() {
-    return new FeeDistributionPhaseManager(
-      this.db,
-      this.publicExecutor,
-      this.publicKernel,
-      this.publicProver,
-      this.globalVariables,
-      this.historicalHeader,
-      this.publicContractsDB,
-      this.publicStateDB,
-    );
-  }
-
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-    // remove contracts on failure
-    await this.publicContractsDB.removeNewContracts(tx);
-    // rollback any state updates from this failed transaction
-    await this.publicStateDB.rollback();
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
-  }
-}

package/src/sequencer/fee_preparation_phase_manager.ts

@@ -1,79 +0,0 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
-
-import { PublicProver } from '../prover/index.js';
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { ApplicationLogicPhaseManager } from './application_logic_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
-
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class FeePreparationPhaseManager extends AbstractPhaseManager {
-  constructor(
-    protected db: MerkleTreeOperations,
-    protected publicExecutor: PublicExecutor,
-    protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
-    protected globalVariables: GlobalVariables,
-    protected historicalHeader: Header,
-    protected publicContractsDB: ContractsDataSourcePublicDB,
-    protected publicStateDB: PublicStateDB,
-
-    protected log = createDebugLogger('aztec:sequencer:fee-preparation'),
-  ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-  }
-
-  extractEnqueuedPublicCalls(_tx: Tx): PublicCallRequest[] {
-    return [];
-  }
-
-  // this is a no-op for now
-  async handle(
-    tx: Tx,
-    previousPublicKernelOutput?: PublicKernelCircuitPublicInputs,
-    previousPublicKernelProof?: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput?: PublicKernelCircuitPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof?: Proof;
-  }> {
-    this.log.debug(`Handle ${await tx.getTxHash()} with no-op`);
-    return {
-      publicKernelOutput: previousPublicKernelOutput,
-      publicKernelProof: previousPublicKernelProof,
-    };
-  }
-
-  nextPhase(): AbstractPhaseManager {
-    return new ApplicationLogicPhaseManager(
-      this.db,
-      this.publicExecutor,
-      this.publicKernel,
-      this.publicProver,
-      this.globalVariables,
-      this.historicalHeader,
-      this.publicContractsDB,
-      this.publicStateDB,
-    );
-  }
-
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
-  }
-}