@aztec/txe 0.80.0 → 0.82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -59,17 +59,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.80.0",
-    "@aztec/aztec.js": "0.80.0",
-    "@aztec/constants": "0.80.0",
-    "@aztec/foundation": "0.80.0",
-    "@aztec/key-store": "0.80.0",
-    "@aztec/kv-store": "0.80.0",
-    "@aztec/protocol-contracts": "0.80.0",
-    "@aztec/pxe": "0.80.0",
-    "@aztec/simulator": "0.80.0",
-    "@aztec/stdlib": "0.80.0",
-    "@aztec/world-state": "0.80.0",
+    "@aztec/accounts": "0.82.0",
+    "@aztec/aztec.js": "0.82.0",
+    "@aztec/constants": "0.82.0",
+    "@aztec/foundation": "0.82.0",
+    "@aztec/key-store": "0.82.0",
+    "@aztec/kv-store": "0.82.0",
+    "@aztec/protocol-contracts": "0.82.0",
+    "@aztec/pxe": "0.82.0",
+    "@aztec/simulator": "0.82.0",
+    "@aztec/stdlib": "0.82.0",
+    "@aztec/world-state": "0.82.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {

package/src/bin/index.ts

@@ -25,6 +25,7 @@ async function main() {
 
   const txeServer = createTXERpcServer(logger);
   const { port } = await startHttpRpcServer(txeServer, {
+    host: '0.0.0.0',
     port: TXE_PORT,
     timeoutMs: 1e3 * 60 * 5,
   });

package/src/node/txe_node.ts

@@ -1,10 +1,9 @@
-import {
-  type ARCHIVE_HEIGHT,
-  type L1_TO_L2_MSG_TREE_HEIGHT,
-  type NOTE_HASH_TREE_HEIGHT,
-  type NULLIFIER_TREE_HEIGHT,
-  type PUBLIC_DATA_TREE_HEIGHT,
-  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
+import type {
+  ARCHIVE_HEIGHT,
+  L1_TO_L2_MSG_TREE_HEIGHT,
+  NOTE_HASH_TREE_HEIGHT,
+  NULLIFIER_TREE_HEIGHT,
+  PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/constants';
 import type { L1ContractAddresses } from '@aztec/ethereum';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
@@ -12,7 +11,14 @@ import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { SiblingPath } from '@aztec/foundation/trees';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type InBlock, L2Block, L2BlockHash, type L2BlockNumber, type L2Tips } from '@aztec/stdlib/block';
+import {
+  type InBlock,
+  L2Block,
+  L2BlockHash,
+  type L2BlockNumber,
+  type L2Tips,
+  type PublishedL2Block,
+} from '@aztec/stdlib/block';
 import type {
   ContractClassPublic,
   ContractInstanceWithAddress,
@@ -51,7 +57,6 @@ export class TXENode implements AztecNode {
   #logsByTags = new Map<string, TxScopedL2Log[]>();
   #txEffectsByTxHash = new Map<string, InBlock<TxEffect>>();
   #txReceiptsByTxHash = new Map<string, TxReceipt>();
-  #blockNumberToNullifiers = new Map<number, Fr[]>();
   #noteIndex = 0;
 
   #logger = createLogger('aztec:txe_node');
@@ -119,77 +124,26 @@ export class TXENode implements AztecNode {
         undefined,
         new L2BlockHash(blockHash.toBuffer()),
         blockNumber,
-        undefined,
       ),
     );
   }
 
   /**
-   * Returns the indexes of the given nullifiers in the nullifier tree,
-   * scoped to the block they were included in.
-   * @param blockNumber - The block number at which to get the data.
-   * @param nullifiers - The nullifiers to search for.
-   * @returns The block scoped indexes of the given nullifiers in the nullifier tree, or undefined if not found.
-   */
-  async findNullifiersIndexesWithBlock(
-    blockNumber: L2BlockNumber,
-    nullifiers: Fr[],
-  ): Promise<(InBlock<bigint> | undefined)[]> {
-    const parsedBlockNumber = blockNumber === 'latest' ? await this.getBlockNumber() : blockNumber;
-
-    const nullifiersInBlock: Fr[] = [];
-    for (const [key, val] of this.#blockNumberToNullifiers.entries()) {
-      if (key < parsedBlockNumber) {
-        nullifiersInBlock.push(...val);
-      }
-    }
-
-    return nullifiers.map(nullifier => {
-      const possibleNullifierIndex = nullifiersInBlock.findIndex(nullifierInBlock =>
-        nullifierInBlock.equals(nullifier),
-      );
-      return possibleNullifierIndex === -1
-        ? undefined
-        : {
-            l2BlockNumber: parsedBlockNumber,
-            l2BlockHash: new Fr(parsedBlockNumber).toString(),
-            data: BigInt(possibleNullifierIndex),
-          };
-    });
-  }
-
-  /**
-   * Returns the indexes of the given nullifiers in the nullifier tree,
-   * scoped to the block they were included in.
-   * @param blockNumber - The block number at which to get the data.
-   * @param nullifiers - The nullifiers to search for.
-   * @returns The block scoped indexes of the given nullifiers in the nullifier tree, or undefined if not found.
-   */
-  setNullifiersIndexesWithBlock(blockNumber: number, nullifiers: Fr[]) {
-    this.#blockNumberToNullifiers.set(blockNumber, nullifiers);
-  }
-
-  /**
-   * Adds note logs to the txe node, given a block
-   * @param blockNumber - The block number at which to add the note logs.
-   * @param privateLogs - The privateLogs that contain the note logs to be added.
+   * Adds private logs to the txe node, given a block
+   * @param blockNumber - The block number at which to add the private logs.
+   * @param privateLogs - The privateLogs that contain the private logs to be added.
    */
-  addNoteLogsByTags(blockNumber: number, privateLogs: PrivateLog[]) {
+  addPrivateLogsByTags(blockNumber: number, privateLogs: PrivateLog[]) {
     privateLogs.forEach(log => {
       const tag = log.fields[0];
+      this.#logger.verbose(`Found private log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
+
       const currentLogs = this.#logsByTags.get(tag.toString()) ?? [];
-      const scopedLog = new TxScopedL2Log(
-        new TxHash(new Fr(blockNumber)),
-        this.#noteIndex,
-        blockNumber,
-        false,
-        log.toBuffer(),
-      );
+      const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), this.#noteIndex, blockNumber, log);
       currentLogs.push(scopedLog);
       this.#logsByTags.set(tag.toString(), currentLogs);
     });
 
-    // TODO: DISTINGUISH BETWEEN EVENT LOGS AND NOTE LOGS ?
     this.#noteIndex += privateLogs.length;
   }
 
@@ -200,39 +154,11 @@ export class TXENode implements AztecNode {
    */
   addPublicLogsByTags(blockNumber: number, publicLogs: PublicLog[]) {
     publicLogs.forEach(log => {
-      // Check that each log stores 3 lengths in its first field. If not, it's not a tagged log:
-      const firstFieldBuf = log.log[0].toBuffer();
-      // See macros/note/mod/ and see how finalization_log[0] is constructed, to understand this monstrosity. (It wasn't me).
-      // Search the codebase for "disgusting encoding" to see other hardcoded instances of this encoding, that you might need to change if you ever find yourself here.
-      if (!firstFieldBuf.subarray(0, 27).equals(Buffer.alloc(27)) || firstFieldBuf[29] !== 0) {
-        // See parseLogFromPublic - the first field of a tagged log is 5 bytes structured:
-        // [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1]]
-        this.#logger.warn(`Skipping public log with invalid first field: ${log.log[0]}`);
-        return;
-      }
-      // Check that the length values line up with the log contents
-      const publicValuesLength = firstFieldBuf.subarray(-5).readUint16BE();
-      const privateValuesLength = firstFieldBuf.subarray(-5).readUint16BE(3);
-      // Add 1 for the first field holding lengths
-      const totalLogLength = 1 + publicValuesLength + privateValuesLength;
-      // Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
-      if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find(f => !f.isZero())) {
-        this.#logger.warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
-        return;
-      }
-      // The first elt stores lengths => tag is in fields[1]
-      const tag = log.log[1];
-
-      this.#logger.verbose(`Found tagged public log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
+      const tag = log.log[0];
+      this.#logger.verbose(`Found public log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
 
       const currentLogs = this.#logsByTags.get(tag.toString()) ?? [];
-      const scopedLog = new TxScopedL2Log(
-        new TxHash(new Fr(blockNumber)),
-        this.#noteIndex,
-        blockNumber,
-        true,
-        log.toBuffer(),
-      );
+      const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), this.#noteIndex, blockNumber, log);
 
       currentLogs.push(scopedLog);
       this.#logsByTags.set(tag.toString(), currentLogs);
@@ -245,9 +171,9 @@ export class TXENode implements AztecNode {
    array implies no logs match that tag.
    */
   getLogsByTags(tags: Fr[]): Promise<TxScopedL2Log[][]> {
-    const noteLogs = tags.map(tag => this.#logsByTags.get(tag.toString()) ?? []);
+    const logs = tags.map(tag => this.#logsByTags.get(tag.toString()) ?? []);
 
-    return Promise.resolve(noteLogs);
+    return Promise.resolve(logs);
   }
 
   /**
@@ -262,13 +188,13 @@ export class TXENode implements AztecNode {
    * @param blockNumber - The block number at which to get the data or 'latest' for latest data
    * @param treeId - The tree to search in.
    * @param leafValue - The values to search for
-   * @returns The indexes of the given leaves in the given tree or undefined if not found.
+   * @returns The indices of leaves and the block metadata of a block in which the leaf was inserted.
    */
   async findLeavesIndexes(
     blockNumber: L2BlockNumber,
     treeId: MerkleTreeId,
     leafValues: Fr[],
-  ): Promise<(bigint | undefined)[]> {
+  ): Promise<(InBlock<bigint> | undefined)[]> {
     // Temporary workaround to be able to respond this query: the trees are currently stored in the TXE oracle, but we
     // hold a reference to them.
     // We should likely migrate this so that the trees are owned by the node.
@@ -279,10 +205,61 @@ export class TXENode implements AztecNode {
         ? this.baseFork
         : this.nativeWorldStateService.getSnapshot(blockNumber);
 
-    return await db.findLeafIndices(
+    const maybeIndices = await db.findLeafIndices(
       treeId,
       leafValues.map(x => x.toBuffer()),
     );
+
+    // We filter out undefined values
+    const indices = maybeIndices.filter(x => x !== undefined) as bigint[];
+
+    // Now we find the block numbers for the indices
+    const blockNumbers = await db.getBlockNumbersForLeafIndices(treeId, indices);
+
+    // If any of the block numbers are undefined, we throw an error.
+    for (let i = 0; i < indices.length; i++) {
+      if (blockNumbers[i] === undefined) {
+        throw new Error(`Block number is undefined for leaf index ${indices[i]} in tree ${MerkleTreeId[treeId]}`);
+      }
+    }
+    // Get unique block numbers in order to optimize num calls to getLeafValue function.
+    const uniqueBlockNumbers = [...new Set(blockNumbers.filter(x => x !== undefined))];
+
+    // Now we obtain the block hashes from the archive tree by calling await `committedDb.getLeafValue(treeId, index)`
+    // (note that block number corresponds to the leaf index in the archive tree).
+    const blockHashes = await Promise.all(
+      uniqueBlockNumbers.map(blockNumber => {
+        return db.getLeafValue(MerkleTreeId.ARCHIVE, blockNumber!);
+      }),
+    );
+
+    // If any of the block hashes are undefined, we throw an error.
+    for (let i = 0; i < uniqueBlockNumbers.length; i++) {
+      if (blockHashes[i] === undefined) {
+        throw new Error(`Block hash is undefined for block number ${uniqueBlockNumbers[i]}`);
+      }
+    }
+
+    // Create InBlock objects by combining indices, blockNumbers and blockHashes
+    return maybeIndices.map((index, i) => {
+      if (index === undefined) {
+        return undefined;
+      }
+      const blockNumber = blockNumbers[i];
+      if (blockNumber === undefined) {
+        return undefined;
+      }
+      const blockHashIndex = uniqueBlockNumbers.indexOf(blockNumber);
+      const blockHash = blockHashes[blockHashIndex]?.toString();
+      if (!blockHash) {
+        return undefined;
+      }
+      return {
+        l2BlockNumber: Number(blockNumber),
+        l2BlockHash: blockHash,
+        data: index,
+      };
+    });
   }
 
   /**
@@ -411,8 +388,8 @@ export class TXENode implements AztecNode {
    * "in range" slot, means that the slot doesn't exist and the value is 0. If the low leaf preimage corresponds to the exact slot, the current value
    * is contained in the leaf preimage.
    */
-  getPublicDataTreeWitness(_blockNumber: L2BlockNumber, _leafSlot: Fr): Promise<PublicDataWitness | undefined> {
-    throw new Error('TXE Node method getPublicDataTreeWitness not implemented');
+  getPublicDataWitness(_blockNumber: L2BlockNumber, _leafSlot: Fr): Promise<PublicDataWitness | undefined> {
+    throw new Error('TXE Node method getPublicDataWitness not implemented');
   }
 
   /**
@@ -450,6 +427,10 @@ export class TXENode implements AztecNode {
     throw new Error('TXE Node method getBlocks not implemented');
   }
 
+  getPublishedBlocks(_from: number, _limit: number): Promise<PublishedL2Block[]> {
+    throw new Error('TXE Node method getPublishedBlocks not implemented');
+  }
+
   /**
    * Method to fetch the version of the package.
    * @returns The node package version
@@ -665,15 +646,6 @@ export class TXENode implements AztecNode {
     throw new Error('TXE Node method getEncodedEnr not implemented');
   }
 
-  /**
-   * Adds a contract class bypassing the registerer.
-   * TODO(#10007): Remove this method.
-   * @param contractClass - The class to register.
-   */
-  addContractClass(_contractClass: ContractClassPublic): Promise<void> {
-    throw new Error('TXE Node method addContractClass not implemented');
-  }
-
   /**
    * Method to fetch the current base fees.
    * @returns The current base fees.
@@ -692,21 +664,6 @@ export class TXENode implements AztecNode {
     throw new Error('TXE Node method getPrivateLogs not implemented');
   }
 
-  /**
-   * Find the block numbers of the given leaf indices in the given tree.
-   * @param blockNumber - The block number at which to get the data or 'latest' for latest data
-   * @param treeId - The tree to search in.
-   * @param leafIndices - The values to search for
-   * @returns The indexes of the given leaves in the given tree or undefined if not found.
-   */
-  findBlockNumbersForIndexes(
-    _blockNumber: L2BlockNumber,
-    _treeId: MerkleTreeId,
-    _leafIndices: bigint[],
-  ): Promise<(bigint | undefined)[]> {
-    throw new Error('TXE Node method findBlockNumbersForIndexes not implemented');
-  }
-
   /**
    * Returns the information about the server's node. Includes current Node version, compatible Noir version,
    * L1 chain identifier, protocol version, and L1 address of the rollup contract.

package/src/oracle/txe_oracle.ts

@@ -12,7 +12,7 @@ import {
 } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Aes128, Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr, Point } from '@aztec/foundation/fields';
 import { type Logger, applyStringFormatting } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { KeyStore } from '@aztec/key-store';
@@ -20,7 +20,6 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { ProtocolContract } from '@aztec/protocol-contracts';
 import {
   AddressDataProvider,
-  AuthWitnessDataProvider,
   CapsuleDataProvider,
   ContractDataProvider,
   NoteDataProvider,
@@ -46,6 +45,7 @@ import {
 import { createTxForPublicCalls } from '@aztec/simulator/public/fixtures';
 import {
   ExecutionError,
+  PublicContractsDB,
   type PublicTxResult,
   PublicTxSimulator,
   createSimulationError,
@@ -74,8 +74,13 @@ import {
 import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import { type KeyValidationRequest, PrivateContextInputs } from '@aztec/stdlib/kernel';
 import { deriveKeys } from '@aztec/stdlib/keys';
-import { ContractClassLog, LogWithTxData } from '@aztec/stdlib/logs';
-import { IndexedTaggingSecret, type PrivateLog, type PublicLog } from '@aztec/stdlib/logs';
+import {
+  ContractClassLog,
+  IndexedTaggingSecret,
+  LogWithTxData,
+  type PrivateLog,
+  type PublicLog,
+} from '@aztec/stdlib/logs';
 import type { NoteStatus } from '@aztec/stdlib/note';
 import type { CircuitWitnessGenerationStats } from '@aztec/stdlib/stats';
 import {
@@ -99,7 +104,7 @@ import { ForkCheckpoint, NativeWorldStateService } from '@aztec/world-state/nati
 import { TXENode } from '../node/txe_node.js';
 import { TXEAccountDataProvider } from '../util/txe_account_data_provider.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
-import { TXEWorldStateDB } from '../util/txe_world_state_db.js';
+import { TXEPublicTreesDB } from '../util/txe_public_dbs.js';
 
 export class TXE implements TypedOracle {
   private blockNumber = 1;
@@ -130,6 +135,8 @@ export class TXE implements TypedOracle {
 
   private noteCache: ExecutionNoteCache;
 
+  private authwits: Map<string, AuthWitness> = new Map();
+
   private constructor(
     private logger: Logger,
     private keyStore: KeyStore,
@@ -139,7 +146,6 @@ export class TXE implements TypedOracle {
     private syncDataProvider: SyncDataProvider,
     private taggingDataProvider: TaggingDataProvider,
     private addressDataProvider: AddressDataProvider,
-    private authWitnessDataProvider: AuthWitnessDataProvider,
     private accountDataProvider: TXEAccountDataProvider,
     private executionCache: HashedValuesCache,
     private contractAddress: AztecAddress,
@@ -162,7 +168,6 @@ export class TXE implements TypedOracle {
       this.syncDataProvider,
       this.taggingDataProvider,
       this.addressDataProvider,
-      this.authWitnessDataProvider,
       this.logger,
     );
   }
@@ -173,7 +178,6 @@ export class TXE implements TypedOracle {
     const baseFork = await nativeWorldStateService.fork();
 
     const addressDataProvider = new AddressDataProvider(store);
-    const authWitnessDataProvider = new AuthWitnessDataProvider(store);
     const contractDataProvider = new ContractDataProvider(store);
     const noteDataProvider = await NoteDataProvider.create(store);
     const syncDataProvider = new SyncDataProvider(store);
@@ -198,7 +202,6 @@ export class TXE implements TypedOracle {
       syncDataProvider,
       taggingDataProvider,
       addressDataProvider,
-      authWitnessDataProvider,
       accountDataProvider,
       executionCache,
       await AztecAddress.random(),
@@ -325,7 +328,7 @@ export class TXE implements TypedOracle {
     const schnorr = new Schnorr();
     const signature = await schnorr.constructSignature(messageHash.toBuffer(), privateKey);
     const authWitness = new AuthWitness(messageHash, [...signature.toBuffer()]);
-    return this.authWitnessDataProvider.addAuthWitness(authWitness.requestHash, authWitness.witness);
+    return this.authwits.set(authWitness.requestHash.toString(), authWitness);
   }
 
   async addPublicDataWrites(writes: PublicDataWrite[]) {
@@ -465,7 +468,7 @@ export class TXE implements TypedOracle {
     return new NullifierMembershipWitness(BigInt(index), leafPreimage as NullifierLeafPreimage, siblingPath);
   }
 
-  async getPublicDataTreeWitness(blockNumber: number, leafSlot: Fr): Promise<PublicDataWitness | undefined> {
+  async getPublicDataWitness(blockNumber: number, leafSlot: Fr): Promise<PublicDataWitness | undefined> {
     const snap = this.nativeWorldStateService.getSnapshot(blockNumber);
 
     const lowLeafResult = await snap.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
@@ -538,7 +541,8 @@ export class TXE implements TypedOracle {
   }
 
   getAuthWitness(messageHash: Fr) {
-    return this.pxeOracleInterface.getAuthWitness(messageHash);
+    const authwit = this.authwits.get(messageHash.toString());
+    return Promise.resolve(authwit?.witness);
   }
 
   async getNotes(
@@ -752,8 +756,7 @@ export class TXE implements TypedOracle {
     }
 
     await this.node.setTxEffect(blockNumber, new TxHash(new Fr(blockNumber)), txEffect);
-    this.node.setNullifiersIndexesWithBlock(blockNumber, txEffect.nullifiers);
-    this.node.addNoteLogsByTags(this.blockNumber, this.privateLogs);
+    this.node.addPrivateLogsByTags(this.blockNumber, this.privateLogs);
     this.node.addPublicLogsByTags(this.blockNumber, this.publicLogs);
 
     const stateReference = await fork.getStateReference();
@@ -823,12 +826,11 @@ export class TXE implements TypedOracle {
 
     const artifact = await this.contractDataProvider.getFunctionArtifact(targetContractAddress, functionSelector);
 
-    const acir = artifact.bytecode;
     const initialWitness = await this.getInitialWitness(artifact, argsHash, sideEffectCounter, isStaticCall);
     const acvmCallback = new Oracle(this);
     const timer = new Timer();
     const acirExecutionResult = await this.simulationProvider
-      .executeUserCircuit(acir, initialWitness, acvmCallback)
+      .executeUserCircuit(initialWitness, artifact, acvmCallback)
       .catch((err: Error) => {
         err.message = resolveAssertionMessageFromError(err, artifact);
 
@@ -935,12 +937,9 @@ export class TXE implements TypedOracle {
     // See note at revert below.
     const checkpoint = await ForkCheckpoint.new(db);
     try {
-      const simulator = new PublicTxSimulator(
-        db,
-        new TXEWorldStateDB(db, new TXEPublicContractDataSource(this), this),
-        globalVariables,
-        /*doMerkleOperations=*/ true,
-      );
+      const treesDB = new TXEPublicTreesDB(db, this);
+      const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(this));
+      const simulator = new PublicTxSimulator(treesDB, contractsDB, globalVariables, /*doMerkleOperations=*/ true);
 
       const { usedTxRequestHashForNonces } = this.noteCache.finish();
       const firstNullifier = usedTxRequestHashForNonces
@@ -1088,7 +1087,11 @@ export class TXE implements TypedOracle {
     );
 
     for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()) {
-      await this.pxeOracleInterface.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
+      await this.pxeOracleInterface.processTaggedLogs(
+        this.contractAddress,
+        taggedLogs,
+        AztecAddress.fromString(recipient),
+      );
     }
 
     await this.pxeOracleInterface.removeNullifiedNotes(this.contractAddress);
@@ -1096,17 +1099,26 @@ export class TXE implements TypedOracle {
     return Promise.resolve();
   }
 
-  deliverNote(
-    _contractAddress: AztecAddress,
-    _storageSlot: Fr,
-    _nonce: Fr,
-    _content: Fr[],
-    _noteHash: Fr,
-    _nullifier: Fr,
-    _txHash: Fr,
-    _recipient: AztecAddress,
+  public async deliverNote(
+    contractAddress: AztecAddress,
+    storageSlot: Fr,
+    nonce: Fr,
+    content: Fr[],
+    noteHash: Fr,
+    nullifier: Fr,
+    txHash: Fr,
+    recipient: AztecAddress,
   ): Promise<void> {
-    throw new Error('deliverNote');
+    await this.pxeOracleInterface.deliverNote(
+      contractAddress,
+      storageSlot,
+      nonce,
+      content,
+      noteHash,
+      nullifier,
+      txHash,
+      recipient,
+    );
   }
 
   async getLogByTag(tag: Fr): Promise<LogWithTxData | null> {
@@ -1240,4 +1252,8 @@ export class TXE implements TypedOracle {
     const aes128 = new Aes128();
     return aes128.decryptBufferCBC(ciphertext, iv, symKey);
   }
+
+  getSharedSecret(address: AztecAddress, ephPk: Point): Promise<Point> {
+    return this.pxeOracleInterface.getSharedSecret(address, ephPk);
+  }
 }