@aztec/bb-prover 0.66.0 → 0.67.0

package/src/prover/bb_prover.ts

@@ -42,7 +42,7 @@ import {
   makeRecursiveProofFromBinary,
 } from '@aztec/circuits.js';
 import { runInDirectory } from '@aztec/foundation/fs';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { Timer } from '@aztec/foundation/timer';
 import {
@@ -76,7 +76,7 @@ import { Attributes, type TelemetryClient, trackSpan } from '@aztec/telemetry-cl
 import { abiEncode } from '@noir-lang/noirc_abi';
 import { type Abi, type WitnessMap } from '@noir-lang/types';
 import crypto from 'crypto';
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 import * as path from 'path';
 
 import {
@@ -100,7 +100,7 @@ import { ProverInstrumentation } from '../instrumentation.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { extractAvmVkData, extractVkData } from '../verification_key/verification_key_data.js';
 
-const logger = createDebugLogger('aztec:bb-prover');
+const logger = createLogger('bb-prover');
 
 // All `ServerCircuitArtifact` are recursive.
 const SERVER_CIRCUIT_RECURSIVE = true;
@@ -795,8 +795,8 @@ export class BBNativeRollupProver implements ServerCircuitProver {
       const json = JSON.parse(proofString);
       const fields = json
         .slice(0, 3)
-        .map(Fr.fromString)
-        .concat(json.slice(3 + numPublicInputs).map(Fr.fromString));
+        .map(Fr.fromHexString)
+        .concat(json.slice(3 + numPublicInputs).map(Fr.fromHexString));
       return new RecursiveProof(
         fields,
         new Proof(proof.binaryProof.buffer, vk.numPublicInputs),
@@ -877,8 +877,8 @@ export class BBNativeRollupProver implements ServerCircuitProver {
 
     const fieldsWithoutPublicInputs = json
       .slice(0, 3)
-      .map(Fr.fromString)
-      .concat(json.slice(3 + numPublicInputs).map(Fr.fromString));
+      .map(Fr.fromHexString)
+      .concat(json.slice(3 + numPublicInputs).map(Fr.fromHexString));
     logger.debug(
       `Circuit path: ${filePath}, complete proof length: ${json.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProof.length}`,
     );

package/src/test/test_avm.ts

@@ -0,0 +1,85 @@
+import {
+  AztecAddress,
+  BlockHeader,
+  ContractStorageRead,
+  ContractStorageUpdateRequest,
+  Gas,
+  GlobalVariables,
+  L2ToL1Message,
+  LogHash,
+  MAX_ENQUEUED_CALLS_PER_CALL,
+  MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+  MAX_L2_TO_L1_MSGS_PER_CALL,
+  MAX_NOTE_HASHES_PER_CALL,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIERS_PER_CALL,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+  MAX_PUBLIC_DATA_READS_PER_CALL,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+  MAX_UNENCRYPTED_LOGS_PER_CALL,
+  NoteHash,
+  Nullifier,
+  PublicCircuitPublicInputs,
+  PublicInnerCallRequest,
+  ReadRequest,
+  RevertCode,
+  TreeLeafReadRequest,
+} from '@aztec/circuits.js';
+import { computeVarArgsHash } from '@aztec/circuits.js/hash';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { type PublicFunctionCallResult } from '@aztec/simulator';
+
+// TODO: pub somewhere more usable - copied from abstract phase manager
+export function getPublicInputs(result: PublicFunctionCallResult): PublicCircuitPublicInputs {
+  return PublicCircuitPublicInputs.from({
+    callContext: result.executionRequest.callContext,
+    proverAddress: AztecAddress.ZERO,
+    argsHash: computeVarArgsHash(result.executionRequest.args),
+    noteHashes: padArrayEnd(result.noteHashes, NoteHash.empty(), MAX_NOTE_HASHES_PER_CALL),
+    nullifiers: padArrayEnd(result.nullifiers, Nullifier.empty(), MAX_NULLIFIERS_PER_CALL),
+    l2ToL1Msgs: padArrayEnd(result.l2ToL1Messages, L2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_CALL),
+    startSideEffectCounter: result.startSideEffectCounter,
+    endSideEffectCounter: result.endSideEffectCounter,
+    returnsHash: computeVarArgsHash(result.returnValues),
+    noteHashReadRequests: padArrayEnd(
+      result.noteHashReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+    ),
+    nullifierReadRequests: padArrayEnd(
+      result.nullifierReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+    ),
+    nullifierNonExistentReadRequests: padArrayEnd(
+      result.nullifierNonExistentReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+    ),
+    l1ToL2MsgReadRequests: padArrayEnd(
+      result.l1ToL2MsgReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+    ),
+    contractStorageReads: padArrayEnd(
+      result.contractStorageReads,
+      ContractStorageRead.empty(),
+      MAX_PUBLIC_DATA_READS_PER_CALL,
+    ),
+    contractStorageUpdateRequests: padArrayEnd(
+      result.contractStorageUpdateRequests,
+      ContractStorageUpdateRequest.empty(),
+      MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+    ),
+    publicCallRequests: padArrayEnd([], PublicInnerCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_CALL),
+    unencryptedLogsHashes: padArrayEnd(result.unencryptedLogsHashes, LogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_CALL),
+    historicalHeader: BlockHeader.empty(),
+    globalVariables: GlobalVariables.empty(),
+    startGasLeft: Gas.from(result.startGasLeft),
+    endGasLeft: Gas.from(result.endGasLeft),
+    transactionFee: result.transactionFee,
+    // TODO(@just-mitch): need better mapping from simulator to revert code.
+    revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
+  });
+}

package/src/test/test_circuit_prover.ts

@@ -35,7 +35,7 @@ import {
   makeEmptyRecursiveProof,
   makeRecursiveProof,
 } from '@aztec/circuits.js';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
 import {
@@ -78,7 +78,7 @@ import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 export class TestCircuitProver implements ServerCircuitProver {
   private wasmSimulator = new WASMSimulator();
   private instrumentation: ProverInstrumentation;
-  private logger = createDebugLogger('aztec:test-prover');
+  private logger = createLogger('bb-prover:test-prover');
 
   constructor(
     telemetry: TelemetryClient,

package/src/verification_key/verification_key_data.ts

@@ -7,7 +7,7 @@ import {
 import { hashVK } from '@aztec/circuits.js/hash';
 
 import { strict as assert } from 'assert';
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 import * as path from 'path';
 
 import { VK_FIELDS_FILENAME, VK_FILENAME } from '../bb/execute.js';
@@ -23,7 +23,7 @@ export async function extractVkData(vkDirectoryPath: string): Promise<Verificati
     fs.readFile(path.join(vkDirectoryPath, VK_FILENAME)),
   ]);
   const fieldsJson = JSON.parse(rawFields);
-  const fields = fieldsJson.map(Fr.fromString);
+  const fields = fieldsJson.map(Fr.fromHexString);
   // The hash is not included in the BB response
   const vkHash = hashVK(fields);
   const vkAsFields = new VerificationKeyAsFields(fields, vkHash);
@@ -37,7 +37,7 @@ export async function extractAvmVkData(vkDirectoryPath: string): Promise<Verific
     fs.readFile(path.join(vkDirectoryPath, VK_FILENAME)),
   ]);
   const fieldsJson = JSON.parse(rawFields);
-  const fields = fieldsJson.map(Fr.fromString);
+  const fields = fieldsJson.map(Fr.fromHexString);
   // The first item is the hash, this is not part of the actual VK
   // TODO: is the above actually the case?
   const vkHash = fields[0];

package/src/verifier/bb_verifier.ts

@@ -2,14 +2,14 @@ import { type ClientProtocolCircuitVerifier, Tx } from '@aztec/circuit-types';
 import { type CircuitVerificationStats } from '@aztec/circuit-types/stats';
 import { type Proof, type VerificationKeyData } from '@aztec/circuits.js';
 import { runInDirectory } from '@aztec/foundation/fs';
-import { type DebugLogger, type LogFn, createDebugLogger } from '@aztec/foundation/log';
+import { type LogFn, type Logger, createLogger } from '@aztec/foundation/log';
 import {
   type ClientProtocolArtifact,
   type ProtocolArtifact,
   ProtocolCircuitArtifacts,
 } from '@aztec/noir-protocol-circuits-types';
 
-import * as fs from 'fs/promises';
+import { promises as fs } from 'fs';
 import * as path from 'path';
 
 import {
@@ -30,13 +30,13 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
   private constructor(
     private config: BBConfig,
     private verificationKeys = new Map<ProtocolArtifact, Promise<VerificationKeyData>>(),
-    private logger: DebugLogger,
+    private logger: Logger,
   ) {}
 
   public static async new(
     config: BBConfig,
     initialCircuits: ProtocolArtifact[] = [],
-    logger = createDebugLogger('aztec:bb-verifier'),
+    logger = createLogger('bb-prover:verifier'),
   ) {
     await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
     const keys = new Map<ProtocolArtifact, Promise<VerificationKeyData>>();