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

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,8 +89,8 @@ const NULL_PROVE_OUTPUT: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicI
 
 export type ProvingConfig = {
   simulate: boolean;
+  skipFeeEnforcement: boolean;
   profile: boolean;
-  dryRun: boolean;
 };
 
 /**
@@ -115,20 +117,20 @@ export class KernelProver {
    * @param txRequest - The authenticated transaction request object.
    * @param executionResult - The execution result object containing nested executions and preimages.
    * @param profile - Set true to profile the gate count for each circuit
-   * @param dryRun - Set true to skip the IVC proof generation (only simulation is run). Useful for profiling gate count without proof gen.
    * @returns A Promise that resolves to a KernelProverOutput object containing proof, public inputs, and output notes.
    * TODO(#7368) this should be refactored to not recreate the ACIR bytecode now that it operates on a program stack
    */
   async prove(
     txRequest: TxRequest,
     executionResult: PrivateExecutionResult,
-    { simulate, profile, dryRun }: ProvingConfig = { simulate: false, profile: false, dryRun: false },
+    { simulate, skipFeeEnforcement, profile }: ProvingConfig = {
+      simulate: false,
+      skipFeeEnforcement: false,
+      profile: false,
+    },
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>> {
-    if (simulate && profile) {
-      throw new Error('Cannot simulate and profile at the same time');
-    }
-
-    simulate = simulate || this.fakeProofs;
+    const skipProofGeneration = this.fakeProofs || simulate;
+    const generateWitnesses = !skipProofGeneration || profile;
 
     const timer = new Timer();
 
@@ -144,7 +146,7 @@ export class KernelProver {
       const gateCount = (await this.proofCreator.computeGateCountForCircuit(bytecode, circuitName)) as number;
       gateCounts.push({ circuitName, gateCount });
 
-      this.log.info(`Tx ${txRequest.hash()}: bb gates for ${circuitName} - ${gateCount}`);
+      this.log.debug(`Gate count for ${circuitName} - ${gateCount}`);
     };
 
     const noteHashLeafIndexMap = collectNoteHashLeafIndexMap(executionResult);
@@ -167,9 +169,9 @@ export class KernelProver {
         );
         while (resetBuilder.needsReset()) {
           const privateInputs = await resetBuilder.build(this.oracle, noteHashLeafIndexMap);
-          output = simulate
-            ? await this.proofCreator.simulateReset(privateInputs)
-            : await this.proofCreator.generateResetOutput(privateInputs);
+          output = generateWitnesses
+            ? await this.proofCreator.generateResetOutput(privateInputs)
+            : await this.proofCreator.simulateReset(privateInputs);
           // TODO(#7368) consider refactoring this redundant bytecode pushing
           acirs.push(output.bytecode);
           witnessStack.push(output.outputWitness);
@@ -220,9 +222,9 @@ export class KernelProver {
 
         pushTestData('private-kernel-inputs-init', proofInput);
 
-        output = simulate
-          ? await this.proofCreator.simulateInit(proofInput)
-          : await this.proofCreator.generateInitOutput(proofInput);
+        output = generateWitnesses
+          ? await this.proofCreator.generateInitOutput(proofInput)
+          : await this.proofCreator.simulateInit(proofInput);
 
         acirs.push(output.bytecode);
         witnessStack.push(output.outputWitness);
@@ -241,9 +243,9 @@ export class KernelProver {
 
         pushTestData('private-kernel-inputs-inner', proofInput);
 
-        output = simulate
-          ? await this.proofCreator.simulateInner(proofInput)
-          : await this.proofCreator.generateInnerOutput(proofInput);
+        output = generateWitnesses
+          ? await this.proofCreator.generateInnerOutput(proofInput)
+          : await this.proofCreator.simulateInner(proofInput);
 
         acirs.push(output.bytecode);
         witnessStack.push(output.outputWitness);
@@ -263,9 +265,9 @@ export class KernelProver {
     );
     while (resetBuilder.needsReset()) {
       const privateInputs = await resetBuilder.build(this.oracle, noteHashLeafIndexMap);
-      output = simulate
-        ? await this.proofCreator.simulateReset(privateInputs)
-        : await this.proofCreator.generateResetOutput(privateInputs);
+      output = generateWitnesses
+        ? await this.proofCreator.generateResetOutput(privateInputs)
+        : await this.proofCreator.simulateReset(privateInputs);
 
       acirs.push(output.bytecode);
       witnessStack.push(output.outputWitness);
@@ -281,6 +283,12 @@ export class KernelProver {
       );
     }
 
+    if (output.publicInputs.feePayer.isZero() && skipFeeEnforcement) {
+      if (!skipProofGeneration) {
+        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(
@@ -298,9 +306,9 @@ export class KernelProver {
 
     pushTestData('private-kernel-inputs-ordering', privateInputs);
 
-    const tailOutput = simulate
-      ? await this.proofCreator.simulateTail(privateInputs)
-      : await this.proofCreator.generateTailOutput(privateInputs);
+    const tailOutput = generateWitnesses
+      ? await this.proofCreator.generateTailOutput(privateInputs)
+      : await this.proofCreator.simulateTail(privateInputs);
     if (tailOutput.publicInputs.forPublic) {
       const privateLogs = privateInputs.previousKernel.publicInputs.end.privateLogs;
       const nonRevertiblePrivateLogs = tailOutput.publicInputs.forPublic.nonRevertibleAccumulatedData.privateLogs;
@@ -315,12 +323,12 @@ export class KernelProver {
       tailOutput.profileResult = { gateCounts };
     }
 
-    if (!simulate) {
+    if (generateWitnesses) {
       this.log.info(`Private kernel witness generation took ${timer.ms()}ms`);
     }
 
     // TODO(#7368) how do we 'bincode' encode these inputs?
-    if (!dryRun && !simulate) {
+    if (!skipProofGeneration) {
       const ivcProof = await this.proofCreator.createClientIvcProof(acirs, witnessStack);
       tailOutput.clientIvcProof = ivcProof;
     } else {
@@ -336,34 +344,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,
+      }),
     });
   }
 

package/src/kernel_prover/proving_data_oracle.ts

@@ -1,17 +1,12 @@
-import { type NullifierMembershipWitness } from '@aztec/circuit-types';
-import {
-  type FUNCTION_TREE_HEIGHT,
-  type Fr,
-  type FunctionSelector,
-  type GrumpkinScalar,
-  type MembershipWitness,
-  type NOTE_HASH_TREE_HEIGHT,
-  type Point,
-  type PublicKeys,
-  type VK_TREE_HEIGHT,
-  type VerificationKeyAsFields,
-} from '@aztec/circuits.js';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import type { FUNCTION_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, VK_TREE_HEIGHT } from '@aztec/constants';
+import type { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import type { MembershipWitness } from '@aztec/foundation/trees';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { UpdatedClassIdHints } from '@aztec/stdlib/kernel';
+import type { PublicKeys } from '@aztec/stdlib/keys';
+import type { NullifierMembershipWitness } from '@aztec/stdlib/trees';
+import type { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
 /**
  * Provides functionality to fetch membership witnesses for verification keys,
@@ -19,9 +14,12 @@ import { type AztecAddress } from '@aztec/foundation/aztec-address';
  */
 export interface ProvingDataOracle {
   /** Retrieves the preimage of a contract address from the registered contract instances db. */
-  getContractAddressPreimage(
-    address: AztecAddress,
-  ): Promise<{ saltedInitializationHash: Fr; publicKeys: PublicKeys; contractClassId: Fr }>;
+  getContractAddressPreimage(address: AztecAddress): Promise<{
+    saltedInitializationHash: Fr;
+    publicKeys: PublicKeys;
+    currentContractClassId: Fr;
+    originalContractClassId: Fr;
+  }>;
 
   /** Retrieves the preimage of a contract class id from the contract classes db. */
   getContractClassIdPreimage(
@@ -29,16 +27,16 @@ export interface ProvingDataOracle {
   ): Promise<{ artifactHash: Fr; publicBytecodeCommitment: Fr; privateFunctionsRoot: Fr }>;
 
   /**
-   * Retrieve the function membership witness for the given contract address and function selector.
+   * Retrieve the function membership witness for the given contract class and function selector.
    * The function membership witness represents a proof that the function belongs to the specified contract.
    * Throws an error if the contract address or function selector is unknown.
    *
-   * @param contractAddress - The contract address.
+   * @param contractClassId - The id of the class.
    * @param selector - The function selector.
    * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
    */
   getFunctionMembershipWitness(
-    contractAddress: AztecAddress,
+    contractClassId: Fr,
     selector: FunctionSelector,
   ): Promise<MembershipWitness<typeof FUNCTION_TREE_HEIGHT>>;
 
@@ -80,4 +78,6 @@ export interface ProvingDataOracle {
   getMasterSecretKey(masterPublicKey: Point): Promise<GrumpkinScalar>;
 
   getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
+
+  getUpdatedClassIdHints(contractAddress: AztecAddress): Promise<UpdatedClassIdHints>;
 }

package/src/note_decryption_utils/add_public_values_to_payload.ts

@@ -1,7 +1,8 @@
-import { type L1NotePayload, Note } from '@aztec/circuit-types';
 import { ContractNotFoundError } from '@aztec/simulator/client';
+import type { L1NotePayload } from '@aztec/stdlib/logs';
+import { Note } from '@aztec/stdlib/note';
 
-import { type PxeDatabase } from '../database/pxe_database.js';
+import type { PxeDatabase } from '../database/pxe_database.js';
 
 /**
  * Merges privately and publicly delivered note values.
@@ -24,10 +25,10 @@ export async function getOrderedNoteItems(
     );
   }
 
-  const artifact = await db.getContractArtifact(instance.contractClassId);
+  const artifact = await db.getContractArtifact(instance.currentContractClassId);
   if (!artifact) {
     throw new Error(
-      `Could not find artifact for contract class ${instance.contractClassId.toString()}. This should never happen here as the partial notes flow should be triggered only for non-deferred notes.`,
+      `Could not find artifact for contract class ${instance.currentContractClassId.toString()}. This should never happen here as the partial notes flow should be triggered only for non-deferred notes.`,
     );
   }
 

package/src/pxe_http/pxe_http_server.ts

@@ -1,5 +1,5 @@
-import { type PXE, PXESchema } from '@aztec/circuit-types';
 import { createNamespacedSafeJsonRpcServer, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { type PXE, PXESchema } from '@aztec/stdlib/interfaces/client';
 
 import http from 'http';
 

package/src/pxe_service/error_enriching.ts

@@ -1,12 +1,12 @@
-import { type SimulationError, isNoirCallStackUnresolved } from '@aztec/circuit-types';
-import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/circuits.js/constants';
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { type Logger } from '@aztec/foundation/log';
+import type { Logger } from '@aztec/foundation/log';
 import { resolveAssertionMessageFromRevertData, resolveOpcodeLocations } from '@aztec/simulator/client';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type SimulationError, isNoirCallStackUnresolved } from '@aztec/stdlib/errors';
 
-import { type ContractDataOracle, type PxeDatabase } from '../index.js';
+import type { ContractDataOracle, PxeDatabase } from '../index.js';
 
 /**
  * Adds contract and function names to a simulation error, if they

package/src/pxe_service/index.ts

@@ -1,3 +1,2 @@
 export * from './pxe_service.js';
 export { enrichPublicSimulationError } from './error_enriching.js';
-export { pxeTestSuite } from './test/pxe_test_suite.js';