@aztec/end-to-end 3.0.0-nightly.20251001 → 3.0.0-nightly.20251002

package/dest/bench/client_flows/client_flows_benchmark.d.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, type AztecNode, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, type FeePaymentMethod, type Logger, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
+import { type AppConfigurableFeePaymentMethod, AztecAddress, type AztecNode, FeeJuicePaymentMethodWithClaim, type Logger, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type DeployL1ContractsArgs } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -15,7 +15,7 @@ import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js'
 import { type GasBridgingTestHarness } from '../../shared/gas_portal_test_harness.js';
 import { type ClientFlowsConfig } from './config.js';
 export type AccountType = 'ecdsar1' | 'schnorr';
-export type FeePaymentMethodGetter = (wallet: Wallet, sender: AztecAddress) => Promise<FeePaymentMethod>;
+export type FeePaymentMethodGetter = (wallet: Wallet, sender: AztecAddress) => Promise<AppConfigurableFeePaymentMethod | undefined>;
 export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 export declare class ClientFlowsBenchmark {
     private snapshotManager;
@@ -64,6 +64,5 @@ export declare class ClientFlowsBenchmark {
     getBridgedFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress): Promise<FeeJuicePaymentMethodWithClaim>;
     getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress): Promise<PrivateFeePaymentMethod>;
     getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet, _sender: AztecAddress): Promise<SponsoredFeePaymentMethod>;
-    getFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress): Promise<FeeJuicePaymentMethod>;
 }
 //# sourceMappingURL=client_flows_benchmark.d.ts.map

package/dest/bench/client_flows/client_flows_benchmark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}

package/dest/bench/client_flows/client_flows_benchmark.js

@@ -1,4 +1,4 @@
-import { FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
 import { RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -14,6 +14,7 @@ import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contract
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { getPXEConfig } from '@aztec/pxe/server';
+import { GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { TestWallet } from '@aztec/test-wallet/server';
 import { MNEMONIC } from '../../fixtures/fixtures.js';
@@ -79,7 +80,7 @@ export class ClientFlowsBenchmark {
         },
         // eslint-disable-next-line camelcase
         fee_juice: {
-            forWallet: this.getFeeJuicePaymentMethodForWallet.bind(this),
+            forWallet: ()=>Promise.resolve(undefined),
             circuits: 0
         }
     };
@@ -250,12 +251,13 @@ export class ClientFlowsBenchmark {
     async createAndFundBenchmarkingAccountOnUserWallet(accountType) {
         const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
         const benchysAccount = await benchysAccountManager.getAccount();
-        const benchysAddress = benchysAccountManager.getAddress();
+        const benchysAddress = benchysAccountManager.address;
         const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
-        const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysAddress, claim);
-        await benchysAccountManager.deploy({
+        const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
+        await behchysDeployMethod.send({
+            from: AztecAddress.ZERO,
             fee: {
-                paymentMethod
+                paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim)
             }
         }).wait();
         // Register benchy on the user's Wallet, where we're going to be interacting from
@@ -264,7 +266,7 @@ export class ClientFlowsBenchmark {
             salt: new Fr(benchysAccount.salt),
             contract: benchysAccountManager.getAccountContract()
         });
-        return accountManager.getAddress();
+        return accountManager.address;
     }
     async applyDeployAmmSnapshot() {
         await this.snapshotManager.snapshot('deploy_amm', async ()=>{
@@ -291,13 +293,16 @@ export class ClientFlowsBenchmark {
         const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(sender);
         return new FeeJuicePaymentMethodWithClaim(sender, claim);
     }
-    getPrivateFPCPaymentMethodForWallet(wallet, sender) {
-        return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet));
+    async getPrivateFPCPaymentMethodForWallet(wallet, sender) {
+        // The private fee paying method assembled on the app side requires knowledge of the maximum
+        // fee the user is willing to pay
+        const maxFeesPerGas = (await this.aztecNode.getCurrentBaseFees()).mul(1.5);
+        const gasSettings = GasSettings.default({
+            maxFeesPerGas
+        });
+        return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
     }
     getSponsoredFPCPaymentMethodForWallet(_wallet, _sender) {
         return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
     }
-    getFeeJuicePaymentMethodForWallet(_wallet, sender) {
-        return Promise.resolve(new FeeJuicePaymentMethod(sender));
-    }
 }

package/dest/e2e_fees/bridging_race.notest.js

@@ -35,7 +35,7 @@ describe('e2e_fees bridging_race', ()=>{
             salt: bobsSalt,
             contract: new SchnorrAccountContract(bobsPrivateSigningKey)
         });
-        bobsAddress = bobsAccountManager.getAddress();
+        bobsAddress = bobsAccountManager.address;
     });
     it('Alice bridges funds to Bob', async ()=>{
         // Tweak the token manager so the bridging happens immediately before the end of the current L2 slot

package/dest/e2e_fees/fees_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}

package/dest/e2e_fees/fees_test.js

@@ -1,4 +1,3 @@
-import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { createLogger, sleep } from '@aztec/aztec.js';
 import { RollupContract, createExtendedL1Client } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -144,15 +143,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             this.accounts = deployedAccounts.map((a)=>a.address);
             this.accounts.forEach((a, i)=>this.logger.verbose(`Account ${i} address: ${a}`));
             [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
-            await Promise.all(deployedAccounts.map(async (acc)=>{
-                const accountData = {
-                    secret: acc.secret,
-                    salt: acc.salt,
-                    contract: new SchnorrAccountContract(acc.signingKey)
-                };
-                const accountManager = await this.wallet.createAccount(accountData);
-                return accountManager.register();
-            }));
             // We set Alice as the FPC admin to avoid the need for deployment of another account.
             this.fpcAdmin = this.aliceAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();

package/dest/e2e_p2p/shared.js

@@ -38,7 +38,7 @@ export const submitTransactions = async (logger, node, numTxs, fundedAccount)=>{
         useLogSuffix: true
     });
     const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
-    return submitTxsTo(wallet, fundedAccountManager.getAddress(), numTxs, logger);
+    return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
 };
 export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
     const rpcConfig = getRpcConfig();
@@ -57,7 +57,7 @@ export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
     const contract = await TestContract.at(testContractInstance.address, wallet);
     return timesAsync(numTxs, async ()=>{
         const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
-            from: fundedAccountManager.getAddress()
+            from: fundedAccountManager.address
         });
         const txHash = tx.getTxHash();
         logger.info(`Tx prepared with hash ${txHash}`);

package/dest/fixtures/snapshot_manager.d.ts

@@ -1,6 +1,6 @@
 import { type InitialAccountData } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { type AztecAddress, type AztecNode, type Logger, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger, type Wallet } from '@aztec/aztec.js';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { type BlobSinkServer } from '@aztec/blob-sink/server';
 import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType } from '@aztec/ethereum';

package/dest/fixtures/snapshot_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAA2B,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,SAAS,EAId,KAAK,MAAM,EACX,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAIjC,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAezC,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,gBAAgB,CAAC;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,EAAE,cAAc,CAAC;IACzB,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;IAC5C,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AASF,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM,EAClC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAEnD,yCAKF;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,CAAC,EACR,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,GACvE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEpC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,qIAAqI;AACrI,cAAM,mBAAoB,YAAW,gBAAgB;IAMjD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,qBAAqB;IAN/B,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EACR,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAMvD,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,GAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B;IAYtF,KAAK;IAOL,QAAQ;CAItB;AAED;;;GAGG;AACH,cAAM,eAAgB,YAAW,gBAAgB;IAQ7C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,qBAAqB;IAT/B,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM,EAClC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAMvD,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,GAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B;IA4CnG;;;;OAIG;IACU,KAAK;IA0BlB;;OAEG;IACU,QAAQ;CAKtB;AAoVD;;;GAGG;AACH,eAAO,MAAM,cAAc,GACxB,kBAAkB,MAAM,EAAE,QAAQ,MAAM,MAClC,mCAAmC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,qBAAqB,EAAE,kBAAkB,EAAE,CAAA;CAAE;;EAsB5G,CAAC;AAEJ;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,YAAY,EAAE,EAChC,eAAe,UAAQ,EACvB,IAAI,CAAC,EAAE,SAAS,iBAwBjB"}
+{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"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"}

package/dest/fixtures/snapshot_manager.js

@@ -1,7 +1,7 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { BatchCall, EthAddress, getContractClassFromArtifact, waitForProven } from '@aztec/aztec.js';
+import { AztecAddress, BatchCall, EthAddress, getContractClassFromArtifact, waitForProven } from '@aztec/aztec.js';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
@@ -463,7 +463,9 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
         for(let i = 0; i < deployedAccounts.length; i++){
             const accountManager = await wallet.createSchnorrAccount(deployedAccounts[i].secret, deployedAccounts[i].salt, deployedAccounts[i].signingKey);
-            await accountManager.deploy({
+            const deployMethod = await accountManager.getDeployMethod();
+            await deployMethod.send({
+                from: AztecAddress.ZERO,
                 skipClassPublication: i !== 0
             }).wait();
         }

package/dest/fixtures/token_utils.js

@@ -26,9 +26,9 @@ export async function expectTokenBalance(wallet, token, owner, expectedBalance,
     expect(balance).toBe(expectedBalance);
 }
 export async function mintNotes(wallet, minter, recipient, asset, noteAmounts) {
-    // We can only mint 4 notes at a time, since that's the maximum number of calls our entrypoints allow
+    // We can only mint 5 notes at a time, since that's the maximum number of calls our entrypoints allow
     // TODO(#13024): mint as many notes as possible in a single tx
-    const notesPerIteration = 4;
+    const notesPerIteration = 5;
     for(let mintedNotes = 0; mintedNotes < noteAmounts.length; mintedNotes += notesPerIteration){
         const toMint = noteAmounts.slice(mintedNotes, mintedNotes + notesPerIteration);
         const actions = toMint.map((amt)=>asset.methods.mint_to_private(recipient, amt));

package/dest/fixtures/utils.js

@@ -145,7 +145,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     }
     const testAccounts = await Promise.all(initialFundedAccounts.slice(0, numberOfAccounts).map(async (account)=>{
         const accountManager = await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey);
-        return accountManager.getAddress();
+        return accountManager.address;
     }));
     return {
         aztecNode,
@@ -415,8 +415,8 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         } else {
             logger.info(`${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`);
             const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
-            const accountManagers = await deployFundedSchnorrAccounts(wallet, accountsData);
-            accounts = accountManagers.map((accountManager)=>accountManager.getAddress());
+            const accountManagers = await deployFundedSchnorrAccounts(wallet, aztecNode, accountsData);
+            accounts = accountManagers.map((accountManager)=>accountManager.address);
         }
         // Now we restore the original minTxsPerBlock setting.
         sequencerClient.getSequencer().updateConfig({

package/dest/shared/submit-transactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"submit-transactions.d.ts","sourceRoot":"","sources":["../../src/shared/submit-transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAEvG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,eAAO,MAAM,WAAW,GACtB,QAAQ,UAAU,EAClB,WAAW,YAAY,EACvB,QAAQ,MAAM,EACd,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAqBlB,CAAC"}
+{"version":3,"file":"submit-transactions.d.ts","sourceRoot":"","sources":["../../src/shared/submit-transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAEvG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,eAAO,MAAM,WAAW,GACtB,QAAQ,UAAU,EAClB,WAAW,YAAY,EACvB,QAAQ,MAAM,EACd,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAsBlB,CAAC"}

package/dest/shared/submit-transactions.js

@@ -5,8 +5,9 @@ export const submitTxsTo = async (wallet, submitter, numTxs, logger)=>{
     const txs = [];
     await Promise.all(times(numTxs, async ()=>{
         const accountManager = await wallet.createSchnorrAccount(Fr.random(), Fr.random(), GrumpkinScalar.random());
-        const tx = accountManager.deploy({
-            deployAccount: submitter
+        const deployMethod = await accountManager.getDeployMethod();
+        const tx = deployMethod.send({
+            from: submitter
         });
         const txHash = await tx.getTxHash();
         logger.info(`Tx sent with hash ${txHash}`);

package/dest/simulators/token_simulator.js

@@ -88,7 +88,7 @@ export class TokenSimulator {
             this.token.methods.total_supply(),
             ...this.accounts.map((address)=>this.token.methods.balance_of_public(address))
         ];
-        const results = (await Promise.all(chunk(calls, 4).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate({
+        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);

package/dest/spartan/setup_test_wallets.d.ts

@@ -1,4 +1,4 @@
-import { type AztecAddress, type AztecNode, type FeePaymentMethod } from '@aztec/aztec.js';
+import { type AppConfigurableFeePaymentMethod, AztecAddress, type AztecNode } from '@aztec/aztec.js';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TestWallet } from '@aztec/test-wallet/server';
@@ -20,7 +20,7 @@ export declare function performTransfers({ testAccounts, rounds, transferAmount,
     rounds: number;
     transferAmount: bigint;
     logger: Logger;
-    feePaymentMethod?: FeePaymentMethod;
+    feePaymentMethod?: AppConfigurableFeePaymentMethod;
 }): Promise<void>;
 export declare function createWalletAndAztecNodeClient(nodeUrl: string, proverEnabled: boolean, logger: Logger): Promise<{
     wallet: TestWallet;

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":"AACA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,gBAAgB,EAOtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,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;AAMD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAyBvB;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAqCvB;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,CAgDvB;AA6ED,wBAAsB,gBAAgB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,cAAc,EACd,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,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,iBAiBA;AAED,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAqBrF"}
+{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,+BAA+B,EACpC,YAAY,EACZ,KAAK,SAAS,EAQf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,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;AAMD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAyBvB;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAuCvB;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;AA6ED,wBAAsB,gBAAgB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,cAAc,EACd,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,+BAA+B,CAAC;CACpD,iBAiBA;AAED,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAqBrF"}

package/dest/spartan/setup_test_wallets.js

@@ -1,5 +1,5 @@
 import { generateSchnorrAccounts } from '@aztec/accounts/testing';
-import { FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, SponsoredFeePaymentMethod, createAztecNodeClient, retryUntil } from '@aztec/aztec.js';
+import { AztecAddress, FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, SponsoredFeePaymentMethod, createAztecNodeClient, retryUntil } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { registerInitialSandboxAccountsInWallet } from '@aztec/test-wallet';
@@ -35,7 +35,9 @@ export async function deploySponsoredTestAccounts(wallet, aztecNode, mintAmount,
     const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
     await registerSponsoredFPC(wallet);
     const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-    await recipientAccount.deploy({
+    const recipientDeployMethod = await recipientAccount.getDeployMethod();
+    await recipientDeployMethod.send({
+        from: AztecAddress.ZERO,
         fee: {
             paymentMethod
         }
@@ -43,27 +45,29 @@ export async function deploySponsoredTestAccounts(wallet, aztecNode, mintAmount,
         timeout: 2400
     });
     await Promise.all(fundedAccounts.map(async (a)=>{
-        await a.deploy({
+        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.getAddress()}`);
+        logger.info(`Account deployed at ${a.address}`);
     }));
     const tokenAdmin = fundedAccounts[0];
-    const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.getAddress()), tokenAdmin.getAddress(), mintAmount, new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()), logger);
+    const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()), logger);
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
         aztecNode,
         wallet,
-        accounts: fundedAccounts.map((acc)=>acc.getAddress()),
-        tokenAdminAddress: tokenAdmin.getAddress(),
+        accounts: fundedAccounts.map((acc)=>acc.address),
+        tokenAdminAddress: tokenAdmin.address,
         tokenName: TOKEN_NAME,
         tokenAddress,
         tokenContract,
-        recipientAddress: recipientAccount.getAddress()
+        recipientAddress: recipientAccount.address
     };
 }
 export async function deployTestAccountsWithTokens(nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1) {
@@ -72,32 +76,34 @@ export async function deployTestAccountsWithTokens(nodeUrl, l1RpcUrls, mnemonicO
     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.getAddress(), undefined, logger)));
+    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.getAddress(), claims[i]);
-        await a.deploy({
+        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()}`);
+        logger.info(`Account deployed at ${a.address}`);
     }));
     const tokenAdmin = fundedAccounts[0];
-    const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.getAddress()), tokenAdmin.getAddress(), mintAmount, undefined, logger);
+    const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, undefined, logger);
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
         aztecNode,
         wallet,
-        accounts: fundedAccounts.map((acc)=>acc.getAddress()),
-        tokenAdminAddress: tokenAdmin.getAddress(),
+        accounts: fundedAccounts.map((acc)=>acc.address),
+        tokenAdminAddress: tokenAdmin.address,
         tokenName: TOKEN_NAME,
         tokenAddress,
         tokenContract,
-        recipientAddress: recipientAccount.getAddress()
+        recipientAddress: recipientAccount.address
     };
 }
 async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, recipient, amount, log) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-nightly.20251001",
+  "version": "3.0.0-nightly.20251002",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,42 +25,42 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20251001",
-    "@aztec/archiver": "3.0.0-nightly.20251001",
-    "@aztec/aztec": "3.0.0-nightly.20251001",
-    "@aztec/aztec-node": "3.0.0-nightly.20251001",
-    "@aztec/aztec.js": "3.0.0-nightly.20251001",
-    "@aztec/bb-prover": "3.0.0-nightly.20251001",
-    "@aztec/blob-lib": "3.0.0-nightly.20251001",
-    "@aztec/blob-sink": "3.0.0-nightly.20251001",
-    "@aztec/bot": "3.0.0-nightly.20251001",
-    "@aztec/cli": "3.0.0-nightly.20251001",
-    "@aztec/constants": "3.0.0-nightly.20251001",
-    "@aztec/entrypoints": "3.0.0-nightly.20251001",
-    "@aztec/epoch-cache": "3.0.0-nightly.20251001",
-    "@aztec/ethereum": "3.0.0-nightly.20251001",
-    "@aztec/foundation": "3.0.0-nightly.20251001",
-    "@aztec/kv-store": "3.0.0-nightly.20251001",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251001",
-    "@aztec/merkle-tree": "3.0.0-nightly.20251001",
-    "@aztec/node-keystore": "3.0.0-nightly.20251001",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251001",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251001",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251001",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251001",
-    "@aztec/p2p": "3.0.0-nightly.20251001",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251001",
-    "@aztec/prover-client": "3.0.0-nightly.20251001",
-    "@aztec/prover-node": "3.0.0-nightly.20251001",
-    "@aztec/pxe": "3.0.0-nightly.20251001",
-    "@aztec/sequencer-client": "3.0.0-nightly.20251001",
-    "@aztec/simulator": "3.0.0-nightly.20251001",
-    "@aztec/slasher": "3.0.0-nightly.20251001",
-    "@aztec/stdlib": "3.0.0-nightly.20251001",
-    "@aztec/telemetry-client": "3.0.0-nightly.20251001",
-    "@aztec/test-wallet": "3.0.0-nightly.20251001",
-    "@aztec/validator-client": "3.0.0-nightly.20251001",
-    "@aztec/world-state": "3.0.0-nightly.20251001",
+    "@aztec/accounts": "3.0.0-nightly.20251002",
+    "@aztec/archiver": "3.0.0-nightly.20251002",
+    "@aztec/aztec": "3.0.0-nightly.20251002",
+    "@aztec/aztec-node": "3.0.0-nightly.20251002",
+    "@aztec/aztec.js": "3.0.0-nightly.20251002",
+    "@aztec/bb-prover": "3.0.0-nightly.20251002",
+    "@aztec/blob-lib": "3.0.0-nightly.20251002",
+    "@aztec/blob-sink": "3.0.0-nightly.20251002",
+    "@aztec/bot": "3.0.0-nightly.20251002",
+    "@aztec/cli": "3.0.0-nightly.20251002",
+    "@aztec/constants": "3.0.0-nightly.20251002",
+    "@aztec/entrypoints": "3.0.0-nightly.20251002",
+    "@aztec/epoch-cache": "3.0.0-nightly.20251002",
+    "@aztec/ethereum": "3.0.0-nightly.20251002",
+    "@aztec/foundation": "3.0.0-nightly.20251002",
+    "@aztec/kv-store": "3.0.0-nightly.20251002",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251002",
+    "@aztec/merkle-tree": "3.0.0-nightly.20251002",
+    "@aztec/node-keystore": "3.0.0-nightly.20251002",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251002",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251002",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251002",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251002",
+    "@aztec/p2p": "3.0.0-nightly.20251002",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251002",
+    "@aztec/prover-client": "3.0.0-nightly.20251002",
+    "@aztec/prover-node": "3.0.0-nightly.20251002",
+    "@aztec/pxe": "3.0.0-nightly.20251002",
+    "@aztec/sequencer-client": "3.0.0-nightly.20251002",
+    "@aztec/simulator": "3.0.0-nightly.20251002",
+    "@aztec/slasher": "3.0.0-nightly.20251002",
+    "@aztec/stdlib": "3.0.0-nightly.20251002",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251002",
+    "@aztec/test-wallet": "3.0.0-nightly.20251002",
+    "@aztec/validator-client": "3.0.0-nightly.20251002",
+    "@aztec/world-state": "3.0.0-nightly.20251002",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -92,7 +92,7 @@
     "snappy": "^7.2.2",
     "stream-browserify": "^3.0.0",
     "string-argv": "^0.3.2",
-    "ts-loader": "^9.4.4",
+    "ts-loader": "^9.5.4",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
     "typescript": "^5.3.3",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -1,9 +1,8 @@
 import {
+  type AppConfigurableFeePaymentMethod,
   AztecAddress,
   type AztecNode,
-  FeeJuicePaymentMethod,
   FeeJuicePaymentMethodWithClaim,
-  type FeePaymentMethod,
   type Logger,
   PrivateFeePaymentMethod,
   SponsoredFeePaymentMethod,
@@ -26,6 +25,7 @@ import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contract
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
+import { GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { TestWallet } from '@aztec/test-wallet/server';
 
@@ -49,7 +49,10 @@ import { type ClientFlowsConfig, FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './c
 const { E2E_DATA_PATH: dataPath, BENCHMARK_CONFIG } = process.env;
 
 export type AccountType = 'ecdsar1' | 'schnorr';
-export type FeePaymentMethodGetter = (wallet: Wallet, sender: AztecAddress) => Promise<FeePaymentMethod>;
+export type FeePaymentMethodGetter = (
+  wallet: Wallet,
+  sender: AztecAddress,
+) => Promise<AppConfigurableFeePaymentMethod | undefined>;
 export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 
 export class ClientFlowsBenchmark {
@@ -112,7 +115,7 @@ export class ClientFlowsBenchmark {
       },
       // eslint-disable-next-line camelcase
       fee_juice: {
-        forWallet: this.getFeeJuicePaymentMethodForWallet.bind(this),
+        forWallet: () => Promise.resolve(undefined),
         circuits: 0,
       },
     };
@@ -344,17 +347,22 @@ export class ClientFlowsBenchmark {
   public async createAndFundBenchmarkingAccountOnUserWallet(accountType: AccountType) {
     const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
     const benchysAccount = await benchysAccountManager.getAccount();
-    const benchysAddress = benchysAccountManager.getAddress();
+    const benchysAddress = benchysAccountManager.address;
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
-    const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysAddress, claim);
-    await benchysAccountManager.deploy({ fee: { paymentMethod } }).wait();
+    const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
+    await behchysDeployMethod
+      .send({
+        from: AztecAddress.ZERO,
+        fee: { paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim) },
+      })
+      .wait();
     // Register benchy on the user's Wallet, where we're going to be interacting from
     const accountManager = await this.userWallet.createAccount({
       secret: benchysAccount.getSecretKey(),
       salt: new Fr(benchysAccount.salt),
       contract: benchysAccountManager.getAccountContract(),
     });
-    return accountManager.getAddress();
+    return accountManager.address;
   }
 
   public async applyDeployAmmSnapshot() {
@@ -388,15 +396,15 @@ export class ClientFlowsBenchmark {
     return new FeeJuicePaymentMethodWithClaim(sender, claim);
   }
 
-  public getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
-    return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet));
+  public async getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
+    // The private fee paying method assembled on the app side requires knowledge of the maximum
+    // fee the user is willing to pay
+    const maxFeesPerGas = (await this.aztecNode.getCurrentBaseFees()).mul(1.5);
+    const gasSettings = GasSettings.default({ maxFeesPerGas });
+    return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
   }
 
   public getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet, _sender: AztecAddress) {
     return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
   }
-
-  public getFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress) {
-    return Promise.resolve(new FeeJuicePaymentMethod(sender));
-  }
 }

package/src/e2e_fees/bridging_race.notest.ts

@@ -48,7 +48,7 @@ describe('e2e_fees bridging_race', () => {
       salt: bobsSalt,
       contract: new SchnorrAccountContract(bobsPrivateSigningKey),
     });
-    bobsAddress = bobsAccountManager.getAddress();
+    bobsAddress = bobsAccountManager.address;
   });
 
   it('Alice bridges funds to Bob', async () => {

package/src/e2e_fees/fees_test.ts

@@ -1,4 +1,3 @@
-import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { type AztecAddress, type AztecNode, type Logger, createLogger, sleep } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
@@ -190,17 +189,6 @@ export class FeesTest {
         this.accounts = deployedAccounts.map(a => a.address);
         this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
         [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
-        await Promise.all(
-          deployedAccounts.map(async acc => {
-            const accountData = {
-              secret: acc.secret,
-              salt: acc.salt,
-              contract: new SchnorrAccountContract(acc.signingKey),
-            };
-            const accountManager = await this.wallet.createAccount(accountData);
-            return accountManager.register();
-          }),
-        );
 
         // We set Alice as the FPC admin to avoid the need for deployment of another account.
         this.fpcAdmin = this.aliceAddress;

package/src/e2e_p2p/shared.ts

@@ -65,7 +65,7 @@ export const submitTransactions = async (
   rpcConfig.proverEnabled = false;
   const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
   const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
-  return submitTxsTo(wallet, fundedAccountManager.getAddress(), numTxs, logger);
+  return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
 };
 
 export async function prepareTransactions(
@@ -87,7 +87,7 @@ export async function prepareTransactions(
   const contract = await TestContract.at(testContractInstance.address, wallet);
 
   return timesAsync(numTxs, async () => {
-    const tx = await contract.methods.emit_nullifier(Fr.random()).prove({ from: fundedAccountManager.getAddress() });
+    const tx = await contract.methods.emit_nullifier(Fr.random()).prove({ from: fundedAccountManager.address });
     const txHash = tx.getTxHash();
     logger.info(`Tx prepared with hash ${txHash}`);
     return tx;

package/src/fixtures/snapshot_manager.ts

@@ -2,7 +2,7 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { type InitialAccountData, generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import {
-  type AztecAddress,
+  AztecAddress,
   type AztecNode,
   BatchCall,
   type ContractFunctionInteraction,
@@ -620,8 +620,10 @@ export const deployAccounts =
         deployedAccounts[i].salt,
         deployedAccounts[i].signingKey,
       );
-      await accountManager
-        .deploy({
+      const deployMethod = await accountManager.getDeployMethod();
+      await deployMethod
+        .send({
+          from: AztecAddress.ZERO,
           skipClassPublication: i !== 0, // Publish the contract class at most once.
         })
         .wait();

package/src/fixtures/token_utils.ts

@@ -46,9 +46,9 @@ export async function mintNotes(
   asset: TokenContract,
   noteAmounts: bigint[],
 ): Promise<bigint> {
-  // We can only mint 4 notes at a time, since that's the maximum number of calls our entrypoints allow
+  // We can only mint 5 notes at a time, since that's the maximum number of calls our entrypoints allow
   // TODO(#13024): mint as many notes as possible in a single tx
-  const notesPerIteration = 4;
+  const notesPerIteration = 5;
   for (let mintedNotes = 0; mintedNotes < noteAmounts.length; mintedNotes += notesPerIteration) {
     const toMint = noteAmounts.slice(mintedNotes, mintedNotes + notesPerIteration);
     const actions = toMint.map(amt => asset.methods.mint_to_private(recipient, amt));

package/src/fixtures/utils.ts

@@ -234,7 +234,7 @@ async function setupWithRemoteEnvironment(
   const testAccounts = await Promise.all(
     initialFundedAccounts.slice(0, numberOfAccounts).map(async account => {
       const accountManager = await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey);
-      return accountManager.getAddress();
+      return accountManager.address;
     }),
   );
 
@@ -659,8 +659,8 @@ export async function setup(
         `${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`,
       );
       const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
-      const accountManagers = await deployFundedSchnorrAccounts(wallet, accountsData);
-      accounts = accountManagers.map(accountManager => accountManager.getAddress());
+      const accountManagers = await deployFundedSchnorrAccounts(wallet, aztecNode, accountsData);
+      accounts = accountManagers.map(accountManager => accountManager.address);
     }
 
     // Now we restore the original minTxsPerBlock setting.

package/src/guides/up_quick_start.sh

@@ -19,8 +19,8 @@ aztec-wallet() {
 aztec-wallet import-test-accounts
 
 # docs:start:declare-accounts
-aztec-wallet create-account -a alice --payment method=fee_juice,feePayer=test0
-aztec-wallet create-account -a bob --payment method=fee_juice,feePayer=test0
+aztec-wallet create-account -a alice -f test0
+aztec-wallet create-account -a bob -f test0
 # docs:end:declare-accounts
 
 DEPLOY_OUTPUT=$(aztec-wallet deploy ../noir-contracts.js/artifacts/token_contract-Token.json --args accounts:test0 Test TST 18 -f test0)

package/src/shared/submit-transactions.ts

@@ -13,7 +13,8 @@ export const submitTxsTo = async (
   await Promise.all(
     times(numTxs, async () => {
       const accountManager = await wallet.createSchnorrAccount(Fr.random(), Fr.random(), GrumpkinScalar.random());
-      const tx = accountManager.deploy({ deployAccount: submitter });
+      const deployMethod = await accountManager.getDeployMethod();
+      const tx = deployMethod.send({ from: submitter });
       const txHash = await tx.getTxHash();
 
       logger.info(`Tx sent with hash ${txHash}`);

package/src/simulators/token_simulator.ts

@@ -104,7 +104,7 @@ export class TokenSimulator {
 
     const results = (
       await Promise.all(
-        chunk(calls, 4).map(batch => new BatchCall(this.defaultWallet, batch).simulate({ from: this.defaultAddress })),
+        chunk(calls, 5).map(batch => new BatchCall(this.defaultWallet, batch).simulate({ from: this.defaultAddress })),
       )
     ).flat();
     expect(results[0]).toEqual(this.totalSupply);

package/src/spartan/setup_test_wallets.ts

@@ -1,9 +1,9 @@
 import { generateSchnorrAccounts } from '@aztec/accounts/testing';
 import {
-  type AztecAddress,
+  type AppConfigurableFeePaymentMethod,
+  AztecAddress,
   type AztecNode,
   FeeJuicePaymentMethodWithClaim,
-  type FeePaymentMethod,
   Fr,
   L1FeeJuicePortalManager,
   SponsoredFeePaymentMethod,
@@ -82,19 +82,21 @@ export async function deploySponsoredTestAccounts(
   await registerSponsoredFPC(wallet);
 
   const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-  await recipientAccount.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 });
+  const recipientDeployMethod = await recipientAccount.getDeployMethod();
+  await recipientDeployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait({ timeout: 2400 });
   await Promise.all(
     fundedAccounts.map(async a => {
-      await a.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
-      logger.info(`Account deployed at ${a.getAddress()}`);
+      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.getAddress()),
-    tokenAdmin.getAddress(),
+    fundedAccounts.map(acc => acc.address),
+    tokenAdmin.address,
     mintAmount,
     new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()),
     logger,
@@ -104,12 +106,12 @@ export async function deploySponsoredTestAccounts(
   return {
     aztecNode,
     wallet,
-    accounts: fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdminAddress: tokenAdmin.getAddress(),
+    accounts: fundedAccounts.map(acc => acc.address),
+    tokenAdminAddress: tokenAdmin.address,
     tokenName: TOKEN_NAME,
     tokenAddress,
     tokenContract,
-    recipientAddress: recipientAccount.getAddress(),
+    recipientAddress: recipientAccount.address,
   };
 }
 
@@ -129,9 +131,7 @@ export async function deployTestAccountsWithTokens(
   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.getAddress(), undefined, logger),
-    ),
+    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.
@@ -141,17 +141,18 @@ export async function deployTestAccountsWithTokens(
 
   await Promise.all(
     fundedAccounts.map(async (a, i) => {
-      const paymentMethod = new FeeJuicePaymentMethodWithClaim(a.getAddress(), claims[i]);
-      await a.deploy({ fee: { paymentMethod } }).wait();
-      logger.info(`Account deployed at ${a.getAddress()}`);
+      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.address}`);
     }),
   );
 
   const tokenAdmin = fundedAccounts[0];
   const tokenAddress = await deployTokenAndMint(
     wallet,
-    fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdmin.getAddress(),
+    fundedAccounts.map(acc => acc.address),
+    tokenAdmin.address,
     mintAmount,
     undefined,
     logger,
@@ -161,12 +162,12 @@ export async function deployTestAccountsWithTokens(
   return {
     aztecNode,
     wallet,
-    accounts: fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdminAddress: tokenAdmin.getAddress(),
+    accounts: fundedAccounts.map(acc => acc.address),
+    tokenAdminAddress: tokenAdmin.address,
     tokenName: TOKEN_NAME,
     tokenAddress,
     tokenContract,
-    recipientAddress: recipientAccount.getAddress(),
+    recipientAddress: recipientAccount.address,
   };
 }
 
@@ -214,7 +215,7 @@ async function deployTokenAndMint(
   accounts: AztecAddress[],
   admin: AztecAddress,
   mintAmount: bigint,
-  paymentMethod: FeePaymentMethod | undefined,
+  paymentMethod: AppConfigurableFeePaymentMethod | undefined,
   logger: Logger,
 ) {
   logger.verbose(`Deploying TokenContract...`);
@@ -256,7 +257,7 @@ export async function performTransfers({
   rounds: number;
   transferAmount: bigint;
   logger: Logger;
-  feePaymentMethod?: FeePaymentMethod;
+  feePaymentMethod?: AppConfigurableFeePaymentMethod;
 }) {
   const recipient = testAccounts.recipientAddress;
   // Default to sponsored fee payment if no fee method is provided