@aztec/end-to-end 3.0.0-nightly.20251118 → 3.0.0-nightly.20251119

package/dest/spartan/setup_test_wallets.js

@@ -22,7 +22,7 @@ export async function setupTestAccountsWithTokens(nodeUrl, mintAmount, logger) {
     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 = await TokenContract.at(tokenAddress, wallet);
+    const tokenContract = TokenContract.at(tokenAddress, wallet);
     return {
         aztecNode,
         accounts,
@@ -63,7 +63,7 @@ export async function deploySponsoredTestAccounts(wallet, aztecNode, mintAmount,
     }));
     const tokenAdmin = fundedAccounts[0];
     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);
+    const tokenContract = TokenContract.at(tokenAddress, wallet);
     return {
         aztecNode,
         wallet,
@@ -99,7 +99,7 @@ export async function deployTestAccountsWithTokens(nodeUrl, l1RpcUrls, mnemonicO
     }));
     const tokenAdmin = fundedAccounts[0];
     const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, undefined, logger);
-    const tokenContract = await TokenContract.at(tokenAddress, wallet);
+    const tokenContract = TokenContract.at(tokenAddress, wallet);
     return {
         aztecNode,
         wallet,
@@ -150,7 +150,7 @@ async function deployTokenAndMint(wallet, accounts, admin, mintAmount, paymentMe
     });
     const tokenAddress = tokenContract.address;
     logger.verbose(`Minting ${mintAmount} public assets to the ${accounts.length} accounts...`);
-    await Promise.all(accounts.map(async (acc)=>(await TokenContract.at(tokenAddress, wallet)).methods.mint_to_public(acc, mintAmount).send({
+    await Promise.all(accounts.map((acc)=>TokenContract.at(tokenAddress, wallet).methods.mint_to_public(acc, mintAmount).send({
             from: admin,
             fee: {
                 paymentMethod
@@ -166,8 +166,8 @@ export async function performTransfers({ wallet, testAccounts, rounds, transferA
     // 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 txs = testAccounts.accounts.map(async (acc)=>{
-            const token = await TokenContract.at(testAccounts.tokenAddress, testAccounts.wallet);
+        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: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-nightly.20251118",
+  "version": "3.0.0-nightly.20251119",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,43 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20251118",
-    "@aztec/archiver": "3.0.0-nightly.20251118",
-    "@aztec/aztec": "3.0.0-nightly.20251118",
-    "@aztec/aztec-node": "3.0.0-nightly.20251118",
-    "@aztec/aztec.js": "3.0.0-nightly.20251118",
-    "@aztec/bb-prover": "3.0.0-nightly.20251118",
-    "@aztec/bb.js": "3.0.0-nightly.20251118",
-    "@aztec/blob-lib": "3.0.0-nightly.20251118",
-    "@aztec/blob-sink": "3.0.0-nightly.20251118",
-    "@aztec/bot": "3.0.0-nightly.20251118",
-    "@aztec/cli": "3.0.0-nightly.20251118",
-    "@aztec/constants": "3.0.0-nightly.20251118",
-    "@aztec/entrypoints": "3.0.0-nightly.20251118",
-    "@aztec/epoch-cache": "3.0.0-nightly.20251118",
-    "@aztec/ethereum": "3.0.0-nightly.20251118",
-    "@aztec/foundation": "3.0.0-nightly.20251118",
-    "@aztec/kv-store": "3.0.0-nightly.20251118",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251118",
-    "@aztec/merkle-tree": "3.0.0-nightly.20251118",
-    "@aztec/node-keystore": "3.0.0-nightly.20251118",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251118",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251118",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251118",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251118",
-    "@aztec/p2p": "3.0.0-nightly.20251118",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251118",
-    "@aztec/prover-client": "3.0.0-nightly.20251118",
-    "@aztec/prover-node": "3.0.0-nightly.20251118",
-    "@aztec/pxe": "3.0.0-nightly.20251118",
-    "@aztec/sequencer-client": "3.0.0-nightly.20251118",
-    "@aztec/simulator": "3.0.0-nightly.20251118",
-    "@aztec/slasher": "3.0.0-nightly.20251118",
-    "@aztec/stdlib": "3.0.0-nightly.20251118",
-    "@aztec/telemetry-client": "3.0.0-nightly.20251118",
-    "@aztec/test-wallet": "3.0.0-nightly.20251118",
-    "@aztec/validator-client": "3.0.0-nightly.20251118",
-    "@aztec/world-state": "3.0.0-nightly.20251118",
+    "@aztec/accounts": "3.0.0-nightly.20251119",
+    "@aztec/archiver": "3.0.0-nightly.20251119",
+    "@aztec/aztec": "3.0.0-nightly.20251119",
+    "@aztec/aztec-node": "3.0.0-nightly.20251119",
+    "@aztec/aztec.js": "3.0.0-nightly.20251119",
+    "@aztec/bb-prover": "3.0.0-nightly.20251119",
+    "@aztec/bb.js": "3.0.0-nightly.20251119",
+    "@aztec/blob-lib": "3.0.0-nightly.20251119",
+    "@aztec/blob-sink": "3.0.0-nightly.20251119",
+    "@aztec/bot": "3.0.0-nightly.20251119",
+    "@aztec/cli": "3.0.0-nightly.20251119",
+    "@aztec/constants": "3.0.0-nightly.20251119",
+    "@aztec/entrypoints": "3.0.0-nightly.20251119",
+    "@aztec/epoch-cache": "3.0.0-nightly.20251119",
+    "@aztec/ethereum": "3.0.0-nightly.20251119",
+    "@aztec/foundation": "3.0.0-nightly.20251119",
+    "@aztec/kv-store": "3.0.0-nightly.20251119",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251119",
+    "@aztec/merkle-tree": "3.0.0-nightly.20251119",
+    "@aztec/node-keystore": "3.0.0-nightly.20251119",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251119",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251119",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251119",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251119",
+    "@aztec/p2p": "3.0.0-nightly.20251119",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251119",
+    "@aztec/prover-client": "3.0.0-nightly.20251119",
+    "@aztec/prover-node": "3.0.0-nightly.20251119",
+    "@aztec/pxe": "3.0.0-nightly.20251119",
+    "@aztec/sequencer-client": "3.0.0-nightly.20251119",
+    "@aztec/simulator": "3.0.0-nightly.20251119",
+    "@aztec/slasher": "3.0.0-nightly.20251119",
+    "@aztec/stdlib": "3.0.0-nightly.20251119",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251119",
+    "@aztec/test-wallet": "3.0.0-nightly.20251119",
+    "@aztec/validator-client": "3.0.0-nightly.20251119",
+    "@aztec/world-state": "3.0.0-nightly.20251119",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -20,6 +20,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 type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { TestWallet } from '@aztec/test-wallet/server';
@@ -69,15 +70,21 @@ export class ClientFlowsBenchmark {
   public feeJuiceContract!: FeeJuiceContract;
   // Asset in which fees are paid via FPC
   public bananaCoin!: BananaCoin;
+  public bananaCoinInstance!: ContractInstanceWithAddress;
   public bananaFPC!: FPCContract;
+  public bananaFPCInstance!: ContractInstanceWithAddress;
   // Random asset we want to trade
   public candyBarCoin!: TokenContract;
+  public candyBarCoinInstance!: ContractInstanceWithAddress;
   // AMM contract
   public amm!: AMMContract;
+  public ammInstance!: ContractInstanceWithAddress;
   // Liquidity token for AMM
   public liquidityToken!: TokenContract;
+  public liquidityTokenInstance!: ContractInstanceWithAddress;
   // Sponsored FPC contract
   public sponsoredFPC!: SponsoredFPCContract;
+  public sponsoredFPCInstance!: ContractInstanceWithAddress;
 
   // PXE and Wallet used by the benchmarking user. It can be set up with client-side proving enabled
   public userWallet!: TestWallet;
@@ -204,7 +211,7 @@ export class ClientFlowsBenchmark {
         this.sequencerAddress = sequencerAddress;
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
+        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
         this.coinbase = EthAddress.random();
 
         const userPXEConfig = getPXEConfig();
@@ -229,7 +236,7 @@ export class ClientFlowsBenchmark {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
+        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
 
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
@@ -246,14 +253,22 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_banana_token',
       async () => {
-        const bananaCoin = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n)
+        const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'BC',
+          'BC',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-        return { bananaCoinAddress: bananaCoin.address };
+        return { bananaCoinAddress: bananaCoin.address, bananaCoinInstance };
       },
-      async ({ bananaCoinAddress }) => {
-        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.adminWallet);
+      ({ bananaCoinAddress, bananaCoinInstance }) => {
+        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.adminWallet);
+        this.bananaCoinInstance = bananaCoinInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -262,14 +277,22 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_candy_bar_token',
       async () => {
-        const candyBarCoin = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n)
+        const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'CBC',
+          'CBC',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
-        return { candyBarCoinAddress: candyBarCoin.address };
+        return { candyBarCoinAddress: candyBarCoin.address, candyBarCoinInstance };
       },
-      async ({ candyBarCoinAddress }) => {
-        this.candyBarCoin = await TokenContract.at(candyBarCoinAddress, this.adminWallet);
+      ({ candyBarCoinAddress, candyBarCoinInstance }) => {
+        this.candyBarCoin = TokenContract.at(candyBarCoinAddress, this.adminWallet);
+        this.candyBarCoinInstance = candyBarCoinInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -282,18 +305,24 @@ export class ClientFlowsBenchmark {
         expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress)
+        const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
+          this.adminWallet,
+          bananaCoin.address,
+          this.adminAddress,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
         await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
 
-        return { bananaFPCAddress: bananaFPC.address };
+        return { bananaFPCAddress: bananaFPC.address, bananaFPCInstance };
       },
-      async data => {
-        this.bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+      data => {
+        this.bananaFPC = FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+        this.bananaFPCInstance = data.bananaFPCInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -302,12 +331,14 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_sponsored_fpc',
       async () => {
-        const sponsoredFPC = await setupSponsoredFPC(this.adminWallet);
-        this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
-        return { sponsoredFPCAddress: sponsoredFPC.address };
+        const sponsoredFPCInstance = await setupSponsoredFPC(this.adminWallet);
+        this.logger.info(`SponsoredFPC at ${sponsoredFPCInstance.address}`);
+        return { sponsoredFPCAddress: sponsoredFPCInstance.address, sponsoredFPCInstance };
       },
-      async ({ sponsoredFPCAddress }) => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+      ({ sponsoredFPCAddress, sponsoredFPCInstance }) => {
+        this.sponsoredFPC = SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+        this.sponsoredFPCInstance = sponsoredFPCInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -361,24 +392,38 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_amm',
       async () => {
-        const liquidityToken = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n)
+        const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'LPT',
+          'LPT',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
-        const amm = await AMMContract.deploy(
+          .wait();
+        const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
           this.adminWallet,
           this.bananaCoin.address,
           this.candyBarCoin.address,
           liquidityToken.address,
         )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`AMM deployed at ${amm.address}`);
         await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
-        return { ammAddress: amm.address, liquidityTokenAddress: liquidityToken.address };
+        return {
+          ammAddress: amm.address,
+          ammInstance,
+          liquidityTokenAddress: liquidityToken.address,
+          liquidityTokenInstance,
+        };
       },
-      async ({ ammAddress, liquidityTokenAddress }) => {
-        this.liquidityToken = await TokenContract.at(liquidityTokenAddress, this.adminWallet);
-        this.amm = await AMMContract.at(ammAddress, this.adminWallet);
+      ({ ammAddress, ammInstance, liquidityTokenAddress, liquidityTokenInstance }) => {
+        this.liquidityToken = TokenContract.at(liquidityTokenAddress, this.adminWallet);
+        this.liquidityTokenInstance = liquidityTokenInstance;
+        this.amm = AMMContract.at(ammAddress, this.adminWallet);
+        this.ammInstance = ammInstance;
+        return Promise.resolve();
       },
     );
   }

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -130,7 +130,7 @@ export class BlacklistTokenContractTest {
       },
       async ({ tokenContractAddress, badAccountAddress }) => {
         // Restore the token contract state.
-        this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallet);
+        this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
         this.logger.verbose(`Token contract address: ${this.asset.address}`);
 
         this.tokenSim = new TokenSimulator(
@@ -141,7 +141,7 @@ export class BlacklistTokenContractTest {
           [this.adminAddress, this.otherAddress, this.blacklistedAddress],
         );
 
-        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallet);
+        this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -134,9 +134,9 @@ export class CrossChainMessagingTest {
 
         return this.crossChainTestHarness.toCrossChainContext();
       },
-      async crossChainContext => {
-        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.wallet);
-        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
+      crossChainContext => {
+        this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
+        this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
 
         // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
         this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
@@ -172,6 +172,7 @@ export class CrossChainMessagingTest {
         this.l1Client = l1Client;
         this.inbox = inbox;
         this.outbox = outbox;
+        return Promise.resolve();
       },
     );
   }

package/src/e2e_deploy_contract/deploy_test.ts

@@ -73,6 +73,6 @@ export class DeployTest {
 export type StatefulContractCtorArgs = Parameters<StatefulTestContract['methods']['constructor']>;
 
 export type ContractArtifactClass<T extends ContractBase> = {
-  at(address: AztecAddress, wallet: Wallet): Promise<T>;
+  at(address: AztecAddress, wallet: Wallet): T;
   artifact: ContractArtifact;
 };

package/src/e2e_fees/fees_test.ts

@@ -197,7 +197,7 @@ export class FeesTest {
         this.fpcAdmin = this.aliceAddress;
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
+        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
       },
     );
   }
@@ -215,7 +215,7 @@ export class FeesTest {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
+        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
 
         this.getGasBalanceFn = getBalancesFn(
           '⛽',
@@ -245,8 +245,8 @@ export class FeesTest {
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
         return { bananaCoinAddress: bananaCoin.address };
       },
-      async ({ bananaCoinAddress }) => {
-        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.wallet);
+      ({ bananaCoinAddress }) => {
+        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.wallet);
         const logger = this.logger;
         this.getBananaPublicBalanceFn = getBalancesFn(
           '🍌.public',
@@ -260,6 +260,7 @@ export class FeesTest {
           this.aliceAddress,
           logger,
         );
+        return Promise.resolve();
       },
     );
   }
@@ -287,8 +288,8 @@ export class FeesTest {
           rollupAddress: context.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
         };
       },
-      async (data, context) => {
-        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.wallet);
+      (data, context) => {
+        const bananaFPC = FPCContract.at(data.bananaFPCAddress, this.wallet);
         this.bananaFPC = bananaFPC;
 
         this.getCoinbaseBalance = async () => {
@@ -328,6 +329,7 @@ export class FeesTest {
           const mana = block!.header.totalManaUsed.toBigInt();
           return mulDiv(mana * proverCost, price, 10n ** 9n);
         };
+        return Promise.resolve();
       },
     );
   }
@@ -346,8 +348,9 @@ export class FeesTest {
           sponsoredFPCAddress: sponsoredFPC.address,
         };
       },
-      async data => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
+      data => {
+        this.sponsoredFPC = SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
+        return Promise.resolve();
       },
     );
   }

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -86,9 +86,10 @@ export class NestedContractTest {
           .deployed();
         return { parentContractAddress: parentContract.address, childContractAddress: childContract.address };
       },
-      async ({ parentContractAddress, childContractAddress }) => {
-        this.parentContract = await ParentContract.at(parentContractAddress, this.wallet);
-        this.childContract = await ChildContract.at(childContractAddress, this.wallet);
+      ({ parentContractAddress, childContractAddress }) => {
+        this.parentContract = ParentContract.at(parentContractAddress, this.wallet);
+        this.childContract = ChildContract.at(childContractAddress, this.wallet);
+        return Promise.resolve();
       },
     );
   }

package/src/e2e_p2p/p2p_network.ts

@@ -326,11 +326,12 @@ export class P2PNetworkTest {
           .deployed();
         return { contractAddress: spamContract.address };
       },
-      async ({ contractAddress }) => {
+      ({ contractAddress }) => {
         if (!this.wallet) {
           throw new Error('Call snapshot t.setupAccount before deploying account contract');
         }
-        this.spamContract = await SpamContract.at(contractAddress, this.wallet);
+        this.spamContract = SpamContract.at(contractAddress, this.wallet);
+        return Promise.resolve();
       },
     );
   }

package/src/e2e_p2p/shared.ts

@@ -80,7 +80,7 @@ export async function prepareTransactions(
     salt: Fr.random(),
   });
   await wallet.registerContract(testContractInstance, TestContractArtifact);
-  const contract = await TestContract.at(testContractInstance.address, wallet);
+  const contract = TestContract.at(testContractInstance.address, wallet);
 
   return timesAsync(numTxs, async () => {
     const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {

package/src/e2e_token_contract/token_contract_test.ts

@@ -90,7 +90,7 @@ export class TokenContractTest {
       },
       async ({ tokenContractAddress, badAccountAddress }) => {
         // Restore the token contract state.
-        this.asset = await TokenContract.at(tokenContractAddress, this.wallet);
+        this.asset = TokenContract.at(tokenContractAddress, this.wallet);
         this.logger.verbose(`Token contract address: ${this.asset.address}`);
 
         this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
@@ -98,7 +98,7 @@ export class TokenContractTest {
           this.account1Address,
         ]);
 
-        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallet);
+        this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_admin().simulate({ from: this.adminAddress })).toBe(

package/src/fixtures/e2e_prover_test.ts

@@ -19,6 +19,7 @@ import { SecretValue } from '@aztec/foundation/config';
 import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { type ProverNode, type ProverNodeConfig, createProverNode } from '@aztec/prover-node';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { TestWallet } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -63,6 +64,7 @@ export class FullProverTest {
   accounts: AztecAddress[] = [];
   deployedAccounts!: InitialAccountData[];
   fakeProofsAsset!: TokenContract;
+  fakeProofsAssetInstance!: ContractInstanceWithAddress;
   tokenSim!: TokenSimulator;
   aztecNode!: AztecNode;
   aztecNodeAdmin!: AztecNodeAdmin;
@@ -122,7 +124,7 @@ export class FullProverTest {
         await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
 
         this.logger.verbose(`Deploying TokenContract...`);
-        const asset = await TokenContract.deploy(
+        const { contract: asset, instance } = await TokenContract.deploy(
           this.wallet,
           this.accounts[0],
           FullProverTest.TOKEN_NAME,
@@ -130,14 +132,15 @@ export class FullProverTest {
           FullProverTest.TOKEN_DECIMALS,
         )
           .send({ from: this.accounts[0] })
-          .deployed();
+          .wait();
         this.logger.verbose(`Token deployed to ${asset.address}`);
 
-        return { tokenContractAddress: asset.address };
+        return { tokenContractAddress: asset.address, tokenContractInstance: instance };
       },
-      async ({ tokenContractAddress }) => {
+      async ({ tokenContractAddress, tokenContractInstance }) => {
         // Restore the token contract state.
-        this.fakeProofsAsset = await TokenContract.at(tokenContractAddress, this.wallet);
+        this.fakeProofsAsset = TokenContract.at(tokenContractAddress, this.wallet);
+        this.fakeProofsAssetInstance = tokenContractInstance;
         this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
 
         this.tokenSim = new TokenSimulator(
@@ -216,14 +219,14 @@ export class FullProverTest {
       true,
     );
     this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
-    await provenWallet.registerContract(this.fakeProofsAsset);
+    await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
 
     for (let i = 0; i < 2; i++) {
       await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
       await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
     }
 
-    const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
+    const asset = TokenContract.at(this.fakeProofsAsset.address, provenWallet);
     this.provenComponents.push({
       wallet: provenWallet,
       teardown: provenTeardown,

package/src/fixtures/token_utils.ts

@@ -6,9 +6,9 @@ import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
 export async function deployToken(wallet: Wallet, admin: AztecAddress, initialAdminBalance: bigint, logger: Logger) {
   logger.info(`Deploying Token contract...`);
-  const contract = await TokenContract.deploy(wallet, admin, 'TokenName', 'TokenSymbol', 18)
+  const { contract, instance } = await TokenContract.deploy(wallet, admin, 'TokenName', 'TokenSymbol', 18)
     .send({ from: admin })
-    .deployed();
+    .wait();
 
   if (initialAdminBalance > 0n) {
     await mintTokensToPrivate(contract, admin, admin, initialAdminBalance);
@@ -16,7 +16,7 @@ export async function deployToken(wallet: Wallet, admin: AztecAddress, initialAd
 
   logger.info('L2 contract deployed');
 
-  return contract;
+  return { contract, instance };
 }
 
 export async function mintTokensToPrivate(
@@ -36,7 +36,7 @@ export async function expectTokenBalance(
   logger: Logger,
 ) {
   // Then check the balance
-  const contractWithWallet = await TokenContract.at(token.address, wallet);
+  const contractWithWallet = TokenContract.at(token.address, wallet);
   const balance = await contractWithWallet.methods.balance_of_private(owner).simulate({ from: owner });
   logger.info(`Account ${owner} balance: ${balance}`);
   expect(balance).toBe(expectedBalance);

package/src/fixtures/utils.ts

@@ -858,7 +858,7 @@ export async function setupSponsoredFPC(wallet: Wallet) {
     salt: new Fr(SPONSORED_FPC_SALT),
   });
 
-  await wallet.registerContract({ instance, artifact: SponsoredFPCContract.artifact });
+  await wallet.registerContract(instance, SponsoredFPCContract.artifact);
   getLogger().info(`SponsoredFPC: ${instance.address}`);
   return instance;
 }
@@ -868,7 +868,7 @@ export async function setupSponsoredFPC(wallet: Wallet) {
  * @param wallet - The wallet
  */
 export async function registerSponsoredFPC(wallet: Wallet): Promise<void> {
-  await wallet.registerContract({ instance: await getSponsoredFPCInstance(), artifact: SponsoredFPCContract.artifact });
+  await wallet.registerContract(await getSponsoredFPCInstance(), SponsoredFPCContract.artifact);
 }
 
 export async function waitForProvenChain(node: AztecNode, targetBlock?: number, timeoutSec = 60, intervalSec = 1) {

package/src/shared/gas_portal_test_harness.ts

@@ -43,7 +43,7 @@ export class FeeJuicePortalTestingHarnessFactory {
       throw new Error('Fee Juice portal not deployed on L1');
     }
 
-    const gasL2 = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
+    const gasL2 = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
 
     return new GasBridgingTestHarness(
       aztecNode,