@aztec/end-to-end 1.2.1 → 2.0.0-nightly.20250813

package/src/shared/cross_chain_test_harness.ts

@@ -75,22 +75,26 @@ export async function deployAndInitializeTokenAndBridgeContracts(
   });
 
   // deploy l2 token
-  const token = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send().deployed();
+  const token = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18)
+    .send({ from: owner })
+    .deployed();
 
   // deploy l2 token bridge and attach to the portal
-  const bridge = await TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress).send().deployed();
+  const bridge = await TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress)
+    .send({ from: owner })
+    .deployed();
 
-  if ((await token.methods.get_admin().simulate()) !== owner.toBigInt()) {
+  if ((await token.methods.get_admin().simulate({ from: owner })) !== owner.toBigInt()) {
     throw new Error(`Token admin is not ${owner}`);
   }
 
-  if (!(await bridge.methods.get_config().simulate()).token.equals(token.address)) {
+  if (!(await bridge.methods.get_config().simulate({ from: owner })).token.equals(token.address)) {
     throw new Error(`Bridge token is not ${token.address}`);
   }
 
   // make the bridge a minter on the token:
-  await token.methods.set_minter(bridge.address, true).send().wait();
-  if ((await token.methods.is_minter(bridge.address).simulate()) === 1n) {
+  await token.methods.set_minter(bridge.address, true).send({ from: owner }).wait();
+  if ((await token.methods.is_minter(bridge.address).simulate({ from: owner })) === 1n) {
     throw new Error(`Bridge is not a minter`);
   }
 
@@ -131,6 +135,7 @@ export class CrossChainTestHarness {
     pxeService: PXE,
     l1Client: ExtendedViemWalletClient,
     wallet: AccountWallet,
+    ownerAddress: AztecAddress,
     logger: Logger,
     underlyingERC20Address: EthAddress,
   ): Promise<CrossChainTestHarness> {
@@ -160,14 +165,13 @@ export class CrossChainTestHarness {
       l1Client,
       l1ContractAddresses,
       wallet,
+      ownerAddress,
     );
   }
 
   private readonly l1TokenManager: L1TokenManager;
   private readonly l1TokenPortalManager: L1TokenPortalManager;
 
-  public readonly ownerAddress: AztecAddress;
-
   constructor(
     /** Aztec node instance. */
     public aztecNode: AztecNode,
@@ -196,6 +200,9 @@ export class CrossChainTestHarness {
 
     /** Wallet of the owner. */
     public readonly ownerWallet: AccountWallet,
+
+    /** Owner of the l2 token and bridge */
+    public readonly ownerAddress: AztecAddress,
   ) {
     this.l1TokenPortalManager = new L1TokenPortalManager(
       this.tokenPortalAddress,
@@ -235,16 +242,19 @@ export class CrossChainTestHarness {
 
   async mintTokensPublicOnL2(amount: bigint) {
     this.logger.info('Minting tokens on L2 publicly');
-    await this.l2Token.methods.mint_to_public(this.ownerAddress, amount).send().wait();
+    await this.l2Token.methods.mint_to_public(this.ownerAddress, amount).send({ from: this.ownerAddress }).wait();
   }
 
   async mintTokensPrivateOnL2(amount: bigint) {
-    await mintTokensToPrivate(this.l2Token, this.ownerWallet, this.ownerAddress, amount);
+    await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerWallet, this.ownerAddress, amount);
   }
 
   async sendL2PublicTransfer(transferAmount: bigint, receiverAddress: AztecAddress) {
     // send a transfer tx to force through rollup with the message included
-    await this.l2Token.methods.transfer_in_public(this.ownerAddress, receiverAddress, transferAmount, 0).send().wait();
+    await this.l2Token.methods
+      .transfer_in_public(this.ownerAddress, receiverAddress, transferAmount, 0)
+      .send({ from: this.ownerAddress })
+      .wait();
   }
 
   async consumeMessageOnAztecAndMintPrivately(
@@ -254,7 +264,7 @@ export class CrossChainTestHarness {
     const { recipient, claimAmount, claimSecret: secretForL2MessageConsumption, messageLeafIndex } = claim;
     await this.l2Bridge.methods
       .claim_private(recipient, claimAmount, secretForL2MessageConsumption, messageLeafIndex)
-      .send()
+      .send({ from: this.ownerAddress })
       .wait();
   }
 
@@ -265,7 +275,7 @@ export class CrossChainTestHarness {
     const { claimAmount, claimSecret, messageLeafIndex } = claim;
     await this.l2Bridge.methods
       .claim_public(this.ownerAddress, claimAmount, claimSecret, messageLeafIndex)
-      .send()
+      .send({ from: this.ownerAddress })
       .wait();
   }
 
@@ -276,7 +286,7 @@ export class CrossChainTestHarness {
   ): Promise<FieldsOf<TxReceipt>> {
     const withdrawReceipt = await this.l2Bridge.methods
       .exit_to_l1_private(this.l2Token.address, this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce)
-      .send({ authWitnesses: [authWitness] })
+      .send({ authWitnesses: [authWitness], from: this.ownerAddress })
       .wait();
 
     return withdrawReceipt;
@@ -285,7 +295,7 @@ export class CrossChainTestHarness {
   async withdrawPublicFromAztecToL1(withdrawAmount: bigint, authwitNonce: Fr = Fr.ZERO): Promise<FieldsOf<TxReceipt>> {
     const withdrawReceipt = await this.l2Bridge.methods
       .exit_to_l1_public(this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce)
-      .send()
+      .send({ from: this.ownerAddress })
       .wait();
 
     return withdrawReceipt;
@@ -302,7 +312,7 @@ export class CrossChainTestHarness {
   }
 
   async getL2PublicBalanceOf(owner: AztecAddress) {
-    return await this.l2Token.methods.balance_of_public(owner).simulate();
+    return await this.l2Token.methods.balance_of_public(owner).simulate({ from: this.ownerAddress });
   }
 
   async expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint) {
@@ -336,14 +346,17 @@ export class CrossChainTestHarness {
 
   async transferToPrivateOnL2(shieldAmount: bigint) {
     this.logger.info('Transferring to private on L2');
-    await this.l2Token.methods.transfer_to_private(this.ownerAddress, shieldAmount).send().wait();
+    await this.l2Token.methods
+      .transfer_to_private(this.ownerAddress, shieldAmount)
+      .send({ from: this.ownerAddress })
+      .wait();
   }
 
   async transferToPublicOnL2(amount: bigint, authwitNonce = Fr.ZERO) {
     this.logger.info('Transferring tokens to public');
     await this.l2Token.methods
       .transfer_to_public(this.ownerAddress, this.ownerAddress, amount, authwitNonce)
-      .send()
+      .send({ from: this.ownerAddress })
       .wait();
   }
 

package/src/shared/gas_portal_test_harness.ts

@@ -22,7 +22,7 @@ import { getContract } from 'viem';
 export interface IGasBridgingTestHarness {
   getL1FeeJuiceBalance(address: EthAddress): Promise<bigint>;
   prepareTokensOnL1(bridgeAmount: bigint, owner: AztecAddress): Promise<L2AmountClaim>;
-  bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress): Promise<void>;
+  bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress, claimer: AztecAddress): Promise<void>;
   feeJuice: FeeJuiceContract;
   l1FeeJuiceAddress: EthAddress;
 }
@@ -141,14 +141,14 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     return this.feeJuicePortalManager.bridgeTokensPublic(l2Address, bridgeAmount, false);
   }
 
-  async consumeMessageOnAztecAndClaimPrivately(owner: AztecAddress, claim: L2AmountClaim) {
+  async consumeMessageOnAztecAndClaimPrivately(owner: AztecAddress, claimer: AztecAddress, claim: L2AmountClaim) {
     this.logger.info('Consuming messages on L2 Privately');
     const { claimAmount, claimSecret, messageLeafIndex } = claim;
-    await this.feeJuice.methods.claim(owner, claimAmount, claimSecret, messageLeafIndex).send().wait();
+    await this.feeJuice.methods.claim(owner, claimAmount, claimSecret, messageLeafIndex).send({ from: claimer }).wait();
   }
 
   async getL2PublicBalanceOf(owner: AztecAddress) {
-    return await this.feeJuice.methods.balance_of_public(owner).simulate();
+    return await this.feeJuice.methods.balance_of_public(owner).simulate({ from: owner });
   }
 
   async expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint) {
@@ -170,18 +170,28 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     return claim;
   }
 
-  async bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress) {
+  async bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress, claimer: AztecAddress) {
     // Prepare the tokens on the L1 side
     const claim = await this.prepareTokensOnL1(bridgeAmount, owner);
 
     // Consume L1 -> L2 message and claim tokens privately on L2
-    await this.consumeMessageOnAztecAndClaimPrivately(owner, claim);
+    await this.consumeMessageOnAztecAndClaimPrivately(owner, claimer, claim);
   }
 
   private async advanceL2Block() {
     const initialBlockNumber = await this.aztecNode.getBlockNumber();
-    await this.aztecNodeAdmin?.flushTxs();
+
+    let minTxsPerBlock = undefined;
+    if (this.aztecNodeAdmin) {
+      ({ minTxsPerBlock } = await this.aztecNodeAdmin.getConfig());
+      await this.aztecNodeAdmin.setConfig({ minTxsPerBlock: 0 }); // Set to 0 to ensure we can advance the block
+    }
+
     await retryUntil(async () => (await this.aztecNode.getBlockNumber()) >= initialBlockNumber + 1);
+
+    if (this.aztecNodeAdmin && minTxsPerBlock !== undefined) {
+      await this.aztecNodeAdmin.setConfig({ minTxsPerBlock });
+    }
   }
 }
 // docs:end:cross_chain_test_harness

package/src/shared/uniswap_l1_l2.ts

@@ -9,7 +9,7 @@ import {
   computeAuthWitMessageHash,
   generateClaimSecret,
 } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
+import { CheatCodes } from '@aztec/aztec/testing';
 import {
   type DeployL1ContractsReturnType,
   type ExtendedViemWalletClient,
@@ -26,7 +26,7 @@ import { computeL2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
 import { jest } from '@jest/globals';
 import { type GetContractReturnType, getContract, parseEther, toFunctionSelector } from 'viem';
 
-import { ensureAccountsPubliclyDeployed } from '../fixtures/utils.js';
+import { ensureAccountContractsPublished } from '../fixtures/utils.js';
 import { CrossChainTestHarness } from './cross_chain_test_harness.js';
 
 // PSA: This tests works on forked mainnet. There is a dump of the data in `dumpedState` such that we
@@ -83,7 +83,7 @@ export const uniswapL1L2TestSuite = (
     let ownerEthAddress: EthAddress;
     // does transactions on behalf of owner on Aztec:
     let sponsorWallet: AccountWallet;
-    // let sponsorAddress: AztecAddress;
+    let sponsorAddress: AztecAddress;
 
     let daiCrossChainHarness: CrossChainTestHarness;
     let wethCrossChainHarness: CrossChainTestHarness;
@@ -114,10 +114,10 @@ export const uniswapL1L2TestSuite = (
       );
       version = Number(await rollup.getVersion());
       ownerAddress = ownerWallet.getAddress();
-      // sponsorAddress = sponsorWallet.getAddress();
+      sponsorAddress = sponsorWallet.getAddress();
       ownerEthAddress = EthAddress.fromString((await l1Client.getAddresses())[0]);
 
-      await ensureAccountsPubliclyDeployed(ownerWallet, [ownerWallet, sponsorWallet]);
+      await ensureAccountContractsPublished(ownerWallet, [ownerWallet, sponsorWallet]);
 
       logger.info('Deploying DAI Portal, initializing and deploying l2 contract...');
       daiCrossChainHarness = await CrossChainTestHarness.new(
@@ -125,6 +125,7 @@ export const uniswapL1L2TestSuite = (
         pxe,
         deployL1ContractsValues.l1Client,
         ownerWallet,
+        ownerAddress,
         logger,
         DAI_ADDRESS,
       );
@@ -135,6 +136,7 @@ export const uniswapL1L2TestSuite = (
         pxe,
         l1Client,
         ownerWallet,
+        ownerAddress,
         logger,
         WETH9_ADDRESS,
       );
@@ -150,7 +152,9 @@ export const uniswapL1L2TestSuite = (
         client: l1Client,
       });
       // deploy l2 uniswap contract and attach to portal
-      uniswapL2Contract = await UniswapContract.deploy(ownerWallet, uniswapPortalAddress).send().deployed();
+      uniswapL2Contract = await UniswapContract.deploy(ownerWallet, uniswapPortalAddress)
+        .send({ from: ownerAddress })
+        .deployed();
 
       const registryAddress = (await pxe.getNodeInfo()).l1ContractAddresses.registryAddress;
 
@@ -228,7 +232,7 @@ export const uniswapL1L2TestSuite = (
           secretHashForDepositingSwappedDai,
           ownerEthAddress,
         )
-        .send({ authWitnesses: [transferToPublicAuhtwit] })
+        .send({ from: ownerAddress, authWitnesses: [transferToPublicAuhtwit] })
         .wait();
 
       const swapPrivateFunction = 'swap_private(address,uint256,uint24,address,uint256,bytes32,address)';
@@ -290,10 +294,10 @@ export const uniswapL1L2TestSuite = (
         withdrawLeaf,
       );
 
-      const swapPrivateL2MessageIndex = swapResult!.l2MessageIndex;
+      const swapPrivateL2MessageIndex = swapResult!.leafIndex;
       const swapPrivateSiblingPath = swapResult!.siblingPath;
 
-      const withdrawL2MessageIndex = withdrawResult!.l2MessageIndex;
+      const withdrawL2MessageIndex = withdrawResult!.leafIndex;
       const withdrawSiblingPath = withdrawResult!.siblingPath;
 
       const withdrawMessageMetadata = {
@@ -634,7 +638,7 @@ export const uniswapL1L2TestSuite = (
             Fr.random(),
             ownerEthAddress,
           )
-          .simulate(),
+          .simulate({ from: ownerAddress }),
       ).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
     });
 
@@ -671,7 +675,7 @@ export const uniswapL1L2TestSuite = (
             Fr.random(),
             ownerEthAddress,
           )
-          .prove({ authWitnesses: [transferToPublicAuthwith] }),
+          .prove({ from: ownerAddress, authWitnesses: [transferToPublicAuthwith] }),
       ).rejects.toThrow('Assertion failed: input_asset address is not the same as seen in the bridge contract');
     });
 
@@ -695,7 +699,7 @@ export const uniswapL1L2TestSuite = (
         },
         true,
       );
-      await validateActionInteraction.send().wait();
+      await validateActionInteraction.send({ from: ownerAddress }).wait();
 
       // No approval to call `swap` but should work even without it:
       const [_, secretHashForDepositingSwappedDai] = await generateClaimSecret();
@@ -714,7 +718,7 @@ export const uniswapL1L2TestSuite = (
           ownerEthAddress,
           Fr.ZERO, // nonce for swap -> doesn't matter
         )
-        .send()
+        .send({ from: ownerAddress })
         .wait();
       // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
       await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
@@ -743,9 +747,9 @@ export const uniswapL1L2TestSuite = (
           nonceForSwap,
         );
       const validateActionInteraction = await ownerWallet.setPublicAuthWit({ caller: approvedUser, action }, true);
-      await validateActionInteraction.send().wait();
+      await validateActionInteraction.send({ from: sponsorAddress }).wait();
 
-      await expect(action.simulate()).rejects.toThrow(/unauthorized/);
+      await expect(action.simulate({ from: sponsorAddress })).rejects.toThrow(/unauthorized/);
     });
 
     it("uniswap can't pull funds without transfer approval", async () => {
@@ -764,7 +768,7 @@ export const uniswapL1L2TestSuite = (
         },
         true,
       );
-      await validateActionInteraction.send().wait();
+      await validateActionInteraction.send({ from: ownerAddress }).wait();
 
       await expect(
         uniswapL2Contract.methods
@@ -781,7 +785,7 @@ export const uniswapL1L2TestSuite = (
             ownerEthAddress,
             Fr.ZERO,
           )
-          .simulate(),
+          .simulate({ from: ownerAddress }),
       ).rejects.toThrow(/unauthorized/);
     });
 
@@ -821,7 +825,7 @@ export const uniswapL1L2TestSuite = (
           secretHashForDepositingSwappedDai,
           ownerEthAddress,
         )
-        .send({ authWitnesses: [transferToPublicAuhtwit] })
+        .send({ from: ownerAddress, authWitnesses: [transferToPublicAuhtwit] })
         .wait();
 
       const swapPrivateContent = sha256ToField([
@@ -868,10 +872,10 @@ export const uniswapL1L2TestSuite = (
         withdrawLeaf,
       );
 
-      const swapPrivateL2MessageIndex = swapResult!.l2MessageIndex;
+      const swapPrivateL2MessageIndex = swapResult!.leafIndex;
       const swapPrivateSiblingPath = swapResult!.siblingPath;
 
-      const withdrawL2MessageIndex = withdrawResult!.l2MessageIndex;
+      const withdrawL2MessageIndex = withdrawResult!.leafIndex;
       const withdrawSiblingPath = withdrawResult!.siblingPath;
 
       const withdrawMessageMetadata = {
@@ -934,7 +938,7 @@ export const uniswapL1L2TestSuite = (
         },
         true,
       );
-      await validateActionInteraction.send().wait();
+      await validateActionInteraction.send({ from: ownerAddress }).wait();
 
       // Call swap_public on L2
       const secretHashForDepositingSwappedDai = Fr.random();
@@ -952,7 +956,7 @@ export const uniswapL1L2TestSuite = (
           ownerEthAddress,
           Fr.ZERO,
         )
-        .send()
+        .send({ from: ownerAddress })
         .wait();
 
       const swapPublicContent = sha256ToField([
@@ -1002,10 +1006,10 @@ export const uniswapL1L2TestSuite = (
         withdrawLeaf,
       );
 
-      const swapPublicL2MessageIndex = swapResult!.l2MessageIndex;
+      const swapPublicL2MessageIndex = swapResult!.leafIndex;
       const swapPublicSiblingPath = swapResult!.siblingPath;
 
-      const withdrawL2MessageIndex = withdrawResult!.l2MessageIndex;
+      const withdrawL2MessageIndex = withdrawResult!.leafIndex;
       const withdrawSiblingPath = withdrawResult!.siblingPath;
 
       const withdrawMessageMetadata = {

package/src/simulators/lending_simulator.ts

@@ -1,6 +1,6 @@
 // Convenience struct to hold an account's address and secret that can easily be passed around.
 import { AztecAddress, Fr } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
+import { CheatCodes } from '@aztec/aztec/testing';
 import type { RollupContract } from '@aztec/ethereum';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import type { TestDateProvider } from '@aztec/foundation/timer';
@@ -183,14 +183,14 @@ export class LendingSimulator {
 
     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));
 
     for (const key of [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: key });
       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(

package/src/simulators/token_simulator.ts

@@ -13,6 +13,7 @@ export class TokenSimulator {
   constructor(
     protected token: TokenContract,
     protected defaultWallet: Wallet,
+    protected defaultAddress: AztecAddress,
     protected logger: Logger,
     protected accounts: AztecAddress[],
   ) {}
@@ -102,7 +103,9 @@ export class TokenSimulator {
     ];
 
     const results = (
-      await Promise.all(chunk(calls, 4).map(batch => new BatchCall(this.defaultWallet, batch).simulate()))
+      await Promise.all(
+        chunk(calls, 4).map(batch => new BatchCall(this.defaultWallet, batch).simulate({ from: this.defaultAddress })),
+      )
     ).flat();
     expect(results[0]).toEqual(this.totalSupply);
 
@@ -127,7 +130,11 @@ export class TokenSimulator {
 
     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()))
+      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]));
@@ -139,7 +146,9 @@ export class TokenSimulator {
       const wallet = this.lookupProvider.get(address.toString());
       const asset = wallet ? this.token.withWallet(wallet) : this.token;
 
-      const actualPrivateBalance = await asset.methods.balance_of_private({ address }).simulate();
+      const actualPrivateBalance = await asset.methods
+        .balance_of_private({ address })
+        .simulate({ from: this.defaultAddress });
       expect(actualPrivateBalance).toEqual(this.balanceOfPrivate(address));
     }
   }