@aztec/pxe 0.76.4 → 0.77.0-testnet-ignition.17

package/src/database/kv_pxe_database.ts

@@ -1,30 +1,31 @@
-import { type InBlock, MerkleTreeId, NoteStatus, type NotesFilter } from '@aztec/circuit-types';
-import {
-  AztecAddress,
-  BlockHeader,
-  CompleteAddress,
-  type ContractInstanceWithAddress,
-  type IndexedTaggingSecret,
-  type PublicKey,
-  SerializableContractInstance,
-} from '@aztec/circuits.js';
-import { type ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr, type Point } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { type LogFn, createDebugOnlyLogger } from '@aztec/foundation/log';
-import {
-  type AztecAsyncArray,
-  type AztecAsyncKVStore,
-  type AztecAsyncMap,
-  type AztecAsyncMultiMap,
-  type AztecAsyncSet,
-  type AztecAsyncSingleton,
+import type {
+  AztecAsyncArray,
+  AztecAsyncKVStore,
+  AztecAsyncMap,
+  AztecAsyncMultiMap,
+  AztecAsyncSingleton,
 } from '@aztec/kv-store';
-import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
+import { type ContractArtifact, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { InBlock } from '@aztec/stdlib/block';
+import {
+  CompleteAddress,
+  type ContractInstanceWithAddress,
+  SerializableContractInstance,
+} from '@aztec/stdlib/contract';
+import type { PublicKey } from '@aztec/stdlib/keys';
+import type { IndexedTaggingSecret } from '@aztec/stdlib/logs';
+import { NoteStatus, type NotesFilter } from '@aztec/stdlib/note';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { BlockHeader } from '@aztec/stdlib/tx';
 
 import { NoteDao } from './note_dao.js';
-import { type PxeDatabase } from './pxe_database.js';
+import type { PxeDatabase } from './pxe_database.js';
 
 /**
  * A PXE database backed by LMDB.
@@ -33,7 +34,7 @@ export class KVPxeDatabase implements PxeDatabase {
   #synchronizedBlock: AztecAsyncSingleton<Buffer>;
   #completeAddresses: AztecAsyncArray<Buffer>;
   #completeAddressIndex: AztecAsyncMap<string, number>;
-  #addressBook: AztecAsyncSet<string>;
+  #addressBook: AztecAsyncMap<string, true>;
   #authWitnesses: AztecAsyncMap<string, Buffer[]>;
   #notes: AztecAsyncMap<string, Buffer>;
   #nullifiedNotes: AztecAsyncMap<string, Buffer>;
@@ -50,7 +51,7 @@ export class KVPxeDatabase implements PxeDatabase {
   #contractInstances: AztecAsyncMap<string, Buffer>;
   #db: AztecAsyncKVStore;
 
-  #scopes: AztecAsyncSet<string>;
+  #scopes: AztecAsyncMap<string, true>;
   #notesToScope: AztecAsyncMultiMap<string, string>;
   #notesByContractAndScope: Map<string, AztecAsyncMultiMap<string, string>>;
   #notesByStorageSlotAndScope: Map<string, AztecAsyncMultiMap<string, string>>;
@@ -74,7 +75,7 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#completeAddresses = db.openArray('complete_addresses');
     this.#completeAddressIndex = db.openMap('complete_address_index');
 
-    this.#addressBook = db.openSet('address_book');
+    this.#addressBook = db.openMap('address_book');
 
     this.#authWitnesses = db.openMap('auth_witnesses');
 
@@ -95,7 +96,7 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#nullifiedNotesByAddressPoint = db.openMultiMap('nullified_notes_by_address_point');
     this.#nullifiedNotesByNullifier = db.openMap('nullified_notes_by_nullifier');
 
-    this.#scopes = db.openSet('scopes');
+    this.#scopes = db.openMap('scopes');
     this.#notesToScope = db.openMultiMap('notes_to_scope');
     this.#notesByContractAndScope = new Map<string, AztecAsyncMultiMap<string, string>>();
     this.#notesByStorageSlotAndScope = new Map<string, AztecAsyncMultiMap<string, string>>();
@@ -112,7 +113,7 @@ export class KVPxeDatabase implements PxeDatabase {
 
   public static async create(db: AztecAsyncKVStore): Promise<KVPxeDatabase> {
     const pxeDB = new KVPxeDatabase(db);
-    for await (const scope of pxeDB.#scopes.entriesAsync()) {
+    for await (const scope of pxeDB.#scopes.keysAsync()) {
       pxeDB.#notesByContractAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_contract`));
       pxeDB.#notesByStorageSlotAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_storage_slot`));
       pxeDB.#notesByTxHashAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
@@ -125,7 +126,7 @@ export class KVPxeDatabase implements PxeDatabase {
     address: AztecAddress,
   ): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined> {
     const instance = await this.getContractInstance(address);
-    const artifact = instance && (await this.getContractArtifact(instance?.contractClassId));
+    const artifact = instance && (await this.getContractArtifact(instance?.currentContractClassId));
     if (!instance || !artifact) {
       return undefined;
     }
@@ -225,7 +226,7 @@ export class KVPxeDatabase implements PxeDatabase {
           await this.#notes.delete(noteIndex);
           await this.#notesToScope.delete(noteIndex);
           await this.#nullifierToNoteId.delete(noteDao.siloedNullifier.toString());
-          const scopes = await toArray(this.#scopes.entriesAsync());
+          const scopes = await toArray(this.#scopes.keysAsync());
           for (const scope of scopes) {
             await this.#notesByAddressPointAndScope.get(scope)!.deleteValue(noteDao.addressPoint.toString(), noteIndex);
             await this.#notesByTxHashAndScope.get(scope)!.deleteValue(noteDao.txHash.toString(), noteIndex);
@@ -295,7 +296,7 @@ export class KVPxeDatabase implements PxeDatabase {
 
     const candidateNoteSources = [];
 
-    filter.scopes ??= (await toArray(this.#scopes.entriesAsync())).map(addressString =>
+    filter.scopes ??= (await toArray(this.#scopes.keysAsync())).map(addressString =>
       AztecAddress.fromString(addressString),
     );
 
@@ -419,7 +420,7 @@ export class KVPxeDatabase implements PxeDatabase {
         await this.#notes.delete(noteIndex);
         await this.#notesToScope.delete(noteIndex);
 
-        const scopes = await toArray(this.#scopes.entriesAsync());
+        const scopes = await toArray(this.#scopes.keysAsync());
 
         for (const scope of scopes) {
           await this.#notesByAddressPointAndScope.get(scope)!.deleteValue(accountAddressPoint.toString(), noteIndex);
@@ -486,7 +487,7 @@ export class KVPxeDatabase implements PxeDatabase {
       return false;
     }
 
-    await this.#scopes.add(scopeString);
+    await this.#scopes.set(scopeString, true);
     this.#notesByContractAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_contract`));
     this.#notesByStorageSlotAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_storage_slot`));
     this.#notesByTxHashAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_tx_hash`));
@@ -547,13 +548,13 @@ export class KVPxeDatabase implements PxeDatabase {
       return false;
     }
 
-    await this.#addressBook.add(address.toString());
+    await this.#addressBook.set(address.toString(), true);
 
     return true;
   }
 
   async getSenderAddresses(): Promise<AztecAddress[]> {
-    return (await toArray(this.#addressBook.entriesAsync())).map(AztecAddress.fromString);
+    return (await toArray(this.#addressBook.keysAsync())).map(AztecAddress.fromString);
   }
 
   async removeSenderAddress(address: AztecAddress): Promise<boolean> {

package/src/database/note_dao.ts

@@ -1,9 +1,12 @@
-import { Note, TxHash, randomTxHash } 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 { Fr, Point } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { type NoteData } from '@aztec/simulator/client';
+import type { NoteData } from '@aztec/simulator/client';
+import { NoteSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PublicKey } from '@aztec/stdlib/keys';
+import { Note } from '@aztec/stdlib/note';
+import { TxHash } from '@aztec/stdlib/tx';
 
 /**
  * A Note Data Access Object, representing a note that was committed to the note hash tree, holding all of the
@@ -27,7 +30,7 @@ export class NoteDao implements NoteData {
 
     // Computed values
     /**
-     * The inner hash (non-unique, non-siloed) of the note. Each contract determines how the note content is hashed. Can
+     * The inner hash (non-unique, non-siloed) of the note. Each contract determines how the note is hashed. Can
      * be used alongside contractAddress and nonce to compute the uniqueNoteHash and the siloedNoteHash.
      */
     public noteHash: Fr,
@@ -50,11 +53,11 @@ export class NoteDao implements NoteData {
     public l2BlockHash: string,
     /** The index of the leaf in the global note hash tree the note is stored at */
     public index: bigint,
-    /** The public key with which the note content was encrypted during delivery. */
+    /** The public key with which the note log was encrypted during delivery. */
     public addressPoint: PublicKey,
 
     /** The note type identifier for the contract.
-     * TODO: remove
+     * TODO(#12013): remove
      */
     public noteTypeId: NoteSelector,
   ) {}
@@ -134,7 +137,7 @@ export class NoteDao implements NoteData {
     nonce = Fr.random(),
     noteHash = Fr.random(),
     siloedNullifier = Fr.random(),
-    txHash = randomTxHash(),
+    txHash = TxHash.random(),
     l2BlockNumber = Math.floor(Math.random() * 1000),
     l2BlockHash = Fr.random().toString(),
     index = Fr.random().toBigInt(),

package/src/database/outgoing_note_dao.ts

@@ -1,8 +1,11 @@
-import { Note, TxHash, randomTxHash } 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 { Fr, Point } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { NoteSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PublicKey } from '@aztec/stdlib/keys';
+import { Note } from '@aztec/stdlib/note';
+import { TxHash } from '@aztec/stdlib/tx';
 
 /**
  * A note with contextual data which was decrypted as outgoing.
@@ -102,7 +105,7 @@ export class OutgoingNoteDao {
   static async random({
     note = Note.random(),
     contractAddress = undefined,
-    txHash = randomTxHash(),
+    txHash = TxHash.random(),
     storageSlot = Fr.random(),
     noteTypeId = NoteSelector.random(),
     nonce = Fr.random(),

package/src/database/pxe_database.ts

@@ -1,18 +1,16 @@
-import { type InBlock, type NotesFilter } from '@aztec/circuit-types';
-import {
-  type BlockHeader,
-  type CompleteAddress,
-  type ContractInstanceWithAddress,
-  type IndexedTaggingSecret,
-  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 ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
-import { type ContractInstanceDatabase } from './contracts/contract_instance_db.js';
-import { type NoteDao } from './note_dao.js';
+import type { Fr } from '@aztec/foundation/fields';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { InBlock } from '@aztec/stdlib/block';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { PublicKey } from '@aztec/stdlib/keys';
+import type { IndexedTaggingSecret } from '@aztec/stdlib/logs';
+import type { NotesFilter } from '@aztec/stdlib/note';
+import type { BlockHeader } from '@aztec/stdlib/tx';
+
+import type { ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
+import type { ContractInstanceDatabase } from './contracts/contract_instance_db.js';
+import type { NoteDao } from './note_dao.js';
 
 /**
  * A database interface that provides methods for retrieving, adding, and removing transactional data related to Aztec

package/src/database/pxe_database_test_suite.ts

@@ -1,23 +1,20 @@
-import { NoteStatus, type NotesFilter, randomTxHash } from '@aztec/circuit-types';
-import {
-  AztecAddress,
-  CompleteAddress,
-  INITIAL_L2_BLOCK_NUM,
-  PublicKeys,
-  SerializableContractInstance,
-} from '@aztec/circuits.js';
-import { makeHeader } from '@aztec/circuits.js/testing';
-import { FunctionType } from '@aztec/foundation/abi';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { timesParallel } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { BenchmarkingContractArtifact } from '@aztec/noir-contracts.js/Benchmarking';
 import { TestContractArtifact } from '@aztec/noir-contracts.js/Test';
+import { FunctionType } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { CompleteAddress, SerializableContractInstance } from '@aztec/stdlib/contract';
+import { PublicKeys } from '@aztec/stdlib/keys';
+import { NoteStatus, type NotesFilter } from '@aztec/stdlib/note';
+import { makeHeader, randomTxHash } from '@aztec/stdlib/testing';
 
 import times from 'lodash.times';
 
 import { NoteDao } from './note_dao.js';
-import { type PxeDatabase } from './pxe_database.js';
+import type { PxeDatabase } from './pxe_database.js';
 
 /**
  * A common test suite for a PXE database.

package/src/index.ts

@@ -1,15 +1,9 @@
 export * from './pxe_service/index.js';
+export { pxeTestSuite } from './pxe_service/test/pxe_test_suite.js';
 export * from './pxe_http/index.js';
 export * from './config/index.js';
 export * from './utils/create_pxe_service.js';
 
-export { Tx, TxHash } from '@aztec/circuit-types';
-
-export { TxRequest } from '@aztec/circuits.js';
-export * from '@aztec/foundation/fields';
-export * from '@aztec/foundation/eth-address';
-export * from '@aztec/foundation/aztec-address';
-export * from '@aztec/key-store';
 export * from './database/index.js';
 export { ContractDataOracle } from './contract_data_oracle/index.js';
 export { PrivateFunctionsTree } from './contract_data_oracle/private_functions_tree.js';

package/src/kernel_oracle/index.ts

@@ -1,24 +1,24 @@
-import { type AztecNode, type L2BlockNumber } from '@aztec/circuit-types';
-import {
-  type AztecAddress,
-  type Fr,
-  type FunctionSelector,
-  type GrumpkinScalar,
-  MembershipWitness,
-  type NOTE_HASH_TREE_HEIGHT,
-  type Point,
-  VK_TREE_HEIGHT,
-  type VerificationKeyAsFields,
-  computeContractClassIdPreimage,
-  computeSaltedInitializationHash,
-} from '@aztec/circuits.js';
+import { type NOTE_HASH_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, VK_TREE_HEIGHT } from '@aztec/constants';
+import type { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { type Tuple } from '@aztec/foundation/serialize';
-import { type KeyStore } from '@aztec/key-store';
-import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks';
+import type { Tuple } from '@aztec/foundation/serialize';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import type { KeyStore } from '@aztec/key-store';
+import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2BlockNumber } from '@aztec/stdlib/block';
+import { computeContractClassIdPreimage, computeSaltedInitializationHash } from '@aztec/stdlib/contract';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import { UpdatedClassIdHints } from '@aztec/stdlib/kernel';
+import { SharedMutableValues, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable';
+import type { NullifierMembershipWitness } from '@aztec/stdlib/trees';
+import type { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
-import { type ContractDataOracle } from '../contract_data_oracle/index.js';
-import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
+import type { ContractDataOracle } from '../contract_data_oracle/index.js';
+import type { ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
 
 // TODO: Block number should not be "latest".
 // It should be fixed at the time the proof is being simulated. I.e., it should be the same as the value defined in the constant data.
@@ -47,8 +47,8 @@ export class KernelOracle implements ProvingDataOracle {
     return computeContractClassIdPreimage(contractClass);
   }
 
-  public async getFunctionMembershipWitness(contractAddress: AztecAddress, selector: FunctionSelector) {
-    return await this.contractDataOracle.getFunctionMembershipWitness(contractAddress, selector);
+  public async getFunctionMembershipWitness(contractClassId: Fr, selector: FunctionSelector) {
+    return await this.contractDataOracle.getFunctionMembershipWitness(contractClassId, selector);
   }
 
   public getVkMembershipWitness(vk: VerificationKeyAsFields) {
@@ -65,12 +65,15 @@ export class KernelOracle implements ProvingDataOracle {
     );
   }
 
-  getNullifierMembershipWitness(nullifier: Fr) {
+  getNullifierMembershipWitness(nullifier: Fr): Promise<NullifierMembershipWitness | undefined> {
     return this.node.getNullifierMembershipWitness(this.blockNumber, nullifier);
   }
 
   async getNoteHashTreeRoot(): Promise<Fr> {
     const header = await this.node.getBlockHeader(this.blockNumber);
+    if (!header) {
+      throw new Error(`No block header found for block number ${this.blockNumber}`);
+    }
     return header.state.partial.noteHashTree.root;
   }
 
@@ -81,4 +84,34 @@ export class KernelOracle implements ProvingDataOracle {
   public getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string> {
     return this.contractDataOracle.getDebugFunctionName(contractAddress, selector);
   }
+
+  public async getUpdatedClassIdHints(contractAddress: AztecAddress): Promise<UpdatedClassIdHints> {
+    const { sharedMutableSlot, sharedMutableHashSlot } = await SharedMutableValuesWithHash.getContractUpdateSlots(
+      contractAddress,
+    );
+
+    const hashLeafSlot = await computePublicDataTreeLeafSlot(
+      ProtocolContractAddress.ContractInstanceDeployer,
+      sharedMutableHashSlot,
+    );
+    const updatedClassIdWitness = await this.node.getPublicDataTreeWitness(this.blockNumber, hashLeafSlot);
+
+    if (!updatedClassIdWitness) {
+      throw new Error(`No public data tree witness found for ${hashLeafSlot}`);
+    }
+
+    const readStorage = (storageSlot: Fr) =>
+      this.node.getPublicStorageAt(ProtocolContractAddress.ContractInstanceDeployer, storageSlot, this.blockNumber);
+    const sharedMutableValues = await SharedMutableValues.readFromTree(sharedMutableSlot, readStorage);
+
+    return new UpdatedClassIdHints(
+      new MembershipWitness(
+        PUBLIC_DATA_TREE_HEIGHT,
+        updatedClassIdWitness.index,
+        updatedClassIdWitness.siblingPath.toTuple(),
+      ),
+      updatedClassIdWitness.leafPreimage,
+      sharedMutableValues,
+    );
+  }
 }

package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts

@@ -1,20 +1,27 @@
-import { type PrivateCallExecutionResult, type PrivateKernelSimulateOutput, collectNested } from '@aztec/circuit-types';
 import {
-  type Fr,
-  KeyValidationHint,
   MAX_KEY_VALIDATION_REQUESTS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
   MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
   MAX_NULLIFIERS_PER_TX,
   MAX_NULLIFIER_READ_REQUESTS_PER_TX,
-  MembershipWitness,
   NULLIFIER_TREE_HEIGHT,
+  VK_TREE_HEIGHT,
+} from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import type { Fr } from '@aztec/foundation/fields';
+import { type Tuple, assertLength } from '@aztec/foundation/serialize';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { privateKernelResetDimensionsConfig } from '@aztec/noir-protocol-circuits-types/client';
+import {
+  KeyValidationHint,
   type PrivateCircuitPublicInputs,
   type PrivateKernelCircuitPublicInputs,
   PrivateKernelData,
   PrivateKernelResetCircuitPrivateInputs,
   PrivateKernelResetDimensions,
   PrivateKernelResetHints,
+  type PrivateKernelSimulateOutput,
   type ReadRequest,
   ReadRequestResetStates,
   ReadRequestState,
@@ -23,7 +30,6 @@ import {
   ScopedNullifier,
   ScopedReadRequest,
   TransientDataIndexHint,
-  VK_TREE_HEIGHT,
   buildNoteHashReadRequestHintsFromResetStates,
   buildNullifierReadRequestHintsFromResetStates,
   buildTransientDataHints,
@@ -33,13 +39,10 @@ import {
   getNoteHashReadRequestResetStates,
   getNullifierReadRequestResetStates,
   privateKernelResetDimensionNames,
-} from '@aztec/circuits.js';
-import { makeTuple } from '@aztec/foundation/array';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { type Tuple, assertLength } from '@aztec/foundation/serialize';
-import { privateKernelResetDimensionsConfig } from '@aztec/noir-protocol-circuits-types/client';
+} from '@aztec/stdlib/kernel';
+import { type PrivateCallExecutionResult, collectNested } from '@aztec/stdlib/tx';
 
-import { type ProvingDataOracle } from '../proving_data_oracle.js';
+import type { ProvingDataOracle } from '../proving_data_oracle.js';
 
 function collectNestedReadRequests(
   executionStack: PrivateCallExecutionResult[],

package/src/kernel_prover/kernel_prover.ts

@@ -1,45 +1,47 @@
+import { CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS, VK_TREE_HEIGHT } from '@aztec/constants';
+import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { assertLength } from '@aztec/foundation/serialize';
+import { pushTestData } from '@aztec/foundation/testing';
+import { Timer } from '@aztec/foundation/timer';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { getProtocolContractLeafAndMembershipWitness, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { computeContractAddressFromInstance } from '@aztec/stdlib/contract';
+import { hashVK } from '@aztec/stdlib/hash';
+import type { PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
 import {
-  type PrivateCallExecutionResult,
-  type PrivateExecutionResult,
-  type PrivateKernelProver,
-  type PrivateKernelSimulateOutput,
-  collectEnqueuedPublicFunctionCalls,
-  collectNoteHashLeafIndexMap,
-  collectNoteHashNullifierCounterMap,
-  collectPublicTeardownFunctionCall,
-  getFinalMinRevertibleSideEffectCounter,
-} from '@aztec/circuit-types';
-import {
-  CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS,
-  ClientIvcProof,
-  Fr,
   PrivateCallData,
   PrivateKernelCircuitPublicInputs,
   PrivateKernelData,
   PrivateKernelInitCircuitPrivateInputs,
   PrivateKernelInnerCircuitPrivateInputs,
+  type PrivateKernelSimulateOutput,
   PrivateKernelTailCircuitPrivateInputs,
   type PrivateKernelTailCircuitPublicInputs,
-  type PrivateLog,
+  PrivateVerificationKeyHints,
   type ScopedPrivateLogData,
-  type TxRequest,
-  VK_TREE_HEIGHT,
-  VerificationKeyAsFields,
-} from '@aztec/circuits.js';
-import { hashVK } from '@aztec/circuits.js/hash';
-import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
-import { createLogger } from '@aztec/foundation/log';
-import { assertLength } from '@aztec/foundation/serialize';
-import { pushTestData } from '@aztec/foundation/testing';
-import { Timer } from '@aztec/foundation/timer';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
-import { getProtocolContractLeafAndMembershipWitness, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+} from '@aztec/stdlib/kernel';
+import type { PrivateLog } from '@aztec/stdlib/logs';
+import { ClientIvcProof } from '@aztec/stdlib/proofs';
+import {
+  type PrivateCallExecutionResult,
+  type PrivateExecutionResult,
+  TxRequest,
+  collectEnqueuedPublicFunctionCalls,
+  collectNoteHashLeafIndexMap,
+  collectNoteHashNullifierCounterMap,
+  collectPublicTeardownFunctionCall,
+  getFinalMinRevertibleSideEffectCounter,
+} from '@aztec/stdlib/tx';
+import { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
-import { type WitnessMap } from '@noir-lang/types';
+import type { WitnessMap } from '@noir-lang/types';
 import { strict as assert } from 'assert';
 
 import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js';
-import { type ProvingDataOracle } from './proving_data_oracle.js';
+import type { ProvingDataOracle } from './proving_data_oracle.js';
 
 // TODO(#10592): Temporary workaround to check that the private logs are correctly split into non-revertible set and revertible set.
 // This should be done in TailToPublicOutputValidator in private kernel tail.
@@ -87,6 +89,7 @@ const NULL_PROVE_OUTPUT: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicI
 
 export type ProvingConfig = {
   simulate: boolean;
+  skipFeeEnforcement: boolean;
   profile: boolean;
   dryRun: boolean;
 };
@@ -122,7 +125,12 @@ export class KernelProver {
   async prove(
     txRequest: TxRequest,
     executionResult: PrivateExecutionResult,
-    { simulate, profile, dryRun }: ProvingConfig = { simulate: false, profile: false, dryRun: false },
+    { simulate, skipFeeEnforcement, profile, dryRun }: ProvingConfig = {
+      simulate: false,
+      skipFeeEnforcement: false,
+      profile: false,
+      dryRun: false,
+    },
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>> {
     if (simulate && profile) {
       throw new Error('Cannot simulate and profile at the same time');
@@ -281,6 +289,12 @@ export class KernelProver {
       );
     }
 
+    if (output.publicInputs.feePayer.isZero() && skipFeeEnforcement) {
+      if (!dryRun && !simulate) {
+        throw new Error('Fee payment must be enforced when creating real proof.');
+      }
+      output.publicInputs.feePayer = new AztecAddress(Fr.MAX_FIELD_VALUE);
+    }
     // Private tail.
     const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(output.verificationKey);
     const previousKernelData = new PrivateKernelData(
@@ -336,34 +350,46 @@ export class KernelProver {
     const vkAsFields = await vkAsFieldsMegaHonk(vkAsBuffer);
     const vk = new VerificationKeyAsFields(vkAsFields, await hashVK(vkAsFields));
 
+    const { currentContractClassId, publicKeys, saltedInitializationHash } =
+      await this.oracle.getContractAddressPreimage(contractAddress);
     const functionLeafMembershipWitness = await this.oracle.getFunctionMembershipWitness(
-      contractAddress,
+      currentContractClassId,
       functionSelector,
     );
-    const { contractClassId, publicKeys, saltedInitializationHash } = await this.oracle.getContractAddressPreimage(
-      contractAddress,
-    );
+
     const { artifactHash: contractClassArtifactHash, publicBytecodeCommitment: contractClassPublicBytecodeCommitment } =
-      await this.oracle.getContractClassIdPreimage(contractClassId);
+      await this.oracle.getContractClassIdPreimage(currentContractClassId);
 
     // TODO(#262): Use real acir hash
     // const acirHash = keccak256(Buffer.from(bytecode, 'hex'));
     const acirHash = Fr.fromBuffer(Buffer.alloc(32, 0));
 
+    // This will be the address computed in the kernel by the executed class. We need to provide non membership of it in the protocol contract tree.
+    // This would only be equal to contractAddress if the currentClassId is equal to the original class id (no update happened).
+    const computedAddress = await computeContractAddressFromInstance({
+      originalContractClassId: currentContractClassId,
+      saltedInitializationHash,
+      publicKeys,
+    });
+
     const { lowLeaf: protocolContractLeaf, witness: protocolContractMembershipWitness } =
-      await getProtocolContractLeafAndMembershipWitness(contractAddress);
+      await getProtocolContractLeafAndMembershipWitness(contractAddress, computedAddress);
 
+    const updatedClassIdHints = await this.oracle.getUpdatedClassIdHints(contractAddress);
     return PrivateCallData.from({
       publicInputs,
       vk,
-      publicKeys,
-      contractClassArtifactHash,
-      contractClassPublicBytecodeCommitment,
-      saltedInitializationHash,
-      functionLeafMembershipWitness,
-      protocolContractMembershipWitness,
-      protocolContractLeaf,
-      acirHash,
+      verificationKeyHints: PrivateVerificationKeyHints.from({
+        publicKeys,
+        contractClassArtifactHash,
+        contractClassPublicBytecodeCommitment,
+        saltedInitializationHash,
+        functionLeafMembershipWitness,
+        protocolContractMembershipWitness,
+        protocolContractLeaf,
+        acirHash,
+        updatedClassIdHints,
+      }),
     });
   }