Refactor account deployment scripts to utilize setupWallet utility and remove PXE dependency. Update deployment logic in multiple scripts for consistency and improved clarity.

critesjosh · critesjosh · commit 0ea54b4a4fcd · 2025-10-31T13:37:03.000-04:00
diff --git a/scripts/deploy_account.ts b/scripts/deploy_account.ts
@@ -1,12 +1,10 @@
-import { createLogger, Logger } from "@aztec/aztec.js";
-import { setupPXE } from "../src/utils/setup_wallet.js";
+import { Logger, createLogger } from "@aztec/aztec.js/log";
 import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
 
 export async function deployAccount() {
     let logger: Logger;
     logger = createLogger('aztec:aztec-starter');
-    const pxe = await setupPXE();
-    await deploySchnorrAccount(pxe);
+    await deploySchnorrAccount();
 }
 
 deployAccount();
diff --git a/scripts/deploy_contract.ts b/scripts/deploy_contract.ts
@@ -1,50 +1,49 @@
 import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
-import { createLogger, PXE, Logger, SponsoredFeePaymentMethod, Fr } from "@aztec/aztec.js";
+import { Logger, createLogger } from "@aztec/aztec.js/log";
+import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
+import { Fr } from "@aztec/aztec.js/fields";
 import { TokenContract } from "@aztec/noir-contracts.js/Token"
-import { setupPXE } from "../src/utils/setup_wallet.js";
+import { setupWallet } from "../src/utils/setup_wallet.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
 import { getTimeouts } from "../config/config.js";
 
 async function main() {
-    let pxe: PXE;
     let logger: Logger;
 
     logger = createLogger('aztec:aztec-starter');
     logger.info(`🚀 Starting contract deployment process...`);
 
     const timeouts = getTimeouts();
 
-    // Setup PXE
-    logger.info('📡 Setting up PXE connection...');
-    pxe = await setupPXE();
-    const nodeInfo = await pxe.getNodeInfo();
-    logger.info(`📊 Connected to node`);
+    // Setup wallet
+    logger.info('📡 Setting up wallet...');
+    const wallet = await setupWallet();
+    logger.info(`📊 Wallet set up successfully`);
 
     // Setup sponsored FPC
     logger.info('💰 Setting up sponsored fee payment contract...');
     const sponsoredFPC = await getSponsoredFPCInstance();
     logger.info(`💰 Sponsored FPC instance obtained at: ${sponsoredFPC.address}`);
 
-    logger.info('📝 Registering sponsored FPC contract with PXE...');
-    await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+    logger.info('📝 Registering sponsored FPC contract with wallet...');
+    await wallet.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
     const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
     logger.info('✅ Sponsored fee payment method configured');
 
     // Deploy account
     logger.info('👤 Deploying Schnorr account...');
-    let accountManager = await deploySchnorrAccount(pxe);
-    const wallet = await accountManager.getWallet();
-    const address = await accountManager.getAddress();
+    let accountManager = await deploySchnorrAccount(wallet);
+    const address = accountManager.address;
     logger.info(`✅ Account deployed successfully at: ${address}`);
 
     // Deploy voting contract
     logger.info('🗳️  Starting voting contract deployment...');
     logger.info(`📋 Admin address for voting contract: ${address}`);
 
     const deployTx = PrivateVotingContract.deploy(wallet, address).send({
-        from: wallet.getAddress(),
+        from: address,
         fee: { paymentMethod: sponsoredPaymentMethod }
     });
 
@@ -61,7 +60,7 @@ async function main() {
         // Test a read operation
         logger.info('🧪 Testing contract read operation...');
         const initialVoteCount = await votingContract.methods.get_vote(Fr.fromString("1")).simulate({
-            from: wallet.getAddress()
+            from: address
         });
         logger.info(`📊 Initial vote count for candidate 1: ${initialVoteCount}`);
 
diff --git a/scripts/get_block.ts b/scripts/get_block.ts
@@ -1,12 +1,11 @@
-import { PXE } from "@aztec/aztec.js";
-import { setupPXE } from "../src/utils/setup_wallet.js";
+import { createAztecNodeClient } from "@aztec/aztec.js/node";
+import { getAztecNodeUrl } from "../config/config.js";
 
 async function main() {
 
-    let pxe: PXE;
-    pxe = await setupPXE();
-
-    let block = await pxe.getBlock(1);
+    const nodeUrl = getAztecNodeUrl();
+    const node = createAztecNodeClient(nodeUrl);
+    let block = await node.getBlock(1);
     console.log(block)
     console.log(await block?.hash())
 }
diff --git a/scripts/interaction_existing_contract.ts b/scripts/interaction_existing_contract.ts
@@ -1,7 +1,10 @@
-import { createLogger, Logger, SponsoredFeePaymentMethod, Fr, AztecAddress } from "@aztec/aztec.js";
+import { Logger, createLogger } from "@aztec/aztec.js/log";
+import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
+import { Fr } from "@aztec/aztec.js/fields";
+import { AztecAddress } from "@aztec/stdlib/aztec-address";
 import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
-import { setupPXE } from "../src/utils/setup_wallet.js";
+import { setupWallet } from "../src/utils/setup_wallet.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
 import { getAccountFromEnv } from "../src/utils/create_account_from_env.js";
 import { getTimeouts } from "../config/config.js";
@@ -12,17 +15,17 @@ async function main() {
 
     const timeouts = getTimeouts();
 
-    // Setup PXE
-    const pxe = await setupPXE();
+    // Setup wallet
+    const wallet = await setupWallet();
 
     // Setup sponsored fee payment
     const sponsoredFPC = await getSponsoredFPCInstance();
-    await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+    await wallet.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
     const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
 
     // Get account from environment variables
-    const accountManager = await getAccountFromEnv(pxe);
-    const wallet = await accountManager.getWallet();
+    const accountManager = await getAccountFromEnv(wallet);
+    const address = accountManager.address;
 
     // Connect to existing voting contract (replace with your deployed contract address)
     const contractAddress = process.env.VOTING_CONTRACT_ADDRESS;
@@ -43,15 +46,15 @@ async function main() {
     // First get_vote call - check initial vote count
     logger.info("Getting initial vote count...");
     const initialVoteCount = await votingContract.methods.get_vote(candidate).simulate({
-        from: wallet.getAddress()
+        from: address
     });
     logger.info(`Initial vote count for candidate ${candidate}: ${initialVoteCount}`);
 
     // Cast a vote
     logger.info("Casting vote...");
     await votingContract.methods.cast_vote(candidate)
         .send({
-            from: wallet.getAddress(),
+            from: address,
             fee: { paymentMethod: sponsoredPaymentMethod }
         })
         .wait({ timeout: timeouts.txTimeout });
@@ -60,7 +63,7 @@ async function main() {
     // Second get_vote call - check updated vote count
     logger.info("Getting updated vote count...");
     const updatedVoteCount = await votingContract.methods.get_vote(candidate).simulate({
-        from: wallet.getAddress()
+        from: address
     });
     logger.info(`Updated vote count for candidate ${candidate}: ${updatedVoteCount}`);
 
diff --git a/scripts/multiple_wallet.ts b/scripts/multiple_wallet.ts
@@ -1,39 +1,40 @@
-import { waitForPXE, getContractInstanceFromInstantiationParams, Fr, ContractInstanceWithAddress, AztecAddress, SponsoredFeePaymentMethod, createAztecNodeClient, Fq } from "@aztec/aztec.js";
+import { Fr, GrumpkinScalar } from "@aztec/aztec.js/fields";
+import { getContractInstanceFromInstantiationParams } from "@aztec/aztec.js/contracts";
+import { ContractInstanceWithAddress } from "@aztec/stdlib/contract";
+import { AztecAddress } from "@aztec/stdlib/aztec-address";
+import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
+import { createAztecNodeClient } from "@aztec/aztec.js/node";
 import { TokenContract } from "@aztec/noir-contracts.js/Token"
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
-import { getSchnorrAccount } from "@aztec/accounts/schnorr";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
-import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
-import { createStore } from "@aztec/kv-store/lmdb"  
+import { getPXEConfig } from "@aztec/pxe/config";
+import { createStore } from "@aztec/kv-store/lmdb"
 import { getEnv, getAztecNodeUrl } from "../config/config.js";
+import { TestWallet } from "@aztec/test-wallet/server";
 
 const nodeUrl = getAztecNodeUrl();
 const node = createAztecNodeClient(nodeUrl)
 const l1Contracts = await node.getL1ContractAddresses();
-const config = getPXEServiceConfig()
+const config = getPXEConfig()
 const fullConfig = { ...config, l1Contracts }
 fullConfig.proverEnabled = getEnv() !== 'sandbox';
 
 const store1 = await createStore('pxe1', {
     dataDirectory: 'store',
-    dataStoreMapSizeKB: 1e6,
+    dataStoreMapSizeKb: 1e6,
 });
 
 const store2 = await createStore('pxe2', {
     dataDirectory: 'store',
-    dataStoreMapSizeKB: 1e6,
+    dataStoreMapSizeKb: 1e6,
 });
 
-const setupPxe1 = async () => {
-    const pxe = await createPXEService(node, fullConfig, { store: store1 });
-    await waitForPXE(pxe);
-    return pxe;
+const setupWallet1 = async () => {
+    return await TestWallet.create(node, fullConfig, { store: store1 });
 };
 
-const setupPxe2 = async () => {
-    const pxe = await createPXEService(node, fullConfig, { store: store2 });
-    await waitForPXE(pxe);
-    return pxe;
+const setupWallet2 = async () => {
+    return await TestWallet.create(node, fullConfig, { store: store2 });
 };
 
 const L2_TOKEN_CONTRACT_SALT = Fr.random();
@@ -56,49 +57,48 @@ export async function getL2TokenContractInstance(deployerAddress: any, ownerAzte
 
 async function main() {
 
-    const pxe1 = await setupPxe1();
-    const pxe2 = await setupPxe2();
+    const wallet1 = await setupWallet1();
+    const wallet2 = await setupWallet2();
     const sponsoredFPC = await getSponsoredFPCInstance();
-    await pxe1.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
-    await pxe2.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+    await wallet1.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+    await wallet2.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
     const paymentMethod = new SponsoredFeePaymentMethod(sponsoredFPC.address);
     // deploy token contract
 
     let secretKey = Fr.random();
-    let signingKey = Fq.random();
+    let signingKey = GrumpkinScalar.random();
     let salt = Fr.random();
-    let schnorrAccount = await getSchnorrAccount(pxe1, secretKey, signingKey, salt);
-    let tx = await schnorrAccount.deploy({ fee: { paymentMethod } }).wait();
-    let ownerWallet = await schnorrAccount.getWallet();
-    let ownerAddress = ownerWallet.getAddress();
-    const token = await TokenContract.deploy(ownerWallet, ownerAddress, 'Clean USDC', 'USDC', 6).send({
+    let schnorrAccount = await wallet1.createSchnorrAccount(secretKey, salt, signingKey);
+    let tx = await (await schnorrAccount.getDeployMethod()).send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait();
+    let ownerAddress = schnorrAccount.address;
+    const token = await TokenContract.deploy(wallet1, ownerAddress, 'Clean USDC', 'USDC', 6).send({
         from: ownerAddress,
         contractAddressSalt: L2_TOKEN_CONTRACT_SALT,
         fee: { paymentMethod }
     }).wait()
 
     // setup account on 2nd pxe
 
-    await pxe2.registerSender(ownerAddress)
+    await wallet2.registerSender(ownerAddress)
 
     let secretKey2 = Fr.random();
-    let signingKey2 = Fq.random();
+    let signingKey2 = GrumpkinScalar.random();
     let salt2 = Fr.random();
-    let schnorrAccount2 = await getSchnorrAccount(pxe2, secretKey2, signingKey2, salt2);
+    let schnorrAccount2 = await wallet2.createSchnorrAccount(secretKey2, salt2, signingKey2);
 
     // deploy account on 2nd pxe
-    let tx2 = await schnorrAccount2.deploy({ fee: { paymentMethod } }).wait();
-    let wallet2 = await schnorrAccount2.getWallet();
+    let tx2 = await (await schnorrAccount2.getDeployMethod()).send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait();
+    let wallet2Address = schnorrAccount2.address;
     await wallet2.registerSender(ownerAddress)
 
     // mint to account on 2nd pxe
 
-    const private_mint_tx = await token.contract.methods.mint_to_private(schnorrAccount2.getAddress(), 100).send({
+    const private_mint_tx = await token.contract.methods.mint_to_private(schnorrAccount2.address, 100).send({
         from: ownerAddress,
         fee: { paymentMethod }
     }).wait()
-    console.log(await pxe1.getTxEffect(private_mint_tx.txHash))
-    await token.contract.methods.mint_to_public(schnorrAccount2.getAddress(), 100).send({
+    console.log(await node.getTxEffect(private_mint_tx.txHash))
+    await token.contract.methods.mint_to_public(schnorrAccount2.address, 100).send({
         from: ownerAddress,
         fee: { paymentMethod }
     }).wait()
@@ -118,20 +118,20 @@ async function main() {
     )
 
     await l2TokenContract.methods.sync_private_state().simulate({
-        from: wallet2.getAddress()
+        from: wallet2Address
     })
 
-    const notes = await pxe2.getNotes({ txHash: private_mint_tx.txHash, contractAddress: l2TokenContractInstance.address });
+    const notes = await wallet2.getNotes({ contractAddress: l2TokenContractInstance.address });
     console.log(notes)
 
     // returns 0n
-    const balance = await l2TokenContract.methods.balance_of_private(wallet2.getAddress()).simulate({
-        from: wallet2.getAddress()
+    const balance = await l2TokenContract.methods.balance_of_private(wallet2Address).simulate({
+        from: wallet2Address
     })
     console.log("private balance should be 100", balance)
     // errors
-    await l2TokenContract.methods.balance_of_public(wallet2.getAddress()).simulate({
-        from: wallet2.getAddress()
+    await l2TokenContract.methods.balance_of_public(wallet2Address).simulate({
+        from: wallet2Address
     })
 
 }
diff --git a/scripts/profile_deploy.ts b/scripts/profile_deploy.ts
@@ -1,25 +1,23 @@
 import { PrivateVotingContract } from "../src/artifacts/PrivateVoting.js"
-import { createLogger, PXE, Logger, SponsoredFeePaymentMethod, Fr } from "@aztec/aztec.js";
-import { setupPXE } from "../src/utils/setup_wallet.js";
+import { Logger, createLogger } from "@aztec/aztec.js/log";
+import { setupWallet } from "../src/utils/setup_wallet.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 import { deploySchnorrAccount } from "../src/utils/deploy_account.js";
 
 async function main() {
 
-    let pxe: PXE;
     let logger: Logger;
 
     logger = createLogger('aztec:aztec-starter');
 
-    pxe = await setupPXE();
+    const wallet = await setupWallet();
 
     const sponsoredFPC = await getSponsoredFPCInstance();
-    await pxe.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
+    await wallet.registerContract({ instance: sponsoredFPC, artifact: SponsoredFPCContract.artifact });
 
-    let accountManager = await deploySchnorrAccount(pxe);
-    const wallet = await accountManager.getWallet();
-    const address = await accountManager.getAddress();
+    let accountManager = await deploySchnorrAccount(wallet);
+    const address = accountManager.address;
 
     const profileTx = await PrivateVotingContract.deploy(wallet, address).profile({ profileMode: "full", from: address });
     console.dir(profileTx, { depth: 2 });
diff --git a/src/utils/create_account_from_env.ts b/src/utils/create_account_from_env.ts
@@ -4,14 +4,14 @@ import { AccountManager } from "@aztec/aztec.js/wallet";
 import { PXE } from "@aztec/pxe/client/bundle";
 import { setupWallet } from "./setup_wallet.js";
 import * as dotenv from 'dotenv';
+import { TestWallet } from "@aztec/test-wallet/server";
 
 // Load environment variables
 dotenv.config();
 
-export async function createAccountFromEnv(pxe: PXE): Promise<AccountManager> {
+export async function createAccountFromEnv(wallet: TestWallet): Promise<AccountManager> {
     let logger: Logger;
     logger = createLogger('aztec:create-account');
-    const wallet = await setupWallet();
 
     logger.info('🔐 Creating Schnorr account from environment variables...');
 
@@ -56,8 +56,8 @@ export async function createAccountFromEnv(pxe: PXE): Promise<AccountManager> {
     // Check if account is already deployed
     logger.info('🔍 Checking if account is already deployed...');
     try {
-        const registeredAccounts = await pxe.getRegisteredAccounts();
-        const isRegistered = registeredAccounts.some(acc => acc.address.equals(accountAddress));
+        const registeredAccounts = await wallet.getAccounts();
+        const isRegistered = registeredAccounts.some(acc => acc.item.equals(accountAddress));
 
         if (isRegistered) {
             logger.info('✅ Account is already registered with PXE');
@@ -77,6 +77,6 @@ export async function createAccountFromEnv(pxe: PXE): Promise<AccountManager> {
     return schnorrAccount;
 }
 
-export async function getAccountFromEnv(pxe: PXE): Promise<AccountManager> {
-    return await createAccountFromEnv(pxe);
+export async function getAccountFromEnv(wallet: TestWallet): Promise<AccountManager> {
+    return await createAccountFromEnv(wallet);
 } 
diff --git a/src/utils/deploy_account.ts b/src/utils/deploy_account.ts
