@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.0b941701

package/dest/simulators/lending_simulator.js

@@ -1,6 +1,8 @@
 // Convenience struct to hold an account's address and secret that can easily be passed around.
-import { AztecAddress, Fr } from '@aztec/aztec.js';
-import { pedersenHash } from '@aztec/foundation/crypto';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
 /**
  * Contains utilities to compute the "key" for private holdings in the public state.
  */ export class LendingAccount {
@@ -14,7 +16,7 @@ import { pedersenHash } from '@aztec/foundation/crypto';
    * Computes the key for the private holdings of this account.
    * @returns Key in public space
    */ key() {
-        return pedersenHash([
+        return poseidon2Hash([
             this.address,
             this.secret
         ]);
@@ -76,23 +78,16 @@ const computeMultiplier = (rate, dt)=>{
     }
     async prepare() {
         this.accumulator = BASE;
-        const slot = await this.rollup.read.getSlotAt([
-            BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration)
-        ]);
-        this.time = Number(await this.rollup.read.getTimestampForSlot([
-            slot
-        ]));
+        const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration));
+        this.time = Number(await this.rollup.getTimestampForSlot(slot));
     }
     async progressSlots(diff, dateProvider) {
         if (diff <= 1) {
             return;
         }
-        const slot = await this.rollup.read.getSlotAt([
-            BigInt(await this.cc.eth.timestamp())
-        ]);
-        const ts = Number(await this.rollup.read.getTimestampForSlot([
-            slot + BigInt(diff)
-        ]));
+        const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()));
+        const targetSlot = SlotNumber(slot + diff);
+        const ts = Number(await this.rollup.getTimestampForSlot(targetSlot));
         const timeDiff = ts - this.time;
         this.time = ts;
         // Mine ethereum blocks such that the next block will be in a new slot
@@ -100,7 +95,7 @@ const computeMultiplier = (rate, dt)=>{
         if (dateProvider) {
             dateProvider.setTime(this.time * 1000);
         }
-        await this.cc.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
+        await this.cc.rollup.markAsProven(await this.rollup.getCheckpointNumber());
         this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
     }
     depositPrivate(from, onBehalfOf, amount) {
@@ -157,7 +152,9 @@ const computeMultiplier = (rate, dt)=>{
         const totalCollateral = Object.values(this.collateral).reduce((a, b)=>new Fr(a.value + b.value), Fr.ZERO);
         expect(totalCollateral).toEqual(new Fr(this.collateralAsset.balanceOfPublic(this.lendingContract.address)));
         expect(this.borrowed).toEqual(this.stableCoin.totalSupply - this.mintedOutside);
-        const asset = await this.lendingContract.methods.get_asset(0).simulate();
+        const asset = await this.lendingContract.methods.get_asset(0).simulate({
+            from: this.account.address
+        });
         const interestAccumulator = asset['interest_accumulator'];
         expect(interestAccumulator).toEqual(this.accumulator);
         expect(asset['last_updated_ts']).toEqual(BigInt(this.time));
@@ -165,7 +162,9 @@ const computeMultiplier = (rate, dt)=>{
             this.account.address,
             AztecAddress.fromField(await this.account.key())
         ]){
-            const privatePos = await this.lendingContract.methods.get_position(key).simulate();
+            const privatePos = await this.lendingContract.methods.get_position(key).simulate({
+                from: this.account.address
+            });
             expect(new Fr(privatePos['collateral'])).toEqual(this.collateral[key.toString()] ?? Fr.ZERO);
             expect(new Fr(privatePos['static_debt'])).toEqual(this.staticDebt[key.toString()] ?? Fr.ZERO);
             expect(privatePos['debt']).toEqual(muldivUp((this.staticDebt[key.toString()] ?? Fr.ZERO).value, this.accumulator, BASE));

package/dest/simulators/token_simulator.d.ts

@@ -1,15 +1,18 @@
-import { type AztecAddress, type Logger, type Wallet } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 export declare class TokenSimulator {
     protected token: TokenContract;
     protected defaultWallet: Wallet;
+    protected defaultAddress: AztecAddress;
     protected logger: Logger;
     protected accounts: AztecAddress[];
     private balancesPrivate;
     private balancePublic;
     totalSupply: bigint;
     private lookupProvider;
-    constructor(token: TokenContract, defaultWallet: Wallet, logger: Logger, accounts: AztecAddress[]);
+    constructor(token: TokenContract, defaultWallet: Wallet, defaultAddress: AztecAddress, logger: Logger, accounts: AztecAddress[]);
     addAccount(account: AztecAddress): void;
     setLookupProvider(account: AztecAddress, wallet: Wallet): void;
     mintPrivate(to: AztecAddress, amount: bigint): void;
@@ -26,4 +29,4 @@ export declare class TokenSimulator {
     checkPrivate(): Promise<void>;
     check(): Promise<void>;
 }
-//# sourceMappingURL=token_simulator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fc2ltdWxhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2ltdWxhdG9ycy90b2tlbl9zaW11bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJcEUscUJBQWEsY0FBYztJQVF2QixTQUFTLENBQUMsS0FBSyxFQUFFLGFBQWE7SUFDOUIsU0FBUyxDQUFDLGFBQWEsRUFBRSxNQUFNO0lBQy9CLFNBQVMsQ0FBQyxjQUFjLEVBQUUsWUFBWTtJQUN0QyxTQUFTLENBQUMsTUFBTSxFQUFFLE1BQU07SUFDeEIsU0FBUyxDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUU7SUFYcEMsT0FBTyxDQUFDLGVBQWUsQ0FBa0M7SUFDekQsT0FBTyxDQUFDLGFBQWEsQ0FBa0M7SUFDaEQsV0FBVyxFQUFFLE1BQU0sQ0FBTTtJQUVoQyxPQUFPLENBQUMsY0FBYyxDQUFrQztJQUV4RCxZQUNZLEtBQUssRUFBRSxhQUFhLEVBQ3BCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLGNBQWMsRUFBRSxZQUFZLEVBQzVCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsUUFBUSxFQUFFLFlBQVksRUFBRSxFQUNoQztJQUVHLFVBQVUsQ0FBQyxPQUFPLEVBQUUsWUFBWSxRQUV0QztJQUVNLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFFN0Q7SUFFTSxXQUFXLENBQUMsRUFBRSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUdsRDtJQUVNLFVBQVUsQ0FBQyxFQUFFLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBSWpEO0lBRU0sY0FBYyxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSxRQU96RTtJQUVNLGVBQWUsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFPMUU7SUFFTSxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFNNUU7SUFFTSxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFNM0U7SUFFTSxXQUFXLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSxRQU1wRDtJQUVNLFVBQVUsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBTW5EO0lBRU0sZUFBZSxDQUFDLE9BQU8sRUFBRSxZQUFZLFVBRTNDO0lBRU0sZ0JBQWdCLENBQUMsT0FBTyxFQUFFLFlBQVksVUFFNUM7SUFFSyxXQUFXLGtCQWtCaEI7SUFFSyxZQUFZLGtCQW9DakI7SUFFWSxLQUFLLGtCQUdqQjtDQUNGIn0=

package/dest/simulators/token_simulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/token_simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAa,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,qBAAa,cAAc;IAQvB,SAAS,CAAC,KAAK,EAAE,aAAa;IAC9B,SAAS,CAAC,aAAa,EAAE,MAAM;IAC/B,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE;IAVpC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IAChD,WAAW,EAAE,MAAM,CAAM;IAEhC,OAAO,CAAC,cAAc,CAAkC;gBAG5C,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EAAE;IAG7B,UAAU,CAAC,OAAO,EAAE,YAAY;IAIhC,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIvD,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAK5C,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASnE,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASpE,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQtE,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQrE,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ9C,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ7C,eAAe,CAAC,OAAO,EAAE,YAAY;IAIrC,gBAAgB,CAAC,OAAO,EAAE,YAAY;IAIvC,WAAW;IAkBX,YAAY;IAmCL,KAAK;CAInB"}
+{"version":3,"file":"token_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/token_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,qBAAa,cAAc;IAQvB,SAAS,CAAC,KAAK,EAAE,aAAa;IAC9B,SAAS,CAAC,aAAa,EAAE,MAAM;IAC/B,SAAS,CAAC,cAAc,EAAE,YAAY;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE;IAXpC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IAChD,WAAW,EAAE,MAAM,CAAM;IAEhC,OAAO,CAAC,cAAc,CAAkC;IAExD,YACY,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,YAAY,EAC5B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EAAE,EAChC;IAEG,UAAU,CAAC,OAAO,EAAE,YAAY,QAEtC;IAEM,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAE7D;IAEM,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAGlD;IAEM,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAIjD;IAEM,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAOzE;IAEM,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAO1E;IAEM,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAM5E;IAEM,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAM3E;IAEM,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAMpD;IAEM,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAMnD;IAEM,eAAe,CAAC,OAAO,EAAE,YAAY,UAE3C;IAEM,gBAAgB,CAAC,OAAO,EAAE,YAAY,UAE5C;IAEK,WAAW,kBAkBhB;IAEK,YAAY,kBAoCjB;IAEY,KAAK,kBAGjB;CACF"}

package/dest/simulators/token_simulator.js

@@ -1,17 +1,19 @@
-/* eslint-disable jsdoc/require-jsdoc */ import { BatchCall } from '@aztec/aztec.js';
+import { BatchCall } from '@aztec/aztec.js/contracts';
 import chunk from 'lodash.chunk';
 export class TokenSimulator {
     token;
     defaultWallet;
+    defaultAddress;
     logger;
     accounts;
     balancesPrivate;
     balancePublic;
     totalSupply;
     lookupProvider;
-    constructor(token, defaultWallet, logger, accounts){
+    constructor(token, defaultWallet, defaultAddress, logger, accounts){
         this.token = token;
         this.defaultWallet = defaultWallet;
+        this.defaultAddress = defaultAddress;
         this.logger = logger;
         this.accounts = accounts;
         this.balancesPrivate = new Map();
@@ -83,12 +85,12 @@ export class TokenSimulator {
     async checkPublic() {
         // public calls
         const calls = [
-            await this.token.methods.total_supply().request()
+            this.token.methods.total_supply(),
+            ...this.accounts.map((address)=>this.token.methods.balance_of_public(address))
         ];
-        for (const address of this.accounts){
-            calls.push(await this.token.methods.balance_of_public(address).request());
-        }
-        const results = (await Promise.all(chunk(calls, 4).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate()))).flat();
+        const results = (await Promise.all(chunk(calls, 5).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate({
+                from: this.defaultAddress
+            })))).flat();
         expect(results[0]).toEqual(this.totalSupply);
         // Check that all our balances match
         for(let i = 0; i < this.accounts.length; i++){
@@ -106,11 +108,10 @@ export class TokenSimulator {
                 defaultLookups.push(address);
             }
         }
-        const defaultCalls = [];
-        for (const address of defaultLookups){
-            defaultCalls.push(await this.token.methods.balance_of_private(address).request());
-        }
-        const results = (await Promise.all(chunk(defaultCalls, 4).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate()))).flat();
+        const defaultCalls = defaultLookups.map((address)=>this.token.methods.balance_of_private(address));
+        const results = (await Promise.all(chunk(defaultCalls, 4).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate({
+                from: this.defaultAddress
+            })))).flat();
         for(let i = 0; i < defaultLookups.length; i++){
             expect(results[i]).toEqual(this.balanceOfPrivate(defaultLookups[i]));
         }
@@ -121,7 +122,9 @@ export class TokenSimulator {
             const asset = wallet ? this.token.withWallet(wallet) : this.token;
             const actualPrivateBalance = await asset.methods.balance_of_private({
                 address
-            }).simulate();
+            }).simulate({
+                from: this.defaultAddress
+            });
             expect(actualPrivateBalance).toEqual(this.balanceOfPrivate(address));
         }
     }

package/dest/spartan/setup_test_wallets.d.ts

@@ -1,20 +1,36 @@
-import { type AccountWalletWithSecretKey, type AztecAddress, type PXE } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type FeePaymentMethod } from '@aztec/aztec.js/fee';
+import { type AztecNode } from '@aztec/aztec.js/node';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-export interface TestWallets {
-    pxe: PXE;
-    wallets: AccountWalletWithSecretKey[];
-    tokenAdminWallet: TokenContract;
+import { TestWallet } from '@aztec/test-wallet/server';
+export interface TestAccounts {
+    aztecNode: AztecNode;
+    wallet: TestWallet;
+    accounts: AztecAddress[];
+    tokenContract: TokenContract;
+    tokenAdminAddress: AztecAddress;
     tokenName: string;
-    recipientWallet: AccountWalletWithSecretKey;
+    recipientAddress: AztecAddress;
     tokenAddress: AztecAddress;
 }
-export declare function setupTestWalletsWithTokens(pxeUrl: string, mintAmount: bigint, logger: Logger): Promise<TestWallets>;
-export declare function deployTestWalletWithTokens(pxeUrl: string, nodeUrl: string, l1RpcUrl: string, mnemonicOrPrivateKey: string, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number, initialFeeJuice?: bigint): Promise<TestWallets>;
-export declare function performTransfers({ testWallets, rounds, transferAmount, logger, }: {
-    testWallets: TestWallets;
+export type TestAccountsWithoutTokens = Omit<TestAccounts, 'tokenAddress' | 'tokenContract' | 'tokenName' | 'tokenAdminAddress'>;
+export declare function setupTestAccountsWithTokens(nodeUrl: string, mintAmount: bigint, logger: Logger): Promise<TestAccounts>;
+export declare function deploySponsoredTestAccountsWithTokens(wallet: TestWallet, aztecNode: AztecNode, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number): Promise<TestAccounts>;
+export declare function deploySponsoredTestAccounts(wallet: TestWallet, aztecNode: AztecNode, logger: Logger, numberOfFundedWallets?: number): Promise<TestAccountsWithoutTokens>;
+export declare function deployTestAccountsWithTokens(nodeUrl: string, l1RpcUrls: string[], mnemonicOrPrivateKey: string, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number): Promise<TestAccounts>;
+export declare function performTransfers({ wallet, testAccounts, rounds, transferAmount, logger, feePaymentMethod }: {
+    wallet: TestWallet;
+    testAccounts: TestAccounts;
     rounds: number;
     transferAmount: bigint;
     logger: Logger;
+    feePaymentMethod?: FeePaymentMethod;
 }): Promise<void>;
-//# sourceMappingURL=setup_test_wallets.d.ts.map
+export type WalletWrapper = {
+    wallet: TestWallet;
+    aztecNode: AztecNode;
+    cleanup: () => Promise<void>;
+};
+export declare function createWalletAndAztecNodeClient(nodeUrl: string, proverEnabled: boolean, logger: Logger): Promise<WalletWrapper>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfdGVzdF93YWxsZXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3BhcnRhbi9zZXR1cF90ZXN0X3dhbGxldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXpELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUE2QixNQUFNLHFCQUFxQixDQUFDO0FBRXZGLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBb0MsTUFBTSxzQkFBc0IsQ0FBQztBQUl4RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFL0QsT0FBTyxFQUFFLFVBQVUsRUFBaUUsTUFBTSwyQkFBMkIsQ0FBQztBQU10SCxNQUFNLFdBQVcsWUFBWTtJQUMzQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ3pCLGFBQWEsRUFBRSxhQUFhLENBQUM7SUFDN0IsaUJBQWlCLEVBQUUsWUFBWSxDQUFDO0lBQ2hDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZ0JBQWdCLEVBQUUsWUFBWSxDQUFDO0lBQy9CLFlBQVksRUFBRSxZQUFZLENBQUM7Q0FDNUI7QUFFRCxNQUFNLE1BQU0seUJBQXlCLEdBQUcsSUFBSSxDQUMxQyxZQUFZLEVBQ1osY0FBYyxHQUFHLGVBQWUsR0FBRyxXQUFXLEdBQUcsbUJBQW1CLENBQ3JFLENBQUM7QUFNRix3QkFBc0IsMkJBQTJCLENBQy9DLE9BQU8sRUFBRSxNQUFNLEVBQ2YsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsWUFBWSxDQUFDLENBeUJ2QjtBQUVELHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLFVBQVUsRUFDbEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxxQkFBcUIsU0FBSSxHQUN4QixPQUFPLENBQUMsWUFBWSxDQUFDLENBdUN2QjtBQW1ERCx3QkFBc0IsMkJBQTJCLENBQy9DLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QscUJBQXFCLFNBQUksR0FDeEIsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBa0JwQztBQUVELHdCQUFzQiw0QkFBNEIsQ0FDaEQsT0FBTyxFQUFFLE1BQU0sRUFDZixTQUFTLEVBQUUsTUFBTSxFQUFFLEVBQ25CLG9CQUFvQixFQUFFLE1BQU0sRUFDNUIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxxQkFBcUIsU0FBSSxHQUN4QixPQUFPLENBQUMsWUFBWSxDQUFDLENBK0N2QjtBQWlGRCx3QkFBc0IsZ0JBQWdCLENBQUMsRUFDckMsTUFBTSxFQUNOLFlBQVksRUFDWixNQUFNLEVBQ04sY0FBYyxFQUNkLE1BQU0sRUFDTixnQkFBZ0IsRUFDakIsRUFBRTtJQUNELE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsZ0JBQWdCLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztDQUNyQyxpQkFxQkE7QUFFRCxNQUFNLE1BQU0sYUFBYSxHQUFHO0lBQzFCLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDOUIsQ0FBQztBQUVGLHdCQUFzQiw4QkFBOEIsQ0FDbEQsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsT0FBTyxFQUN0QixNQUFNLEVBQUUsTUFBTSxHQUNiLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FxQnhCIn0=

package/dest/spartan/setup_test_wallets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAKjB,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,gBAAgB,EAAE,aAAa,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,0BAA0B,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAYtB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,EACzB,eAAe,SAAa,GAC3B,OAAO,CAAC,WAAW,CAAC,CAsCtB;AA2DD,wBAAsB,gBAAgB,CAAC,EACrC,WAAW,EACX,MAAM,EACN,cAAc,EACd,MAAM,GACP,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAkBA"}
+{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,EAAE,KAAK,gBAAgB,EAA6B,MAAM,qBAAqB,CAAC;AAEvF,OAAO,EAAE,KAAK,SAAS,EAAoC,MAAM,sBAAsB,CAAC;AAIxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAiE,MAAM,2BAA2B,CAAC;AAMtH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,YAAY,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,YAAY,EACZ,cAAc,GAAG,eAAe,GAAG,WAAW,GAAG,mBAAmB,CACrE,CAAC;AAMF,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAyBvB;AAED,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAuCvB;AAmDD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,yBAAyB,CAAC,CAkBpC;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CA+CvB;AAiFD,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EACN,YAAY,EACZ,MAAM,EACN,cAAc,EACd,MAAM,EACN,gBAAgB,EACjB,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,iBAqBA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CAqBxB"}

package/dest/spartan/setup_test_wallets.js

@@ -1,99 +1,270 @@
-import { getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
-import { generateSchnorrAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
-import { FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, createAztecNodeClient, createCompatibleClient, retryUntil } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { generateSchnorrAccounts } from '@aztec/accounts/testing';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
+import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
+import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createAztecNodeClient, waitForTx } from '@aztec/aztec.js/node';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { retryUntil } from '@aztec/foundation/retry';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TestWallet, proveInteraction, registerInitialLocalNetworkAccountsInWallet } from '@aztec/test-wallet/server';
+import { getACVMConfig } from '../fixtures/get_acvm_config.js';
+import { getBBConfig } from '../fixtures/get_bb_config.js';
+import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
 const TOKEN_NAME = 'USDC';
 const TOKEN_SYMBOL = 'USD';
 const TOKEN_DECIMALS = 18n;
-export async function setupTestWalletsWithTokens(pxeUrl, mintAmount, logger) {
-    const WALLET_COUNT = 1; // TODO fix this to allow for 16 wallets again
-    const pxe = await createCompatibleClient(pxeUrl, logger);
-    const [recipientWallet, ...wallets] = (await getDeployedTestAccountsWallets(pxe)).slice(0, WALLET_COUNT + 1);
-    const tokenAdmin = wallets[0];
-    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, logger);
-    const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
+export async function setupTestAccountsWithTokens(nodeUrl, mintAmount, logger) {
+    const ACCOUNT_COUNT = 1; // TODO fix this to allow for 16 wallets again
+    const aztecNode = createAztecNodeClient(nodeUrl);
+    const wallet = await TestWallet.create(aztecNode);
+    const [recipientAccount, ...accounts] = (await registerInitialLocalNetworkAccountsInWallet(wallet)).slice(0, ACCOUNT_COUNT + 1);
+    const tokenAdmin = accounts[0];
+    const tokenAddress = await deployTokenAndMint(wallet, accounts, tokenAdmin, mintAmount, undefined, logger);
+    const tokenContract = TokenContract.at(tokenAddress, wallet);
     return {
-        pxe,
-        wallets,
-        tokenAdminWallet,
+        aztecNode,
+        accounts,
+        wallet,
+        tokenAdminAddress: tokenAdmin,
         tokenName: TOKEN_NAME,
         tokenAddress,
-        recipientWallet
+        tokenContract,
+        recipientAddress: recipientAccount
     };
 }
-export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrl, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1, initialFeeJuice = 10n ** 22n) {
-    const pxe = await createCompatibleClient(pxeUrl, logger);
-    const node = createAztecNodeClient(nodeUrl);
+export async function deploySponsoredTestAccountsWithTokens(wallet, aztecNode, mintAmount, logger, numberOfFundedWallets = 1) {
     const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
-    const recipientWallet = await getSchnorrWalletWithSecretKey(pxe, recipient.secret, recipient.signingKey, recipient.salt);
-    const fundedAccounts = await Promise.all(funded.map((a)=>getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
-    const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrl, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger)));
-    // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
-    await advanceL2Block(node);
-    await advanceL2Block(node);
-    const wallets = await Promise.all(fundedAccounts.map(async (a, i)=>{
-        const wallet = await a.getWallet();
-        const paymentMethod = new FeeJuicePaymentMethodWithClaim(wallet, claims[i]);
-        await a.deploy({
+    const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
+    const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
+    await registerSponsoredFPC(wallet);
+    const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
+    const recipientDeployMethod = await recipientAccount.getDeployMethod();
+    await recipientDeployMethod.send({
+        from: AztecAddress.ZERO,
+        fee: {
+            paymentMethod
+        },
+        wait: {
+            timeout: 2400
+        }
+    });
+    await Promise.all(fundedAccounts.map(async (a)=>{
+        const deployMethod = await a.getDeployMethod();
+        await deployMethod.send({
+            from: AztecAddress.ZERO,
+            fee: {
+                paymentMethod
+            },
+            wait: {
+                timeout: 2400
+            }
+        }); // increase timeout on purpose in order to account for two empty epochs
+        logger.info(`Account deployed at ${a.address}`);
+    }));
+    const tokenAdmin = fundedAccounts[0];
+    const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()), logger);
+    const tokenContract = TokenContract.at(tokenAddress, wallet);
+    return {
+        aztecNode,
+        wallet,
+        accounts: fundedAccounts.map((acc)=>acc.address),
+        tokenAdminAddress: tokenAdmin.address,
+        tokenName: TOKEN_NAME,
+        tokenAddress,
+        tokenContract,
+        recipientAddress: recipientAccount.address
+    };
+}
+async function deployAccountWithDiagnostics(account, paymentMethod, aztecNode, logger, accountLabel) {
+    const deployMethod = await account.getDeployMethod();
+    let txHash;
+    try {
+        txHash = await deployMethod.send({
+            from: AztecAddress.ZERO,
+            fee: {
+                paymentMethod
+            },
+            wait: NO_WAIT
+        });
+        await waitForTx(aztecNode, txHash, {
+            timeout: 2400
+        });
+        logger.info(`${accountLabel} deployed at ${account.address}`);
+    } catch (error) {
+        const blockNumber = await aztecNode.getBlockNumber();
+        let receipt;
+        try {
+            receipt = await aztecNode.getTxReceipt(txHash);
+        } catch  {
+            receipt = 'unavailable';
+        }
+        logger.error(`${accountLabel} deployment failed`, {
+            txHash: txHash.toString(),
+            receipt: JSON.stringify(receipt),
+            currentBlockNumber: blockNumber,
+            error: String(error)
+        });
+        throw error;
+    }
+}
+async function deployAccountsInBatches(accounts, paymentMethod, aztecNode, logger, labelPrefix, batchSize = 2) {
+    for(let i = 0; i < accounts.length; i += batchSize){
+        const batch = accounts.slice(i, i + batchSize);
+        await Promise.all(batch.map((account, idx)=>deployAccountWithDiagnostics(account, paymentMethod, aztecNode, logger, `${labelPrefix}${i + idx + 1}`)));
+    }
+}
+export async function deploySponsoredTestAccounts(wallet, aztecNode, logger, numberOfFundedWallets = 1) {
+    const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
+    const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
+    const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
+    await registerSponsoredFPC(wallet);
+    const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
+    await deployAccountWithDiagnostics(recipientAccount, paymentMethod, aztecNode, logger, 'Recipient account');
+    await deployAccountsInBatches(fundedAccounts, paymentMethod, aztecNode, logger, 'Funded account ', 2);
+    return {
+        aztecNode,
+        wallet,
+        accounts: fundedAccounts.map((acc)=>acc.address),
+        recipientAddress: recipientAccount.address
+    };
+}
+export async function deployTestAccountsWithTokens(nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1) {
+    const aztecNode = createAztecNodeClient(nodeUrl);
+    const wallet = await TestWallet.create(aztecNode);
+    const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
+    const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
+    const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
+    const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, a.address, undefined, logger)));
+    // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+    await advanceL2Block(aztecNode);
+    await advanceL2Block(aztecNode);
+    await advanceL2Block(aztecNode);
+    await Promise.all(fundedAccounts.map(async (a, i)=>{
+        const paymentMethod = new FeeJuicePaymentMethodWithClaim(a.address, claims[i]);
+        const deployMethod = await a.getDeployMethod();
+        await deployMethod.send({
+            from: AztecAddress.ZERO,
             fee: {
                 paymentMethod
             }
-        }).wait();
-        logger.info(`Account deployed at ${a.getAddress()}`);
-        return wallet;
+        });
+        logger.info(`Account deployed at ${a.address}`);
     }));
-    const tokenAdmin = wallets[0];
-    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, logger);
-    const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
+    const tokenAdmin = fundedAccounts[0];
+    const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, undefined, logger);
+    const tokenContract = TokenContract.at(tokenAddress, wallet);
     return {
-        pxe,
-        wallets,
-        tokenAdminWallet,
+        aztecNode,
+        wallet,
+        accounts: fundedAccounts.map((acc)=>acc.address),
+        tokenAdminAddress: tokenAdmin.address,
         tokenName: TOKEN_NAME,
         tokenAddress,
-        recipientWallet
+        tokenContract,
+        recipientAddress: recipientAccount.address
     };
 }
-async function bridgeL1FeeJuice(l1RpcUrl, mnemonicOrPrivateKey, pxe, recipient, amount, log) {
-    const { l1ChainId } = await pxe.getNodeInfo();
-    const chain = createEthereumChain([
-        l1RpcUrl
-    ], l1ChainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
-    const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
+async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, recipient, amount, log) {
+    const { l1ChainId } = await aztecNode.getNodeInfo();
+    const chain = createEthereumChain(l1RpcUrls, l1ChainId);
+    const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+    const portal = await L1FeeJuicePortalManager.new(aztecNode, l1Client, log);
     const claim = await portal.bridgeTokensPublic(recipient, amount, true);
-    const isSynced = async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
+    const isSynced = async ()=>await aztecNode.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash)) !== undefined;
     await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
     log.info(`Created a claim for ${amount} L1 fee juice to ${recipient}.`, claim);
     return claim;
 }
-async function advanceL2Block(node) {
-    const initialBlockNumber = await node.getBlockNumber();
-    await node.flushTxs();
-    await retryUntil(async ()=>await node.getBlockNumber() >= initialBlockNumber + 1);
+async function advanceL2Block(aztecNode, nodeAdmin) {
+    const initialBlockNumber = await aztecNode.getBlockNumber();
+    let minTxsPerBlock = undefined;
+    if (nodeAdmin) {
+        ({ minTxsPerBlock } = await nodeAdmin.getConfig());
+        await nodeAdmin.setConfig({
+            minTxsPerBlock: 0
+        }); // Set to 0 to ensure we can advance the block
+    }
+    await retryUntil(async ()=>await aztecNode.getBlockNumber() >= initialBlockNumber + 1);
+    if (nodeAdmin && minTxsPerBlock !== undefined) {
+        await nodeAdmin.setConfig({
+            minTxsPerBlock
+        });
+    }
 }
-async function deployTokenAndMint(wallets, admin, mintAmount, logger) {
+async function deployTokenAndMint(wallet, accounts, admin, mintAmount, paymentMethod, logger) {
     logger.verbose(`Deploying TokenContract...`);
-    const tokenContract = await TokenContract.deploy(wallets[0], admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS).send().deployed({
-        timeout: 600
+    const { contract: tokenContract } = await TokenContract.deploy(wallet, admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS).send({
+        from: admin,
+        fee: {
+            paymentMethod
+        },
+        wait: {
+            timeout: 600,
+            returnReceipt: true
+        }
     });
     const tokenAddress = tokenContract.address;
-    logger.verbose(`Minting ${mintAmount} public assets to the ${wallets.length} wallets...`);
-    await Promise.all(wallets.map(async (w)=>(await TokenContract.at(tokenAddress, w)).methods.mint_to_public(w.getAddress(), mintAmount).send().wait({
-            timeout: 600
+    logger.verbose(`Minting ${mintAmount} public assets to the ${accounts.length} accounts...`);
+    await Promise.all(accounts.map((acc)=>TokenContract.at(tokenAddress, wallet).methods.mint_to_public(acc, mintAmount).send({
+            from: admin,
+            fee: {
+                paymentMethod
+            },
+            wait: {
+                timeout: 600
+            }
         })));
     logger.verbose(`Minting complete.`);
     return tokenAddress;
 }
-export async function performTransfers({ testWallets, rounds, transferAmount, logger }) {
-    const recipient = testWallets.recipientWallet.getAddress();
+export async function performTransfers({ wallet, testAccounts, rounds, transferAmount, logger, feePaymentMethod }) {
+    const recipient = testAccounts.recipientAddress;
+    // Default to sponsored fee payment if no fee method is provided
+    const defaultFeePaymentMethod = feePaymentMethod || new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
     for(let i = 0; i < rounds; i++){
-        const interactions = await Promise.all(testWallets.wallets.map(async (w)=>(await TokenContract.at(testWallets.tokenAddress, w)).methods.transfer_in_public(w.getAddress(), recipient, transferAmount, 0)));
-        const txs = await Promise.all(interactions.map(async (i)=>await i.prove()));
-        await Promise.all(txs.map((t)=>t.send().wait({
-                timeout: 600
+        const txs = testAccounts.accounts.map((acc)=>{
+            const token = TokenContract.at(testAccounts.tokenAddress, testAccounts.wallet);
+            return proveInteraction(wallet, token.methods.transfer_in_public(acc, recipient, transferAmount, 0), {
+                from: acc,
+                fee: {
+                    paymentMethod: defaultFeePaymentMethod
+                }
+            });
+        });
+        const provenTxs = await Promise.all(txs);
+        await Promise.all(provenTxs.map((t)=>t.send({
+                wait: {
+                    timeout: 600
+                }
             })));
         logger.info(`Completed round ${i + 1} / ${rounds}`);
     }
 }
+export async function createWalletAndAztecNodeClient(nodeUrl, proverEnabled, logger) {
+    const aztecNode = createAztecNodeClient(nodeUrl);
+    const [bbConfig, acvmConfig] = await Promise.all([
+        getBBConfig(logger),
+        getACVMConfig(logger)
+    ]);
+    const pxeConfig = {
+        dataDirectory: undefined,
+        dataStoreMapSizeKb: 1024 * 1024,
+        ...bbConfig,
+        ...acvmConfig,
+        proverEnabled
+    };
+    const wallet = await TestWallet.create(aztecNode, pxeConfig);
+    return {
+        wallet,
+        aztecNode,
+        async cleanup () {
+            await wallet.stop();
+            await bbConfig?.cleanup();
+            await acvmConfig?.cleanup();
+        }
+    };
+}