@aztec/pxe 0.56.0 → 0.58.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.56.0",
+  "version": "0.58.0",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -38,6 +38,9 @@
             "parser": {
               "syntax": "typescript",
               "decorators": true
+            },
+            "transform": {
+              "decoratorVersion": "2022-03"
             }
           }
         }
@@ -56,19 +59,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.56.0",
-    "@aztec/bb.js": "0.56.0",
-    "@aztec/builder": "0.56.0",
-    "@aztec/circuit-types": "0.56.0",
-    "@aztec/circuits.js": "0.56.0",
-    "@aztec/ethereum": "0.56.0",
-    "@aztec/foundation": "0.56.0",
-    "@aztec/key-store": "0.56.0",
-    "@aztec/kv-store": "0.56.0",
-    "@aztec/noir-protocol-circuits-types": "0.56.0",
-    "@aztec/protocol-contracts": "0.56.0",
-    "@aztec/simulator": "0.56.0",
-    "@aztec/types": "0.56.0",
+    "@aztec/bb-prover": "0.58.0",
+    "@aztec/bb.js": "0.58.0",
+    "@aztec/builder": "0.58.0",
+    "@aztec/circuit-types": "0.58.0",
+    "@aztec/circuits.js": "0.58.0",
+    "@aztec/ethereum": "0.58.0",
+    "@aztec/foundation": "0.58.0",
+    "@aztec/key-store": "0.58.0",
+    "@aztec/kv-store": "0.58.0",
+    "@aztec/noir-protocol-circuits-types": "0.58.0",
+    "@aztec/protocol-contracts": "0.58.0",
+    "@aztec/simulator": "0.58.0",
+    "@aztec/types": "0.58.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "workspace:*",

package/src/contract_data_oracle/index.ts

@@ -1,4 +1,4 @@
-import { type AztecAddress } from '@aztec/circuits.js';
+import { type AztecAddress, type ContractClass, type ContractInstance } from '@aztec/circuits.js';
 import {
   type ContractArtifact,
   type FunctionArtifact,
@@ -8,7 +8,6 @@ import {
 } from '@aztec/foundation/abi';
 import { type Fr } from '@aztec/foundation/fields';
 import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
-import { type ContractClass, type ContractInstance } from '@aztec/types/contracts';
 
 import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
 import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';

package/src/contract_data_oracle/private_functions_tree.ts

@@ -1,4 +1,5 @@
 import {
+  type ContractClassWithId,
   FUNCTION_TREE_HEIGHT,
   MembershipWitness,
   computePrivateFunctionLeaf,
@@ -9,7 +10,6 @@ import { type MerkleTree } from '@aztec/circuits.js/merkle';
 import { type ContractArtifact, type FunctionSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { assertLength } from '@aztec/foundation/serialize';
-import { type ContractClassWithId } from '@aztec/types/contracts';
 
 /**
  * Represents a Merkle tree of functions for a particular Contract Class.

package/src/database/contracts/contract_instance_db.ts

@@ -1,5 +1,4 @@
-import { type AztecAddress } from '@aztec/circuits.js';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
 
 /**
  * PXE database for managing contract instances.

package/src/database/deferred_note_dao.ts

@@ -1,4 +1,4 @@
-import { Note, TxHash } from '@aztec/circuit-types';
+import { Note, TxHash, UnencryptedTxL2Logs } from '@aztec/circuit-types';
 import { AztecAddress, Fr, Point, type PublicKey, Vector } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -26,6 +26,8 @@ export class DeferredNoteDao {
     public noteHashes: Fr[],
     /** The next available leaf index for the note hash tree for this transaction */
     public dataStartIndexForTx: number,
+    /** Unencrypted logs for the transaction (used to complete partial notes) */
+    public unencryptedLogs: UnencryptedTxL2Logs,
   ) {}
 
   toBuffer(): Buffer {
@@ -38,6 +40,7 @@ export class DeferredNoteDao {
       this.txHash,
       new Vector(this.noteHashes),
       this.dataStartIndexForTx,
+      this.unencryptedLogs,
     );
   }
   static fromBuffer(buffer: Buffer | BufferReader) {
@@ -51,6 +54,7 @@ export class DeferredNoteDao {
       reader.readObject(TxHash),
       reader.readVector(Fr),
       reader.readNumber(),
+      reader.readObject(UnencryptedTxL2Logs),
     );
   }
 }

package/src/database/incoming_note_dao.ts

@@ -1,10 +1,12 @@
-import { Note, TxHash } from '@aztec/circuit-types';
+import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type NoteData } from '@aztec/simulator';
 
+import { type NoteInfo } from '../note_processor/utils/index.js';
+
 /**
  * A note with contextual data which was decrypted as incoming.
  */
@@ -38,6 +40,27 @@ export class IncomingNoteDao implements NoteData {
     public ivpkM: PublicKey,
   ) {}
 
+  static fromPayloadAndNoteInfo(
+    payload: L1NotePayload,
+    noteInfo: NoteInfo,
+    dataStartIndexForTx: number,
+    ivpkM: PublicKey,
+  ) {
+    const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
+    return new IncomingNoteDao(
+      payload.note,
+      payload.contractAddress,
+      payload.storageSlot,
+      payload.noteTypeId,
+      noteInfo.txHash,
+      noteInfo.nonce,
+      noteInfo.noteHash,
+      noteInfo.siloedNullifier,
+      noteHashIndexInTheWholeTree,
+      ivpkM,
+    );
+  }
+
   toBuffer(): Buffer {
     return serializeToBuffer([
       this.note,

package/src/database/kv_pxe_database.ts

@@ -5,7 +5,13 @@ import {
   type OutgoingNotesFilter,
   type PublicKey,
 } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js';
+import {
+  AztecAddress,
+  CompleteAddress,
+  type ContractInstanceWithAddress,
+  Header,
+  SerializableContractInstance,
+} from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr, type Point } from '@aztec/foundation/fields';
@@ -18,7 +24,6 @@ import {
   type AztecSingleton,
 } from '@aztec/kv-store';
 import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
-import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
 
 import { DeferredNoteDao } from './deferred_note_dao.js';
 import { IncomingNoteDao } from './incoming_note_dao.js';
@@ -495,7 +500,9 @@ export class KVPxeDatabase implements PxeDatabase {
     return true;
   }
 
-  addCompleteAddress(completeAddress: CompleteAddress): Promise<boolean> {
+  async addCompleteAddress(completeAddress: CompleteAddress): Promise<boolean> {
+    await this.#addScope(completeAddress.address);
+
     return this.#db.transaction(() => {
       const addressString = completeAddress.address.toString();
       const buffer = completeAddress.toBuffer();

package/src/database/outgoing_note_dao.ts

@@ -1,9 +1,11 @@
-import { Note, TxHash } from '@aztec/circuit-types';
+import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { type NoteInfo } from '../note_processor/utils/index.js';
+
 /**
  * A note with contextual data which was decrypted as outgoing.
  */
@@ -32,6 +34,26 @@ export class OutgoingNoteDao {
     public ovpkM: PublicKey,
   ) {}
 
+  static fromPayloadAndNoteInfo(
+    payload: L1NotePayload,
+    noteInfo: NoteInfo,
+    dataStartIndexForTx: number,
+    ivpkM: PublicKey,
+  ) {
+    const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
+    return new OutgoingNoteDao(
+      payload.note,
+      payload.contractAddress,
+      payload.storageSlot,
+      payload.noteTypeId,
+      noteInfo.txHash,
+      noteInfo.nonce,
+      noteInfo.noteHash,
+      noteHashIndexInTheWholeTree,
+      ivpkM,
+    );
+  }
+
   toBuffer(): Buffer {
     return serializeToBuffer([
       this.note,

package/src/database/pxe_database.ts

@@ -1,9 +1,13 @@
 import { type IncomingNotesFilter, type OutgoingNotesFilter } from '@aztec/circuit-types';
-import { type CompleteAddress, type Header, type PublicKey } from '@aztec/circuits.js';
+import {
+  type CompleteAddress,
+  type ContractInstanceWithAddress,
+  type Header,
+  type PublicKey,
+} from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 import { type ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
 import { type ContractInstanceDatabase } from './contracts/contract_instance_db.js';

package/src/database/pxe_database_test_suite.ts

@@ -1,10 +1,15 @@
 import { type IncomingNotesFilter, NoteStatus, type OutgoingNotesFilter, randomTxHash } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, INITIAL_L2_BLOCK_NUM, PublicKeys } from '@aztec/circuits.js';
+import {
+  AztecAddress,
+  CompleteAddress,
+  INITIAL_L2_BLOCK_NUM,
+  PublicKeys,
+  SerializableContractInstance,
+} from '@aztec/circuits.js';
 import { makeHeader } from '@aztec/circuits.js/testing';
 import { randomInt } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { BenchmarkingContractArtifact } from '@aztec/noir-contracts.js/Benchmarking';
-import { SerializableContractInstance } from '@aztec/types/contracts';
 
 import { type IncomingNoteDao } from './incoming_note_dao.js';
 import { randomIncomingNoteDao } from './incoming_note_dao.test.js';

package/src/kernel_oracle/index.ts

@@ -1,4 +1,4 @@
-import { type AztecNode } from '@aztec/circuit-types';
+import { type AztecNode, type L2BlockNumber } from '@aztec/circuit-types';
 import {
   type AztecAddress,
   type Fr,
@@ -30,6 +30,7 @@ export class KernelOracle implements ProvingDataOracle {
     private contractDataOracle: ContractDataOracle,
     private keyStore: KeyStore,
     private node: AztecNode,
+    private blockNumber: L2BlockNumber = 'latest',
     private log = createDebugLogger('aztec:pxe:kernel_oracle'),
   ) {}
 
@@ -56,7 +57,7 @@ export class KernelOracle implements ProvingDataOracle {
   }
 
   async getNoteHashMembershipWitness(leafIndex: bigint): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>> {
-    const path = await this.node.getNoteHashSiblingPath('latest', leafIndex);
+    const path = await this.node.getNoteHashSiblingPath(this.blockNumber, leafIndex);
     return new MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>(
       path.pathSize,
       leafIndex,
@@ -65,11 +66,11 @@ export class KernelOracle implements ProvingDataOracle {
   }
 
   getNullifierMembershipWitness(nullifier: Fr) {
-    return this.node.getNullifierMembershipWitness('latest', nullifier);
+    return this.node.getNullifierMembershipWitness(this.blockNumber, nullifier);
   }
 
   async getNoteHashTreeRoot(): Promise<Fr> {
-    const header = await this.node.getHeader();
+    const header = await this.node.getHeader(this.blockNumber);
     return header.state.partial.noteHashTree.root;
   }