new

Author: jialinli98

ethereum/contracts/src/generated-verifier/GetTransactionUltraPLONKVerifier.sol

@@ -28,5 +28,5 @@ export async function getTransactionReceipts(
 
   if (!receipts) throw new Error(`No receipts found for block number ${params.blockNumber}`);
 
-  return receipts.map(formatTransactionReceipt);
+  return receipts.map((receipt) => formatTransactionReceipt(receipt));
 }

ethereum/oracles/src/ethereum/alchemyClientActions/getTransactionReceipts.ts

@@ -82,7 +82,7 @@ export class TxRlpEncoder {
   }
 
   private static accessListToFields(accessList: AccessList): RecursiveArray<Hex> {
-    return accessList.map(({ address, storageKeys }) => [address, storageKeys]);
+    return accessList.map(({ address, storageKeys }) => [address, [...storageKeys]]);
   }
 
   private static signatureToFields(baseTx: TxBase): Hex[] {

ethereum/oracles/src/ethereum/transaction.ts

@@ -19,5 +19,9 @@ export class Barretenberg {
     await $`${this.binaryPath} proof_as_fields -k ${vkPath} -p ${proofWithInputsPath} -o ${proofAsFieldsPath}`;
   }
 
+  public async prove(bytecodePath: string, witnessPath: string, proofPath: string) {
+    await $`${this.binaryPath} prove -b ${bytecodePath} -w ${witnessPath} -o ${proofPath}`;
+  }
+
   private constructor(private binaryPath: string) {}
 }

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

@@ -6,6 +6,7 @@ import { InputMap } from '@noir-lang/noirc_abi';
 import { readFile, unlink, writeFile } from 'fs/promises';
 import { addHexPrefix } from '../../util/hex.js';
 import { type Hex } from 'viem';
+import { Barretenberg } from './barretenberg.js';
 
 // 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
@@ -35,8 +36,21 @@ export class NargoProver {
     return path.join(this.circuit.root, 'proofs', `${this.circuit.name}.proof`);
   }
 
+  private get witnessPath(): string {
+    return path.join(this.circuit.packagePath(), 'target', `${this.proverName}.gz`);
+  }
+
+  private get bytecodePath(): string {
+    return path.join(this.circuit.root, 'target', `${this.circuit.name}.json`);
+  }
+
   public async executeProveCommand(): Promise<void> {
-    await $`nargo prove --package ${this.circuit.name} --oracle-resolver http://localhost:5555 -p ${this.proverName} -v ${this.verifierName}`;
+    // Generate witness using nargo execute
+    await $`nargo execute --package ${this.circuit.name} --oracle-resolver http://localhost:5555 -p ${this.proverName}`;
+
+    // Generate proof from witness using bb
+    const bb = await Barretenberg.create();
+    await bb.prove(this.bytecodePath, this.witnessPath, this.proofPath);
   }
 
   public async prove(inputs: InputMap): Promise<Hex> {

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

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { loadProofFixture } from '../../../../historyAPIFixtures.js';
-import accountAsFields from './fixtures/accountAsFields.json';
+import accountAsFields from './fixtures/accountAsFields.json' with { type: "json" };
 import { ForeignCallOutput } from '@noir-lang/noir_js';
 import { encodeAccount, getValue } from './encode.js';
 import { Hex } from 'viem';

ethereum/oracles/src/noir/oracles/rpc/accountOracle/encode.test.ts

@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it } from 'vitest';
 import { updateNestedField, incHexStr } from 'noir-ethereum-api-oracles';
 import { Abi, InputMap, abiEncode } from '@noir-lang/noirc_abi';
 
-import getAccountVerifier from '../../contracts/out/GetAccountUltraPLONKVerifier.sol/UltraVerifier.json';
-import getAccount from '../../../target/get_account.json';
+import getAccountVerifier from '../../contracts/out/GetAccountUltraPLONKVerifier.sol/UltraVerifier.json' with { type: "json" };
+import getAccount from '../../../target/get_account.json' with { type: "json" };
 
 import { readProofData } from './proofDataReader.js';
 import { FoundryArtefact, deploySolidityProofVerifier } from './solidityVerifier.js';

ethereum/tests/src/get_account.e2e.test.ts

@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it } from 'vitest';
 import { updateNestedField, incHexStr } from 'noir-ethereum-api-oracles';
 import { Abi, InputMap, abiEncode } from '@noir-lang/noirc_abi';
 
-import getHeaderVerifier from '../../contracts/out/GetHeaderUltraPLONKVerifier.sol/UltraVerifier.json';
-import getHeader from '../../../target/get_header.json';
+import getHeaderVerifier from '../../contracts/out/GetHeaderUltraPLONKVerifier.sol/UltraVerifier.json' with { type: "json" };
+import getHeader from '../../../target/get_header.json' with { type: "json" };
 
 import { readProofData } from './proofDataReader.js';
 import { FoundryArtefact, deploySolidityProofVerifier } from './solidityVerifier.js';

ethereum/tests/src/get_header.e2e.test.ts

@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it } from 'vitest';
 import { updateNestedField, incHexStr } from 'noir-ethereum-api-oracles';
 import { Abi, InputMap, abiEncode } from '@noir-lang/noirc_abi';
 
-import getLogVerifier from '../../contracts/out/GetLogUltraPLONKVerifier.sol/UltraVerifier.json';
-import getLog from '../../../target/get_log.json';
+import getLogVerifier from '../../contracts/out/GetLogUltraPLONKVerifier.sol/UltraVerifier.json' with { type: "json" };
+import getLog from '../../../target/get_log.json' with { type: "json" };
 
 import { readProofData } from './proofDataReader.js';
 import { FoundryArtefact, deploySolidityProofVerifier } from './solidityVerifier.js';

ethereum/tests/src/get_log.e2e.test.ts

@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it } from 'vitest';
 import { updateNestedField, incHexStr } from 'noir-ethereum-api-oracles';
 import { Abi, InputMap, abiEncode } from '@noir-lang/noirc_abi';
 
-import getReceiptVerifier from '../../contracts/out/GetReceiptUltraPLONKVerifier.sol/UltraVerifier.json';
-import getReceipt from '../../../target/get_receipt.json';
+import getReceiptVerifier from '../../contracts/out/GetReceiptUltraPLONKVerifier.sol/UltraVerifier.json' with { type: "json" };
+import getReceipt from '../../../target/get_receipt.json' with { type: "json" };
 
 import { readProofData } from './proofDataReader.js';
 import { FoundryArtefact, deploySolidityProofVerifier } from './solidityVerifier.js';