Add VerifierData & return it alongside the proof

ethereum/oracles/src/util/abi.test.ts → ethereum/oracles/src/noir/circuit/abi.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { filterPublic } from './abi.js';
+import { CircuitAbi } from './abi.js';
 import { Abi } from '@noir-lang/noirc_abi';
 
 const type = { kind: 'field' } as const;
@@ -15,7 +15,8 @@ describe('abi', () => {
       return_witnesses: [],
       error_types: {}
     };
+    const circuitAbi = new CircuitAbi(abi);
 
-    expect(filterPublic(abi).parameters).toEqual([publicParam]);
+    expect(circuitAbi.public().parameters).toEqual([publicParam]);
   });
 });

ethereum/oracles/src/noir/circuit/abi.ts

@@ -0,0 +1,23 @@
+import { Abi } from '@noir-lang/noirc_abi';
+
+export class CircuitAbi {
+  constructor(public abi: Abi) {}
+
+  public public(): Abi {
+    const parameters = this.abi.parameters.filter((param) => param.visibility === 'public');
+    return {
+      ...this.abi,
+      parameters
+    };
+  }
+
+  public return(): Abi {
+    return {
+      parameters: [],
+      param_witnesses: {},
+      error_types: {},
+      return_type: this.abi.return_type,
+      return_witnesses: this.abi.return_witnesses
+    };
+  }
+}

ethereum/oracles/src/noir/circuit/baseProver.ts

@@ -1,25 +1,33 @@
 import { randomUUID } from 'crypto';
 import { MonorepoCircuit } from './circuit.js';
 import { NargoProver } from './nargoProver.js';
-import { encodeProofAsFields, encodePublicInputs } from './utils.js';
+import { encodeProofAsFields } from './utils.js';
 import { InputMap } from '@noir-lang/noirc_abi';
 import { Hex } from 'viem';
 import path from 'path';
+import { VerifierData } from './verifierData.js';
+
+export interface ProofWithVerifierData {
+  proofAsFields: Hex[];
+  verifierData: VerifierData;
+}
 
 export class BaseProver {
   constructor(public circuit: MonorepoCircuit) {}
-  public async proveBase(inputs: InputMap): Promise<Hex[]> {
+  public async proveBase(inputs: InputMap): Promise<ProofWithVerifierData> {
     const proofId = randomUUID();
     const prover = new NargoProver(this.circuit, proofId);
 
-    const { proof, verifierData } = await prover.prove(inputs);
+    const proof = await prover.prove(inputs);
 
     const proofAsFieldsPath = path.join(this.circuit.root, 'proofs', `${this.circuit.name}.proof.json`);
-    return await encodeProofAsFields(
+    const verifierData = await VerifierData.create(prover.verifierTomlPath, this.circuit.artefact.abi);
+    const proofAsFields = await encodeProofAsFields(
       proof,
-      encodePublicInputs(this.circuit.artefact.abi, verifierData),
+      verifierData.publicInputs(),
       this.circuit.vkPath(),
       proofAsFieldsPath
     );
+    return { proofAsFields, verifierData };
   }
 }

ethereum/oracles/src/noir/circuit/nargoProver.ts

@@ -4,22 +4,16 @@ import { $ } from 'execa';
 import toml from '@iarna/toml';
 import { InputMap } from '@noir-lang/noirc_abi';
 import { readFile, unlink, writeFile } from 'fs/promises';
-import { readTomlObject } from '../../util/file.js';
 import { addHexPrefix } from '../../util/hex.js';
 import { type Hex } from 'viem';
 
-export interface NargoProve {
-  proof: Hex;
-  verifierData: InputMap;
-}
-
 // IMPORTANT: The proof paths used here are not unique to the `proofId` - therefore they can be overridden in parallel proof generation.
 // https://github.com/noir-lang/noir/issues/5037
 export class NargoProver {
   private proverName = `Prover_${this.proofId}`;
   private proverTomlPath = path.join(this.circuit.packagePath(), `${this.proverName}.toml`);
   private verifierName = `Verifier_${this.proofId}`;
-  private verifierTomlPath = path.join(this.circuit.packagePath(), `${this.verifierName}.toml`);
+  public verifierTomlPath = path.join(this.circuit.packagePath(), `${this.verifierName}.toml`);
   private proofPath = path.join(this.circuit.root, 'proofs', `${this.circuit.name}.proof`);
 
   constructor(
@@ -31,17 +25,12 @@ export class NargoProver {
     await $`nargo prove --package ${this.circuit.name} --oracle-resolver http://localhost:5555 -p ${this.proverName} -v ${this.verifierName}`;
   }
 
-  public async prove(inputs: InputMap): Promise<NargoProve> {
+  public async prove(inputs: InputMap): Promise<Hex> {
     await writeFile(this.proverTomlPath, toml.stringify(inputs as toml.JsonMap));
     await this.executeProveCommand();
-    const verifierData = await readTomlObject<InputMap>(this.verifierTomlPath);
     await unlink(this.proverTomlPath);
-    await unlink(this.verifierTomlPath);
 
     const proof = addHexPrefix(await readFile(this.proofPath, 'utf-8'));
-    return {
-      proof,
-      verifierData
-    };
+    return proof;
   }
 }

ethereum/oracles/src/noir/circuit/provers/getStorage.ts

@@ -1,9 +1,9 @@
 import { Address, Hex } from 'viem';
-import { BaseProver } from '../baseProver.js';
+import { BaseProver, ProofWithVerifierData } from '../baseProver.js';
 import { encodeAddress, encodeField, encodeHex } from '../../oracles/common/encode.js';
 
 export class GetStorageProver extends BaseProver {
-  public async prove(chainId: number, blockNumber: bigint, address: Address, key: Hex): Promise<Hex[]> {
+  public async prove(chainId: number, blockNumber: bigint, address: Address, key: Hex): Promise<ProofWithVerifierData> {
     const inputs = {
       chain_id: encodeField(chainId),
       block_number: encodeField(blockNumber),

ethereum/oracles/src/noir/circuit/utils.ts

@@ -1,5 +1,3 @@
-import { Abi, InputMap, abiEncode } from '@noir-lang/noirc_abi';
-import { filterPublic } from '../../util/abi.js';
 import { writeFile } from 'fs/promises';
 import { Hex, concatHex } from 'viem';
 import { removeHexPrefix } from '../../util/hex.js';
@@ -25,9 +23,3 @@ export async function encodeProofAsFields(
   const proofAsFields = proofAsFieldsWithInputs.slice(publicInputs.length);
   return proofAsFields;
 }
-
-export function encodePublicInputs(abi: Abi, verifierData: InputMap): Hex[] {
-  const publicInputsAbi = filterPublic(abi);
-  const publicInputsEncodedMap = abiEncode(publicInputsAbi, verifierData, verifierData.return);
-  return Array.from(publicInputsEncodedMap.values()) as Hex[];
-}

ethereum/oracles/src/script/generateGetStorageProof.ts

@@ -7,6 +7,6 @@ const { blockNumber, address, storageKeys } = HISTORY_API_FIXTURES.mainnet.paris
 
 const circuit = await MonorepoCircuit.create('../../', 'get_storage');
 const getStorageProver = new GetStorageProver(circuit);
-const proofAsFields = await getStorageProver.prove(mainnet.id, blockNumber, address!, storageKeys![0]);
+const { proofAsFields } = await getStorageProver.prove(mainnet.id, blockNumber, address!, storageKeys![0]);
 // eslint-disable-next-line no-console
 console.log(proofAsFields);