@aztec/txe 0.81.0 → 0.82.1-alpha-testnet.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.81.0",
+  "version": "0.82.1-alpha-testnet.1",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -59,17 +59,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.81.0",
-    "@aztec/aztec.js": "0.81.0",
-    "@aztec/constants": "0.81.0",
-    "@aztec/foundation": "0.81.0",
-    "@aztec/key-store": "0.81.0",
-    "@aztec/kv-store": "0.81.0",
-    "@aztec/protocol-contracts": "0.81.0",
-    "@aztec/pxe": "0.81.0",
-    "@aztec/simulator": "0.81.0",
-    "@aztec/stdlib": "0.81.0",
-    "@aztec/world-state": "0.81.0",
+    "@aztec/accounts": "0.82.1-alpha-testnet.1",
+    "@aztec/aztec.js": "0.82.1-alpha-testnet.1",
+    "@aztec/constants": "0.82.1-alpha-testnet.1",
+    "@aztec/foundation": "0.82.1-alpha-testnet.1",
+    "@aztec/key-store": "0.82.1-alpha-testnet.1",
+    "@aztec/kv-store": "0.82.1-alpha-testnet.1",
+    "@aztec/protocol-contracts": "0.82.1-alpha-testnet.1",
+    "@aztec/pxe": "0.82.1-alpha-testnet.1",
+    "@aztec/simulator": "0.82.1-alpha-testnet.1",
+    "@aztec/stdlib": "0.82.1-alpha-testnet.1",
+    "@aztec/world-state": "0.82.1-alpha-testnet.1",
     "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: '127.0.0.1',
     port: TXE_PORT,
     timeoutMs: 1e3 * 60 * 5,
   });

package/src/node/txe_node.ts

@@ -57,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');
@@ -125,56 +124,10 @@ 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 private logs to the txe node, given a block
    * @param blockNumber - The block number at which to add the private logs.
@@ -235,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.
@@ -252,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,
+      };
+    });
   }
 
   /**
@@ -384,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');
   }
 
   /**
@@ -642,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.
@@ -669,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

@@ -8,7 +8,6 @@ import {
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   PRIVATE_CONTEXT_INPUTS_LENGTH,
   type PUBLIC_DATA_TREE_HEIGHT,
-  PUBLIC_DISPATCH_SELECTOR,
 } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Aes128, Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
@@ -20,7 +19,6 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { ProtocolContract } from '@aztec/protocol-contracts';
 import {
   AddressDataProvider,
-  AuthWitnessDataProvider,
   CapsuleDataProvider,
   ContractDataProvider,
   NoteDataProvider,
@@ -73,7 +71,7 @@ import {
   siloNullifier,
 } from '@aztec/stdlib/hash';
 import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import { type KeyValidationRequest, PrivateContextInputs } from '@aztec/stdlib/kernel';
+import { type KeyValidationRequest, PrivateContextInputs, PublicCallRequest } from '@aztec/stdlib/kernel';
 import { deriveKeys } from '@aztec/stdlib/keys';
 import {
   ContractClassLog,
@@ -99,7 +97,14 @@ import {
   type PublicDataTreeLeafPreimage,
   PublicDataWitness,
 } from '@aztec/stdlib/trees';
-import { BlockHeader, CallContext, GlobalVariables, PublicExecutionRequest, TxEffect, TxHash } from '@aztec/stdlib/tx';
+import {
+  BlockHeader,
+  CallContext,
+  GlobalVariables,
+  PublicCallRequestWithCalldata,
+  TxEffect,
+  TxHash,
+} from '@aztec/stdlib/tx';
 import { ForkCheckpoint, NativeWorldStateService } from '@aztec/world-state/native';
 
 import { TXENode } from '../node/txe_node.js';
@@ -136,6 +141,8 @@ export class TXE implements TypedOracle {
 
   private noteCache: ExecutionNoteCache;
 
+  private authwits: Map<string, AuthWitness> = new Map();
+
   private constructor(
     private logger: Logger,
     private keyStore: KeyStore,
@@ -145,7 +152,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,
@@ -168,7 +174,6 @@ export class TXE implements TypedOracle {
       this.syncDataProvider,
       this.taggingDataProvider,
       this.addressDataProvider,
-      this.authWitnessDataProvider,
       this.logger,
     );
   }
@@ -179,7 +184,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);
@@ -204,7 +208,6 @@ export class TXE implements TypedOracle {
       syncDataProvider,
       taggingDataProvider,
       addressDataProvider,
-      authWitnessDataProvider,
       accountDataProvider,
       executionCache,
       await AztecAddress.random(),
@@ -331,7 +334,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[]) {
@@ -407,12 +410,16 @@ export class TXE implements TypedOracle {
     return Fr.random();
   }
 
-  storeInExecutionCache(values: Fr[]) {
-    return this.executionCache.store(values);
+  storeInExecutionCache(values: Fr[], hash: Fr) {
+    return this.executionCache.store(values, hash);
   }
 
-  loadFromExecutionCache(returnsHash: Fr) {
-    return Promise.resolve(this.executionCache.getPreimage(returnsHash));
+  loadFromExecutionCache(hash: Fr) {
+    const preimage = this.executionCache.getPreimage(hash);
+    if (!preimage) {
+      throw new Error(`Preimage for hash ${hash.toString()} not found in cache`);
+    }
+    return Promise.resolve(preimage);
   }
 
   getKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest> {
@@ -471,7 +478,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());
@@ -544,7 +551,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(
@@ -758,7 +766,6 @@ export class TXE implements TypedOracle {
     }
 
     await this.node.setTxEffect(blockNumber, new TxHash(new Fr(blockNumber)), txEffect);
-    this.node.setNullifiersIndexesWithBlock(blockNumber, txEffect.nullifiers);
     this.node.addPrivateLogsByTags(this.blockNumber, this.privateLogs);
     this.node.addPublicLogsByTags(this.blockNumber, this.publicLogs);
 
@@ -828,13 +835,15 @@ export class TXE implements TypedOracle {
     this.setFunctionSelector(functionSelector);
 
     const artifact = await this.contractDataProvider.getFunctionArtifact(targetContractAddress, functionSelector);
+    if (!artifact) {
+      throw new Error(`Artifact not found when calling private function. Contract address: ${targetContractAddress}.`);
+    }
 
-    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);
 
@@ -884,7 +893,7 @@ export class TXE implements TypedOracle {
 
     const args = this.executionCache.getPreimage(argsHash);
 
-    if (args.length !== argumentsSize) {
+    if (args?.length !== argumentsSize) {
       throw new Error('Invalid arguments size');
     }
 
@@ -903,30 +912,18 @@ export class TXE implements TypedOracle {
   }
 
   public async getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
-    const instance = await this.contractDataProvider.getContractInstance(address);
-    if (!instance) {
-      return undefined;
-    }
-    const artifact = await this.contractDataProvider.getContractArtifact(instance!.currentContractClassId);
-    if (!artifact) {
-      return undefined;
-    }
-    const functionSelectorsAndNames = await Promise.all(
-      artifact.functions.map(async f => ({
-        name: f.name,
-        selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-      })),
-    );
-    const functionSelectorAndName = functionSelectorsAndNames.find(f => f.selector.equals(selector));
-    if (!functionSelectorAndName) {
-      return undefined;
-    }
-
-    return `${artifact.name}:${functionSelectorAndName.name}`;
+    return await this.contractDataProvider.getDebugFunctionName(address, selector);
   }
 
-  private async executePublicFunction(args: Fr[], callContext: CallContext, isTeardown: boolean = false) {
-    const executionRequest = new PublicExecutionRequest(callContext, args);
+  private async executePublicFunction(
+    calldata: Fr[],
+    msgSender: AztecAddress,
+    contractAddress: AztecAddress,
+    isStaticCall: boolean,
+    isTeardown: boolean = false,
+  ) {
+    const callRequest = await PublicCallRequest.fromCalldata(msgSender, contractAddress, isStaticCall, calldata);
+    const executionRequest = new PublicCallRequestWithCalldata(callRequest, calldata);
 
     const db = this.baseFork;
 
@@ -953,7 +950,7 @@ export class TXE implements TypedOracle {
       // When setting up a teardown call, we tell it that
       // private execution used Gas(1, 1) so it can compute a tx fee.
       const gasUsedByPrivate = isTeardown ? new Gas(1, 1) : Gas.empty();
-      const tx = await createTxForPublicCalls(
+      const tx = createTxForPublicCalls(
         firstNullifier,
         /*setupExecutionRequests=*/ [],
         /*appExecutionRequests=*/ isTeardown ? [] : [executionRequest],
@@ -993,34 +990,34 @@ export class TXE implements TypedOracle {
     return Promise.resolve(result);
   }
 
-  async enqueuePublicFunctionCall(
+  async notifyEnqueuedPublicFunctionCall(
     targetContractAddress: AztecAddress,
-    functionSelector: FunctionSelector,
-    argsHash: Fr,
+    calldataHash: Fr,
     _sideEffectCounter: number,
     isStaticCall: boolean,
     isTeardown = false,
-  ): Promise<Fr> {
+  ): Promise<void> {
     // Store and modify env
     const currentContractAddress = this.contractAddress;
     const currentMessageSender = this.msgSender;
     const currentFunctionSelector = FunctionSelector.fromField(this.functionSelector.toField());
+    const calldata = this.executionCache.getPreimage(calldataHash);
+    if (!calldata) {
+      throw new Error('Calldata for enqueued call not found in cache');
+    }
+    const functionSelector = FunctionSelector.fromField(calldata[0]);
     this.setMsgSender(this.contractAddress);
     this.setContractAddress(targetContractAddress);
     this.setFunctionSelector(functionSelector);
 
-    const callContext = new CallContext(
+    const executionResult = await this.executePublicFunction(
+      calldata,
       /* msgSender */ currentContractAddress,
       targetContractAddress,
-      FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
       isStaticCall,
+      isTeardown,
     );
 
-    const args = [this.functionSelector.toField(), ...this.executionCache.getPreimage(argsHash)];
-    const newArgsHash = await this.executionCache.store(args);
-
-    const executionResult = await this.executePublicFunction(args, callContext, isTeardown);
-
     // Poor man's revert handling
     if (!executionResult.revertCode.isOK()) {
       if (executionResult.revertReason && executionResult.revertReason instanceof SimulationError) {
@@ -1044,23 +1041,19 @@ export class TXE implements TypedOracle {
     this.setContractAddress(currentContractAddress);
     this.setMsgSender(currentMessageSender);
     this.setFunctionSelector(currentFunctionSelector);
-
-    return newArgsHash;
   }
 
-  async setPublicTeardownFunctionCall(
+  async notifySetPublicTeardownFunctionCall(
     targetContractAddress: AztecAddress,
-    functionSelector: FunctionSelector,
-    argsHash: Fr,
+    calldataHash: Fr,
     sideEffectCounter: number,
     isStaticCall: boolean,
-  ): Promise<Fr> {
+  ): Promise<void> {
     // Definitely not right, in that the teardown should always be last.
     // But useful for executing flows.
-    return await this.enqueuePublicFunctionCall(
+    await this.notifyEnqueuedPublicFunctionCall(
       targetContractAddress,
-      functionSelector,
-      argsHash,
+      calldataHash,
       sideEffectCounter,
       isStaticCall,
       /*isTeardown=*/ true,
@@ -1131,21 +1124,23 @@ export class TXE implements TypedOracle {
 
   // AVM oracles
 
-  async avmOpcodeCall(targetContractAddress: AztecAddress, args: Fr[], isStaticCall: boolean): Promise<PublicTxResult> {
+  async avmOpcodeCall(
+    targetContractAddress: AztecAddress,
+    calldata: Fr[],
+    isStaticCall: boolean,
+  ): Promise<PublicTxResult> {
     // Store and modify env
     const currentContractAddress = this.contractAddress;
     const currentMessageSender = this.msgSender;
     this.setMsgSender(this.contractAddress);
     this.setContractAddress(targetContractAddress);
 
-    const callContext = new CallContext(
+    const executionResult = await this.executePublicFunction(
+      calldata,
       /* msgSender */ currentContractAddress,
       targetContractAddress,
-      FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
       isStaticCall,
     );
-
-    const executionResult = await this.executePublicFunction(args, callContext);
     // Save return/revert data for later.
     this.nestedCallReturndata = executionResult.processedPhases[0]!.returnValues[0].values!;
     this.nestedCallSuccess = executionResult.revertCode.isOK();