update to nightly

Author: critesjosh

recursive_verification/bun.lockb

@@ -18,13 +18,14 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@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",
-    "@aztec/pxe": "^2.0.3",
+    "@aztec/accounts": "3.0.0-nightly.20251024",
+    "@aztec/aztec.js": "3.0.0-nightly.20251024",
+    "@aztec/bb.js": "3.0.0-nightly.20251024",
+    "@aztec/kv-store": "3.0.0-nightly.20251024",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251024",
+    "@aztec/noir-noir_js": "3.0.0-nightly.20251024",
+    "@aztec/pxe": "3.0.0-nightly.20251024",
+    "@aztec/test-wallet": "3.0.0-nightly.20251024",
     "add": "^2.0.6",
     "tsx": "^4.20.6"
   }

recursive_verification/data.json

@@ -10,19 +10,17 @@ const { witness: mainWitness } = await helloWorld.execute({ x: 1, y: 2 })
 
 const mainBackend = new UltraHonkBackend(circuitJson.bytecode, { threads: 1 })
 const mainProofData = await mainBackend.generateProof(mainWitness)
-const mainVerificationKey = await mainBackend.getVerificationKey()
+
+let recursiveProofArtifacts = await mainBackend.generateRecursiveProofArtifacts(mainProofData.proof, 1)
 
 const isValid = await mainBackend.verifyProof(mainProofData)
 console.log(`Proof verification: ${isValid ? 'SUCCESS' : 'FAILED'}`)
 
 const proofAsFields = deflattenFields(mainProofData.proof)
 const barretenbergAPI = await Barretenberg.new({ threads: 1 });
-const vkAsFields = (await barretenbergAPI.acirVkAsFieldsUltraHonk(mainVerificationKey))
-  .map(field => field.toString());
-
-fs.writeFileSync('data.json', JSON.stringify({ proofAsFields, vkAsFields, publicInputs: mainProofData.publicInputs }, null, 2))
 
+// write recursive proof artifacts and public inputs to file, add pu
+fs.writeFileSync('data.json', JSON.stringify({ ...recursiveProofArtifacts, publicInputs: mainProofData.publicInputs }, null, 2))
 await barretenbergAPI.destroy()
-
 console.log("Done")
 exit()

recursive_verification/package.json

@@ -1,76 +1,53 @@
-import { AccountWalletWithSecretKey, Contract, createAztecNodeClient, Fq, Fr, SponsoredFeePaymentMethod, waitForPXE, type FieldLike, type PXE } from "@aztec/aztec.js"
+import { Contract } from "@aztec/aztec.js/contracts"
+import { createAztecNodeClient } from "@aztec/aztec.js/node"
+import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee"
+import type { FieldLike } from "@aztec/aztec.js/abi"
 import { getSponsoredFPCInstance } from "./sponsored_fpc.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 export const PXE_URL = 'http://localhost:8080'
 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"
+import { getPXEConfig } from "@aztec/pxe/config"
+import { TestWallet } from '@aztec/test-wallet/server';
+import { AztecAddress } from "@aztec/aztec.js/addresses"
 
 const sponsoredFPC = await getSponsoredFPCInstance();
 const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
 
-export const setupSandbox = async (): Promise<PXE> => {
-  
+export const setupSandbox = async (): Promise<TestWallet> => {
+
   try {
     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.'}`);
-    }
-
-    const l1Contracts = await node.getL1ContractAddresses();
-    const config = getPXEServiceConfig();
-    const fullConfig = { 
-        ...config, 
-        l1Contracts, 
-        proverEnabled: true 
-    };
-
-    const store = await createStore('recursive_verification', {
-      dataDirectory: 'store',
-      dataStoreMapSizeKB: 1e6,
-    });
-
-    const pxe = await createPXEService(node, fullConfig, { store });
-    await waitForPXE(pxe);
-    await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
-    
-    return pxe;
+    const aztecNode = await createAztecNodeClient(nodeUrl);
+    const config = getPXEConfig();
+    config.dataDirectory = 'pxe';
+    config.proverEnabled = true;
+    let wallet = await TestWallet.create(aztecNode, config);
+    await wallet.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+
+    return wallet;
   } catch (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 wallet = await deployWallet(pxe)
-
-  const valueNotEqual = await Contract.deploy(wallet, ValueNotEqualContractArtifact, [
-    10, wallet.getAddress()
-  ], 'initialize').send({ from: wallet.getAddress(), fee: { paymentMethod: sponsoredPaymentMethod } }).deployed() as ValueNotEqualContract
+  const testWallet = await setupSandbox();
+  const account = await testWallet.createAccount();
+  const manager = await account.getDeployMethod();
+  await manager.send({ from: AztecAddress.ZERO, fee: { paymentMethod: sponsoredPaymentMethod } }).deployed()
+  const accounts = await testWallet.getAccounts();
 
-  console.log("Contract Deployed at address", valueNotEqual.address.toString())
+  const valueNotEqual = await Contract.deploy(testWallet, ValueNotEqualContractArtifact, [
+    10, accounts[0].item
+  ], 'initialize').send({ from: accounts[0].item, fee: { paymentMethod: sponsoredPaymentMethod } }).deployed() as ValueNotEqualContract
 
-  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()
+  const tx = await valueNotEqual.methods.increment(accounts[0].item, data.vkAsFields as unknown as FieldLike[], data.proofAsFields as unknown as FieldLike[], data.publicInputs as unknown as FieldLike[]).send({ from: accounts[0].item, fee: { paymentMethod: sponsoredPaymentMethod } }).wait()
 
   console.log(`Tx hash: ${tx.txHash.toString()}`)
-  const counterValue = await valueNotEqual.methods.get_counter(wallet.getAddress()).simulate({ from: wallet.getAddress() })
+  const counterValue = await valueNotEqual.methods.get_counter(accounts[0].item).simulate({ from: accounts[0].item })
   console.log(`Counter value: ${counterValue}`)
 }
 

recursive_verification/scripts/generate_data.ts

@@ -1,14 +1,10 @@
-import {
-    type ContractInstanceWithAddress,
-    Fr,
-    type PXE,
-    type Wallet,
-    getContractInstanceFromInstantiationParams,
-} from '@aztec/aztec.js';
+import { type ContractInstanceWithAddress, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { LogFn } from '@aztec/foundation/log';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 
-const SPONSORED_FPC_SALT = new Fr(0);
+const SPONSORED_FPC_SALT = new Fr(BigInt(0));
 
 export async function getSponsoredFPCInstance(): Promise<ContractInstanceWithAddress> {
     return await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
@@ -20,23 +16,11 @@ 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();
+export async function setupSponsoredFPC(wallet: Wallet) {
+  const instance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+    salt: new Fr(SPONSORED_FPC_SALT),
+  });
 
-    log(`SponsoredFPC: ${deployed.address}`);
+  await wallet.registerContract({ instance, artifact: SponsoredFPCContract.artifact });
+  return instance;
 }
-
-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;
-}