@aztec/txe 0.55.1 → 0.57.0

package/src/oracle/txe_oracle.ts

@@ -1,8 +1,5 @@
 import {
   AuthWitness,
-  Event,
-  L1EventPayload,
-  L1NotePayload,
   MerkleTreeId,
   Note,
   type NoteStatus,
@@ -10,7 +7,6 @@ import {
   PublicDataWitness,
   PublicDataWrite,
   PublicExecutionRequest,
-  TaggedLog,
   type UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import { type CircuitWitnessGenerationStats } from '@aztec/circuit-types/stats';
@@ -25,6 +21,7 @@ import {
   type NullifierLeafPreimage,
   PUBLIC_DATA_SUBTREE_HEIGHT,
   type PUBLIC_DATA_TREE_HEIGHT,
+  PUBLIC_DISPATCH_SELECTOR,
   PrivateCircuitPublicInputs,
   PrivateContextInputs,
   PublicDataTreeLeaf,
@@ -34,24 +31,22 @@ import {
   deriveKeys,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { Aes128, Schnorr } from '@aztec/circuits.js/barretenberg';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { computePublicDataTreeLeafSlot, siloNoteHash, siloNullifier } from '@aztec/circuits.js/hash';
 import {
   type ContractArtifact,
-  EventSelector,
   type FunctionAbi,
   FunctionSelector,
   type NoteSelector,
   countArgumentsSize,
 } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr, GrumpkinScalar, type Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { type Logger, applyStringFormatting } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { type KeyStore } from '@aztec/key-store';
 import { ContractDataOracle } from '@aztec/pxe';
 import {
-  ContractsDataSourcePublicDB,
   ExecutionError,
   type ExecutionNoteCache,
   type MessageLoadOracleInputs,
@@ -60,7 +55,6 @@ import {
   type PackedValuesCache,
   PublicExecutor,
   type TypedOracle,
-  WorldStateDB,
   acvm,
   createSimulationError,
   extractCallStack,
@@ -74,7 +68,7 @@ import { MerkleTreeSnapshotOperationsFacade, type MerkleTrees } from '@aztec/wor
 
 import { type TXEDatabase } from '../util/txe_database.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
-import { TXEPublicStateDB } from '../util/txe_public_state_db.js';
+import { TXEWorldStateDB } from '../util/txe_world_state_db.js';
 
 export class TXE implements TypedOracle {
   private blockNumber = 0;
@@ -82,6 +76,7 @@ export class TXE implements TypedOracle {
   private contractAddress: AztecAddress;
   private msgSender: AztecAddress;
   private functionSelector = FunctionSelector.fromField(new Fr(0));
+  private isStaticCall = false;
   // This will hold the _real_ calldata. That is, the one without the PublicContextInputs.
   // TODO: Remove this comment once PublicContextInputs are removed.
   private calldata: Fr[] = [];
@@ -132,9 +127,7 @@ export class TXE implements TypedOracle {
   }
 
   getCalldata() {
-    // TODO: Remove this once PublicContextInputs are removed.
-    const inputs = this.getPublicContextInputs();
-    return [...inputs.toFields(), ...this.calldata];
+    return this.calldata;
   }
 
   setMsgSender(msgSender: Fr) {
@@ -215,17 +208,6 @@ export class TXE implements TypedOracle {
     return inputs;
   }
 
-  getPublicContextInputs() {
-    const inputs = {
-      calldataLength: new Fr(this.calldata.length),
-      isStaticCall: false,
-      toFields: function () {
-        return [this.calldataLength, new Fr(this.isStaticCall)];
-      },
-    };
-    return inputs;
-  }
-
   async avmOpcodeNullifierExists(innerNullifier: Fr, targetAddress: AztecAddress): Promise<boolean> {
     const nullifier = siloNullifier(targetAddress, innerNullifier!);
     const db = this.trees.asLatest();
@@ -283,6 +265,14 @@ export class TXE implements TypedOracle {
     return Promise.resolve(this.contractAddress);
   }
 
+  setIsStaticCall(isStatic: boolean) {
+    this.isStaticCall = isStatic;
+  }
+
+  getIsStaticCall() {
+    return this.isStaticCall;
+  }
+
   getRandomField() {
     return Fr.random();
   }
@@ -549,24 +539,6 @@ export class TXE implements TypedOracle {
     return;
   }
 
-  computeEncryptedNoteLog(
-    contractAddress: AztecAddress,
-    storageSlot: Fr,
-    noteTypeId: NoteSelector,
-    ovKeys: KeyValidationRequest,
-    ivpkM: Point,
-    recipient: AztecAddress,
-    preimage: Fr[],
-  ): Buffer {
-    const note = new Note(preimage);
-    const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
-    const taggedNote = new TaggedLog(l1NotePayload);
-
-    const ephSk = GrumpkinScalar.random();
-
-    return taggedNote.encrypt(ephSk, recipient, ivpkM, ovKeys);
-  }
-
   emitUnencryptedLog(_log: UnencryptedL2Log, counter: number): void {
     this.sideEffectsCounter = counter + 1;
     return;
@@ -585,10 +557,10 @@ export class TXE implements TypedOracle {
     isDelegateCall: boolean,
   ) {
     this.logger.verbose(
-      `Executing external function ${targetContractAddress}:${functionSelector}(${await this.getDebugFunctionName(
+      `Executing external function ${await this.getDebugFunctionName(
         targetContractAddress,
         functionSelector,
-      )}) isStaticCall=${isStaticCall} isDelegateCall=${isDelegateCall}`,
+      )}@${targetContractAddress} isStaticCall=${isStaticCall} isDelegateCall=${isDelegateCall}`,
     );
 
     // Store and modify env
@@ -708,25 +680,14 @@ export class TXE implements TypedOracle {
     return `${artifact.name}:${f.name}`;
   }
 
-  async executePublicFunction(
-    targetContractAddress: AztecAddress,
-    args: Fr[],
-    callContext: CallContext,
-    counter: number,
-  ) {
-    const header = Header.empty();
-    header.state = await this.trees.getStateReference(true);
-    header.globalVariables.blockNumber = new Fr(await this.getBlockNumber());
+  executePublicFunction(targetContractAddress: AztecAddress, args: Fr[], callContext: CallContext, counter: number) {
     const executor = new PublicExecutor(
-      new TXEPublicStateDB(this),
-      new ContractsDataSourcePublicDB(new TXEPublicContractDataSource(this)),
-      new WorldStateDB(this.trees.asLatest()),
-      header,
+      new TXEWorldStateDB(this.trees.asLatest(), new TXEPublicContractDataSource(this)),
       new NoopTelemetryClient(),
     );
     const execution = new PublicExecutionRequest(targetContractAddress, callContext, args);
 
-    return executor.simulate(
+    const executionResult = executor.simulate(
       execution,
       GlobalVariables.empty(),
       Gas.test(),
@@ -735,6 +696,7 @@ export class TXE implements TypedOracle {
       /* transactionFee */ Fr.ONE,
       counter,
     );
+    return Promise.resolve(executionResult);
   }
 
   async avmOpcodeCall(
@@ -785,7 +747,7 @@ export class TXE implements TypedOracle {
     sideEffectCounter: number,
     isStaticCall: boolean,
     isDelegateCall: boolean,
-  ) {
+  ): Promise<Fr> {
     // Store and modify env
     const currentContractAddress = AztecAddress.fromField(this.contractAddress);
     const currentMessageSender = AztecAddress.fromField(this.msgSender);
@@ -796,12 +758,13 @@ export class TXE implements TypedOracle {
 
     const callContext = CallContext.empty();
     callContext.msgSender = this.msgSender;
-    callContext.functionSelector = this.functionSelector;
+    callContext.functionSelector = FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR));
     callContext.storageContractAddress = targetContractAddress;
     callContext.isStaticCall = isStaticCall;
     callContext.isDelegateCall = isDelegateCall;
 
-    const args = this.packedValuesCache.unpack(argsHash);
+    const args = [this.functionSelector.toField(), ...this.packedValuesCache.unpack(argsHash)];
+    const newArgsHash = this.packedValuesCache.pack(args);
 
     const executionResult = await this.executePublicFunction(
       targetContractAddress,
@@ -819,6 +782,8 @@ export class TXE implements TypedOracle {
     this.setContractAddress(currentContractAddress);
     this.setMsgSender(currentMessageSender);
     this.setFunctionSelector(currentFunctionSelector);
+
+    return newArgsHash;
   }
 
   async setPublicTeardownFunctionCall(
@@ -828,10 +793,10 @@ export class TXE implements TypedOracle {
     sideEffectCounter: number,
     isStaticCall: boolean,
     isDelegateCall: boolean,
-  ) {
+  ): Promise<Fr> {
     // Definitely not right, in that the teardown should always be last.
     // But useful for executing flows.
-    await this.enqueuePublicFunctionCall(
+    return await this.enqueuePublicFunctionCall(
       targetContractAddress,
       functionSelector,
       argsHash,
@@ -845,11 +810,6 @@ export class TXE implements TypedOracle {
     this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
   }
 
-  aes128Encrypt(input: Buffer, initializationVector: Buffer, key: Buffer): Buffer {
-    const aes128 = new Aes128();
-    return aes128.encryptBufferCBC(input, initializationVector, key);
-  }
-
   debugLog(message: string, fields: Fr[]): void {
     this.logger.verbose(`debug_log ${applyStringFormatting(message, fields)}`);
   }
@@ -863,22 +823,4 @@ export class TXE implements TypedOracle {
     this.sideEffectsCounter = counter + 1;
     return;
   }
-
-  computeEncryptedEventLog(
-    contractAddress: AztecAddress,
-    randomness: Fr,
-    eventTypeId: Fr,
-    ovKeys: KeyValidationRequest,
-    ivpkM: Point,
-    recipient: AztecAddress,
-    preimage: Fr[],
-  ): Buffer {
-    const event = new Event(preimage);
-    const l1EventPayload = new L1EventPayload(event, contractAddress, randomness, EventSelector.fromField(eventTypeId));
-    const taggedEvent = new TaggedLog(l1EventPayload);
-
-    const ephSk = GrumpkinScalar.random();
-
-    return taggedEvent.encrypt(ephSk, recipient, ivpkM, ovKeys);
-  }
 }

package/src/txe_service/txe_service.ts

@@ -4,9 +4,7 @@ import {
   Fr,
   FunctionSelector,
   Header,
-  KeyValidationRequest,
   PUBLIC_DATA_SUBTREE_HEIGHT,
-  Point,
   PublicDataTreeLeaf,
   computePartialAddress,
   getContractInstanceFromDeployParams,
@@ -59,11 +57,6 @@ export class TXEService {
     return toForeignCallResult(inputs.toFields().map(toSingle));
   }
 
-  getPublicContextInputs() {
-    const inputs = (this.typedOracle as TXE).getPublicContextInputs();
-    return toForeignCallResult(inputs.toFields().map(toSingle));
-  }
-
   async advanceBlocksBy(blocks: ForeignCallSingle) {
     const nBlocks = fromSingle(blocks).toNumber();
     this.logger.debug(`time traveling ${nBlocks} blocks`);
@@ -313,6 +306,16 @@ export class TXEService {
     return toForeignCallResult([toSingle(functionSelector.toField())]);
   }
 
+  setIsStaticCall(isStaticCall: ForeignCallSingle) {
+    (this.typedOracle as TXE).setIsStaticCall(fromSingle(isStaticCall).toBool());
+    return toForeignCallResult([]);
+  }
+
+  avmOpcodeIsStaticCall() {
+    const isStaticCall = (this.typedOracle as TXE).getIsStaticCall();
+    return toForeignCallResult([toSingle(new Fr(isStaticCall ? 1 : 0))]);
+  }
+
   async avmOpcodeChainId() {
     const chainId = await (this.typedOracle as TXE).getChainId();
     return toForeignCallResult([toSingle(chainId)]);
@@ -609,46 +612,13 @@ export class TXEService {
     return toForeignCallResult([toArray(keyValidationRequest.toFields())]);
   }
 
-  computeEncryptedNoteLog(
-    contractAddress: ForeignCallSingle,
-    storageSlot: ForeignCallSingle,
-    noteTypeId: ForeignCallSingle,
-    ovskApp: ForeignCallSingle,
-    ovpkMX: ForeignCallSingle,
-    ovpkMY: ForeignCallSingle,
-    ovpkMIsInfinite: ForeignCallSingle,
-    ivpkMX: ForeignCallSingle,
-    ivpkMY: ForeignCallSingle,
-    ivpkMIsInfinite: ForeignCallSingle,
-    recipient: ForeignCallSingle,
-    preimage: ForeignCallArray,
-  ) {
-    const ovpkM = new Point(fromSingle(ovpkMX), fromSingle(ovpkMY), !fromSingle(ovpkMIsInfinite).isZero());
-    const ovKeys = new KeyValidationRequest(ovpkM, Fr.fromString(fromSingle(ovskApp).toString()));
-    const ivpkM = new Point(fromSingle(ivpkMX), fromSingle(ivpkMY), !fromSingle(ivpkMIsInfinite).isZero());
-    const encLog = this.typedOracle.computeEncryptedNoteLog(
-      AztecAddress.fromString(fromSingle(contractAddress).toString()),
-      Fr.fromString(fromSingle(storageSlot).toString()),
-      NoteSelector.fromField(Fr.fromString(fromSingle(noteTypeId).toString())),
-      ovKeys,
-      ivpkM,
-      AztecAddress.fromString(fromSingle(recipient).toString()),
-      fromArray(preimage),
-    );
-    const bytes: Fr[] = [];
-
-    encLog.forEach(v => {
-      bytes.push(new Fr(v));
-    });
-    return toForeignCallResult([toArray(bytes)]);
-  }
-
   emitEncryptedLog(
     _contractAddress: ForeignCallSingle,
     _randomness: ForeignCallSingle,
     _encryptedLog: ForeignCallSingle,
     _counter: ForeignCallSingle,
   ) {
+    // TODO(#8811): Implement
     return toForeignCallResult([]);
   }
 
@@ -657,10 +627,12 @@ export class TXEService {
     _encryptedNote: ForeignCallArray,
     _counter: ForeignCallSingle,
   ) {
+    // TODO(#8811): Implement
     return toForeignCallResult([]);
   }
 
   emitEncryptedEventLog(_contractAddress: AztecAddress, _randomness: Fr, _encryptedEvent: Buffer, _counter: number) {
+    // TODO(#8811): Implement
     return toForeignCallResult([]);
   }
 
@@ -709,7 +681,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
     isDelegateCall: ForeignCallSingle,
   ) {
-    await this.typedOracle.enqueuePublicFunctionCall(
+    const newArgsHash = await this.typedOracle.enqueuePublicFunctionCall(
       fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
@@ -717,7 +689,7 @@ export class TXEService {
       fromSingle(isStaticCall).toBool(),
       fromSingle(isDelegateCall).toBool(),
     );
-    return toForeignCallResult([]);
+    return toForeignCallResult([toSingle(newArgsHash)]);
   }
 
   public async setPublicTeardownFunctionCall(
@@ -728,7 +700,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
     isDelegateCall: ForeignCallSingle,
   ) {
-    await this.typedOracle.setPublicTeardownFunctionCall(
+    const newArgsHash = await this.typedOracle.setPublicTeardownFunctionCall(
       fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
@@ -736,7 +708,7 @@ export class TXEService {
       fromSingle(isStaticCall).toBool(),
       fromSingle(isDelegateCall).toBool(),
     );
-    return toForeignCallResult([]);
+    return toForeignCallResult([toSingle(newArgsHash)]);
   }
 
   public notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: ForeignCallSingle) {
@@ -781,4 +753,14 @@ export class TXEService {
     }
     return toForeignCallResult([toArray(witness)]);
   }
+
+  emitUnencryptedLog(_contractAddress: ForeignCallSingle, _message: ForeignCallArray, _counter: ForeignCallSingle) {
+    // TODO(#8811): Implement
+    return toForeignCallResult([]);
+  }
+
+  avmOpcodeEmitUnencryptedLog(_message: ForeignCallArray) {
+    // TODO(#8811): Implement
+    return toForeignCallResult([]);
+  }
 }

package/src/util/txe_public_contract_data_source.ts

@@ -1,4 +1,4 @@
-import { type AztecAddress, Fr, type FunctionSelector, unpackBytecode } from '@aztec/circuits.js';
+import { type AztecAddress, Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { PrivateFunctionsTree } from '@aztec/pxe';
 import {
@@ -31,11 +31,19 @@ export class TXEPublicContractDataSource implements ContractDataSource {
     const tree = new PrivateFunctionsTree(artifact);
     const privateFunctionsRoot = tree.getFunctionTreeRoot();
 
+    const publicFunctions: PublicFunction[] = [];
+    if (contractClass!.packedBytecode.length > 0) {
+      publicFunctions.push({
+        selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
+        bytecode: contractClass!.packedBytecode,
+      });
+    }
+
     return {
       id,
       artifactHash: contractClass!.artifactHash,
       packedBytecode: contractClass!.packedBytecode,
-      publicFunctions: unpackBytecode(contractClass!.packedBytecode),
+      publicFunctions: publicFunctions,
       privateFunctionsRoot: new Fr(privateFunctionsRoot!.root),
       version: contractClass!.version,
       privateFunctions: [],

package/src/util/txe_world_state_db.ts

@@ -0,0 +1,55 @@
+import { MerkleTreeId, type MerkleTreeOperations } from '@aztec/circuit-types';
+import {
+  type AztecAddress,
+  Fr,
+  PUBLIC_DATA_SUBTREE_HEIGHT,
+  PublicDataTreeLeaf,
+  type PublicDataTreeLeafPreimage,
+} from '@aztec/circuits.js';
+import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+import { WorldStateDB } from '@aztec/simulator';
+import { type ContractDataSource } from '@aztec/types/contracts';
+
+export class TXEWorldStateDB extends WorldStateDB {
+  constructor(private merkleDb: MerkleTreeOperations, dataSource: ContractDataSource) {
+    super(merkleDb, dataSource);
+  }
+
+  override async storageRead(contract: AztecAddress, slot: Fr): Promise<Fr> {
+    const leafSlot = computePublicDataTreeLeafSlot(contract, slot).toBigInt();
+
+    const lowLeafResult = await this.merkleDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+
+    let value = Fr.ZERO;
+    if (lowLeafResult && lowLeafResult.alreadyPresent) {
+      const preimage = (await this.merkleDb.getLeafPreimage(
+        MerkleTreeId.PUBLIC_DATA_TREE,
+        lowLeafResult.index,
+      )) as PublicDataTreeLeafPreimage;
+      value = preimage.value;
+    }
+    return value;
+  }
+
+  override async storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint> {
+    await this.merkleDb.batchInsert(
+      MerkleTreeId.PUBLIC_DATA_TREE,
+      [new PublicDataTreeLeaf(computePublicDataTreeLeafSlot(contract, slot), newValue).toBuffer()],
+      PUBLIC_DATA_SUBTREE_HEIGHT,
+    );
+    return newValue.toBigInt();
+  }
+
+  override checkpoint(): Promise<void> {
+    return Promise.resolve();
+  }
+  override rollbackToCheckpoint(): Promise<void> {
+    throw new Error('Cannot rollback');
+  }
+  override commit(): Promise<void> {
+    return Promise.resolve();
+  }
+  override rollbackToCommit(): Promise<void> {
+    throw new Error('Cannot rollback');
+  }
+}

package/dest/util/txe_public_state_db.d.ts

@@ -1,14 +0,0 @@
-import { type AztecAddress, Fr } from '@aztec/circuits.js';
-import { type PublicStateDB } from '@aztec/simulator';
-import { type TXE } from '../oracle/txe_oracle.js';
-export declare class TXEPublicStateDB implements PublicStateDB {
-    private txeOracle;
-    constructor(txeOracle: TXE);
-    storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
-    storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint>;
-    checkpoint(): Promise<void>;
-    rollbackToCheckpoint(): Promise<void>;
-    commit(): Promise<void>;
-    rollbackToCommit(): Promise<void>;
-}
-//# sourceMappingURL=txe_public_state_db.d.ts.map

package/dest/util/txe_public_state_db.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"txe_public_state_db.d.ts","sourceRoot":"","sources":["../../src/util/txe_public_state_db.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EACjB,EAAE,EAIH,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,gBAAiB,YAAW,aAAa;IACxC,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,GAAG;IAE5B,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAiB1D,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAWnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGrC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}

package/dest/util/txe_public_state_db.js

@@ -1,37 +0,0 @@
-import { MerkleTreeId } from '@aztec/circuit-types';
-import { Fr, PUBLIC_DATA_SUBTREE_HEIGHT, PublicDataTreeLeaf, } from '@aztec/circuits.js';
-import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
-export class TXEPublicStateDB {
-    constructor(txeOracle) {
-        this.txeOracle = txeOracle;
-    }
-    async storageRead(contract, slot) {
-        const db = this.txeOracle.getTrees().asLatest();
-        const leafSlot = computePublicDataTreeLeafSlot(contract, slot).toBigInt();
-        const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-        let value = Fr.ZERO;
-        if (lowLeafResult && lowLeafResult.alreadyPresent) {
-            const preimage = (await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
-            value = preimage.value;
-        }
-        return value;
-    }
-    async storageWrite(contract, slot, newValue) {
-        const db = this.txeOracle.getTrees().asLatest();
-        await db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, [new PublicDataTreeLeaf(computePublicDataTreeLeafSlot(contract, slot), newValue).toBuffer()], PUBLIC_DATA_SUBTREE_HEIGHT);
-        return newValue.toBigInt();
-    }
-    checkpoint() {
-        return Promise.resolve();
-    }
-    rollbackToCheckpoint() {
-        throw new Error('Cannot rollback');
-    }
-    commit() {
-        return Promise.resolve();
-    }
-    rollbackToCommit() {
-        throw new Error('Cannot rollback');
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19zdGF0ZV9kYi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfc3RhdGVfZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sRUFFTCxFQUFFLEVBQ0YsMEJBQTBCLEVBQzFCLGtCQUFrQixHQUVuQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS3hFLE1BQU0sT0FBTyxnQkFBZ0I7SUFDM0IsWUFBb0IsU0FBYztRQUFkLGNBQVMsR0FBVCxTQUFTLENBQUs7SUFBRyxDQUFDO0lBRXRDLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBc0IsRUFBRSxJQUFRO1FBQ2hELE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDaEQsTUFBTSxRQUFRLEdBQUcsNkJBQTZCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBRTFFLE1BQU0sYUFBYSxHQUFHLE1BQU0sRUFBRSxDQUFDLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxnQkFBZ0IsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUU5RixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDO1FBQ3BCLElBQUksYUFBYSxJQUFJLGFBQWEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUNsRCxNQUFNLFFBQVEsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLGVBQWUsQ0FDeEMsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixhQUFhLENBQUMsS0FBSyxDQUNwQixDQUErQixDQUFDO1lBQ2pDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQXNCLEVBQUUsSUFBUSxFQUFFLFFBQVk7UUFDL0QsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUVoRCxNQUFNLEVBQUUsQ0FBQyxXQUFXLENBQ2xCLFlBQVksQ0FBQyxnQkFBZ0IsRUFDN0IsQ0FBQyxJQUFJLGtCQUFrQixDQUFDLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxFQUM1RiwwQkFBMEIsQ0FDM0IsQ0FBQztRQUNGLE9BQU8sUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNELG9CQUFvQjtRQUNsQixNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsQ0FBQztJQUNELE1BQU07UUFDSixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBQ0QsZ0JBQWdCO1FBQ2QsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7Q0FDRiJ9

package/src/util/txe_public_state_db.ts

@@ -1,57 +0,0 @@
-import { MerkleTreeId } from '@aztec/circuit-types';
-import {
-  type AztecAddress,
-  Fr,
-  PUBLIC_DATA_SUBTREE_HEIGHT,
-  PublicDataTreeLeaf,
-  type PublicDataTreeLeafPreimage,
-} from '@aztec/circuits.js';
-import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
-import { type PublicStateDB } from '@aztec/simulator';
-
-import { type TXE } from '../oracle/txe_oracle.js';
-
-export class TXEPublicStateDB implements PublicStateDB {
-  constructor(private txeOracle: TXE) {}
-
-  async storageRead(contract: AztecAddress, slot: Fr): Promise<Fr> {
-    const db = this.txeOracle.getTrees().asLatest();
-    const leafSlot = computePublicDataTreeLeafSlot(contract, slot).toBigInt();
-
-    const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-
-    let value = Fr.ZERO;
-    if (lowLeafResult && lowLeafResult.alreadyPresent) {
-      const preimage = (await db.getLeafPreimage(
-        MerkleTreeId.PUBLIC_DATA_TREE,
-        lowLeafResult.index,
-      )) as PublicDataTreeLeafPreimage;
-      value = preimage.value;
-    }
-    return value;
-  }
-
-  async storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint> {
-    const db = this.txeOracle.getTrees().asLatest();
-
-    await db.batchInsert(
-      MerkleTreeId.PUBLIC_DATA_TREE,
-      [new PublicDataTreeLeaf(computePublicDataTreeLeafSlot(contract, slot), newValue).toBuffer()],
-      PUBLIC_DATA_SUBTREE_HEIGHT,
-    );
-    return newValue.toBigInt();
-  }
-
-  checkpoint(): Promise<void> {
-    return Promise.resolve();
-  }
-  rollbackToCheckpoint(): Promise<void> {
-    throw new Error('Cannot rollback');
-  }
-  commit(): Promise<void> {
-    return Promise.resolve();
-  }
-  rollbackToCommit(): Promise<void> {
-    throw new Error('Cannot rollback');
-  }
-}