Update recursive verification scripts and dependencies

- Modified `.gitignore` to include `store/` directory.
- Updated `package.json` to change the `recursion` script to use `tsx` and added new dependencies for `@aztec/kv-store` and `@aztec/noir-contracts.js`.
- Refined `README.md` to correct command for executing the circuit.
- Enhanced `generate_data.ts` by removing unused imports and simplifying proof data handling.
- Revamped `run_recursion.ts` to integrate a new sandbox setup and wallet deployment process, improving contract interaction.
- Introduced `sponsored_fpc.ts` for managing Sponsored FPC instances and deployment logic.

Author: critesjosh

recursive_verification/.gitignore

@@ -1,4 +1,5 @@
 node_modules
 **/target/
 **/codegenCache.json
-**/artifacts/
+**/artifacts/
+store/

recursive_verification/README.md

@@ -76,10 +76,10 @@ cd circuit && aztec-nargo compile
 
 This compiles `circuit/src/main.nr` and generates `target/hello_circuit.json` containing the circuit bytecode.
 
-### 2. Execute the Circuit (Optional)
+### 2. Execute the Circuit
 
 ```bash
-cd circuit && nargo execute
+cd circuit && aztec-nargo execute
 ```
 
 Generates a witness for testing the circuit with default inputs (defined in `circuit/Prover.toml`).

recursive_verification/bun.lockb

@@ -6,7 +6,7 @@
     "cli": "bun run cli.ts",
     "ccc": "cd contract && aztec-nargo compile && aztec-postprocess-contract && aztec codegen target -o artifacts",
     "data": "bun run scripts/generate_data.ts",
-    "recursion": "bun run scripts/run_recursion.ts",
+    "recursion": "tsx scripts/run_recursion.ts",
     "test": "bun test",
     "test:watch": "bun test --watch"
   },
@@ -20,7 +20,11 @@
     "@aztec/accounts": "2.0.3",
     "@aztec/aztec.js": "2.0.3",
     "@aztec/bb.js": "2.0.3",
+    "@aztec/kv-store": "^2.0.3",
+    "@aztec/noir-contracts.js": "^2.0.3",
     "@aztec/noir-noir_js": "2.0.3",
-    "add": "^2.0.6"
+    "@aztec/pxe": "^2.0.3",
+    "add": "^2.0.6",
+    "tsx": "^4.20.6"
   }
 }

recursive_verification/package.json

@@ -1,6 +1,6 @@
 import { Noir } from '@aztec/noir-noir_js';
 import circuitJson from '../circuit/target/hello_circuit.json' with { type: "json" }
-import { Barretenberg, deflattenFields, RawBuffer, UltraHonkBackend, type ProofData } from '@aztec/bb.js';
+import { Barretenberg, deflattenFields, UltraHonkBackend } from '@aztec/bb.js';
 import fs from 'fs'
 import { exit } from 'process';
 
@@ -9,15 +9,15 @@ const helloWorld = new Noir(circuitJson as any)
 const { witness: mainWitness } = await helloWorld.execute({ x: 1, y: 2 })
 
 const mainBackend = new UltraHonkBackend(circuitJson.bytecode, { threads: 1 })
-const mainProofData: ProofData = await mainBackend.generateProof(mainWitness)
+const mainProofData = await mainBackend.generateProof(mainWitness)
 const mainVerificationKey = await mainBackend.getVerificationKey()
 
 const isValid = await mainBackend.verifyProof(mainProofData)
 console.log(`Proof verification: ${isValid ? 'SUCCESS' : 'FAILED'}`)
 
-const proofAsFields = deflattenFields(new RawBuffer(mainProofData.proof))
+const proofAsFields = deflattenFields(mainProofData.proof)
 const barretenbergAPI = await Barretenberg.new({ threads: 1 });
-const vkAsFields = (await barretenbergAPI.acirVkAsFieldsUltraHonk(new RawBuffer(mainVerificationKey)))
+const vkAsFields = (await barretenbergAPI.acirVkAsFieldsUltraHonk(mainVerificationKey))
   .map(field => field.toString());
 
 fs.writeFileSync('data.json', JSON.stringify({ proofAsFields, vkAsFields, publicInputs: mainProofData.publicInputs }, null, 2))

recursive_verification/scripts/generate_data.ts

@@ -1,68 +1,75 @@
-import { AccountWalletWithSecretKey, Contract, createPXEClient, waitForPXE, type FieldLike, type PXE } from "@aztec/aztec.js"
-
+import { AccountWalletWithSecretKey, Contract, createAztecNodeClient, Fq, Fr, SponsoredFeePaymentMethod, waitForPXE, type FieldLike, type PXE } from "@aztec/aztec.js"
+import { getSponsoredFPCInstance } from "./sponsored_fpc.js";
+import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 export const PXE_URL = 'http://localhost:8080'
-import { getInitialTestAccountsWallets } from '@aztec/accounts/testing'
 import { ValueNotEqualContract, ValueNotEqualContractArtifact } from '../contract/artifacts/ValueNotEqual'
 import data from '../data.json'
+import { createPXEService, getPXEServiceConfig } from "@aztec/pxe/server"
+import { createStore } from "@aztec/kv-store/lmdb"
+import { getSchnorrAccount } from "@aztec/accounts/schnorr"
 
-export const setupSandbox = async (): Promise<PXE> => {
-  try {
-    console.log(`Setting up sandbox with PXE URL: ${PXE_URL}`)
-    const pxe = await createPXEClient(PXE_URL)
-    await waitForPXE(pxe)
-    console.log('PXE client created and connected successfully')
-    return pxe
-  } catch (error) {
-    console.error('Failed to setup sandbox:', error)
-    throw error
-  }
-}
-export interface TestWallets {
-  owner: AccountWalletWithSecretKey
-  user1: AccountWalletWithSecretKey
-  user2: AccountWalletWithSecretKey
-  user3: AccountWalletWithSecretKey
-}
+const sponsoredFPC = await getSponsoredFPCInstance();
+const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
 
-export const setupWallets = async (pxe: PXE): Promise<TestWallets> => {
+export const setupSandbox = async (): Promise<PXE> => {
   try {
-    console.log('Setting up test wallets')
-    const wallets = await getInitialTestAccountsWallets(pxe)
-
-    const testWallets: TestWallets = {
-      owner: wallets[0],
-      user1: wallets[1],
-      user2: wallets[2],
-      //? Here wallet[3] is always coming wallets[0], so please keep this in mind
-      user3: wallets[3] || wallets[0], // Fallback if not enough wallets
+    const nodeUrl = 'http://localhost:8080';
+    const node = await createAztecNodeClient(nodeUrl);
+    
+    try {
+        await node.getNodeInfo();
+    } catch (error) {
+        throw new Error(`Cannot connect to node at ${nodeUrl}. ${nodeUrl.includes('localhost') ? 'Please run: aztec start --sandbox' : 'Check your connection.'}`);
     }
 
-    console.log('Test wallets configured')
-    console.info('Owner address:', testWallets.owner.getAddress().toString())
-    console.info('User1 address:', testWallets.user1.getAddress().toString())
-    console.info('User2 address:', testWallets.user2.getAddress().toString())
+    const l1Contracts = await node.getL1ContractAddresses();
+    const config = getPXEServiceConfig();
+    const fullConfig = { 
+        ...config, 
+        l1Contracts, 
+        proverEnabled: true 
+    };
+
+    const store = await createStore('recursive_verification', {
+      dataDirectory: 'store',
+      dataStoreMapSizeKB: 1e6,
+    });
 
-    return testWallets
+    const pxe = await createPXEService(node, fullConfig, { store });
+    await waitForPXE(pxe);
+    await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+    
+    return pxe;
   } catch (error) {
-    console.error('Failed to setup wallets:', error)
+    console.error('Failed to setup sandbox:', error)
     throw error
   }
 }
 
+export async function deployWallet(pxe: PXE): Promise<AccountWalletWithSecretKey> {
+  let secretKey = Fr.random();
+  let signingKey = Fq.random();
+  let salt = Fr.random();
+  let schnorrAccount = await getSchnorrAccount(pxe, secretKey, signingKey, salt);
+  let tx = await schnorrAccount.deploy({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait({ timeout: 120000 });
+  let wallet = await schnorrAccount.getWallet();
+  return wallet
+}
+
 async function main() {
   const pxe = await setupSandbox();
-  const wallets = await setupWallets(pxe)
+  const wallet = await deployWallet(pxe)
 
-  const valueNotEqual = await Contract.deploy(wallets.owner, ValueNotEqualContractArtifact, [
-    10, wallets.owner.getAddress()
-  ], 'initialize').send({ from: wallets.owner.getAddress() }).deployed() as ValueNotEqualContract
+  const valueNotEqual = await Contract.deploy(wallet, ValueNotEqualContractArtifact, [
+    10, wallet.getAddress()
+  ], 'initialize').send({ from: wallet.getAddress(), fee: { paymentMethod: sponsoredPaymentMethod } }).deployed() as ValueNotEqualContract
 
   console.log("Contract Deployed at address", valueNotEqual.address.toString())
 
-  const tx = await valueNotEqual.methods.increment(wallets.owner.getAddress(), data.vkAsFields as unknown as FieldLike[], data.proofAsFields as unknown as FieldLike[], data.publicInputs as unknown as FieldLike[]).send({ from: wallets.owner.getAddress() }).wait()
+  const tx = await valueNotEqual.methods.increment(wallet.getAddress(), data.vkAsFields as unknown as FieldLike[], data.proofAsFields as unknown as FieldLike[], data.publicInputs as unknown as FieldLike[]).send({ from: wallet.getAddress(), fee: { paymentMethod: sponsoredPaymentMethod } }).wait()
 
   console.log(`Tx hash: ${tx.txHash.toString()}`)
-  const counterValue = await valueNotEqual.methods.get_counter(wallets.owner.getAddress()).simulate({ from: wallets.owner.getAddress() })
+  const counterValue = await valueNotEqual.methods.get_counter(wallet.getAddress()).simulate({ from: wallet.getAddress() })
   console.log(`Counter value: ${counterValue}`)
 }
 

recursive_verification/scripts/run_recursion.ts

@@ -0,0 +1,42 @@
+import {
+    type ContractInstanceWithAddress,
+    Fr,
+    type PXE,
+    type Wallet,
+    getContractInstanceFromInstantiationParams,
+} from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
+
+const SPONSORED_FPC_SALT = new Fr(0);
+
+export async function getSponsoredFPCInstance(): Promise<ContractInstanceWithAddress> {
+    return await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+        salt: SPONSORED_FPC_SALT,
+    });
+}
+
+export async function getSponsoredFPCAddress() {
+  return (await getSponsoredFPCInstance()).address;
+}
+
+export async function setupSponsoredFPC(deployer: Wallet, log: LogFn) {
+    const deployed = await SponsoredFPCContract.deploy(deployer)
+        .send({
+            from: deployer.getAddress(),
+            contractAddressSalt: SPONSORED_FPC_SALT,
+            universalDeploy: true,
+        })
+        .deployed();
+
+    log(`SponsoredFPC: ${deployed.address}`);
+}
+
+export async function getDeployedSponsoredFPCAddress(pxe: PXE) {
+  const fpc = await getSponsoredFPCAddress();
+  const contracts = await pxe.getContracts();
+  if (!contracts.find(c => c.equals(fpc))) {
+    throw new Error('SponsoredFPC not deployed.');
+  }
+  return fpc;
+}