@aztec/end-to-end 1.0.0-nightly.20250810 → 1.0.0-nightly.20250812

package/dest/shared/uniswap_l1_l2.js

@@ -33,7 +33,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
         let ownerEthAddress;
         // does transactions on behalf of owner on Aztec:
         let sponsorWallet;
-        // let sponsorAddress: AztecAddress;
+        let sponsorAddress;
         let daiCrossChainHarness;
         let wethCrossChainHarness;
         let deployL1ContractsValues;
@@ -54,16 +54,16 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
             version = Number(await rollup.getVersion());
             ownerAddress = ownerWallet.getAddress();
-            // sponsorAddress = sponsorWallet.getAddress();
+            sponsorAddress = sponsorWallet.getAddress();
             ownerEthAddress = EthAddress.fromString((await l1Client.getAddresses())[0]);
             await ensureAccountContractsPublished(ownerWallet, [
                 ownerWallet,
                 sponsorWallet
             ]);
             logger.info('Deploying DAI Portal, initializing and deploying l2 contract...');
-            daiCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, deployL1ContractsValues.l1Client, ownerWallet, logger, DAI_ADDRESS);
+            daiCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, deployL1ContractsValues.l1Client, ownerWallet, ownerAddress, logger, DAI_ADDRESS);
             logger.info('Deploying WETH Portal, initializing and deploying l2 contract...');
-            wethCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, l1Client, ownerWallet, logger, WETH9_ADDRESS);
+            wethCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, l1Client, ownerWallet, ownerAddress, logger, WETH9_ADDRESS);
             logger.info('Deploy Uniswap portal on L1 and L2...');
             uniswapPortalAddress = await deployL1Contract(l1Client, UniswapPortalAbi, UniswapPortalBytecode).then(({ address })=>address);
             uniswapPortal = getContract({
@@ -72,7 +72,9 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 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;
             await uniswapPortal.write.initialize([
                 registryAddress.toString(),
@@ -121,6 +123,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             logger.info('Withdrawing weth to L1 and sending message to swap to dai');
             const [secretForDepositingSwappedDai, secretHashForDepositingSwappedDai] = await generateClaimSecret();
             const l2UniswapInteractionReceipt = await uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, secretHashForDepositingSwappedDai, ownerEthAddress).send({
+                from: ownerAddress,
                 authWitnesses: [
                     transferToPublicAuhtwit
                 ]
@@ -444,7 +447,9 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 chainId: ownerWallet.getChainId(),
                 version: ownerWallet.getVersion()
             });
-            await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).simulate()).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
+            await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).simulate({
+                from: ownerAddress
+            })).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
         });
         it("can't swap if user passes a token different to what the bridge tracks", async ()=>{
             // 1. give user private funds on L2:
@@ -460,6 +465,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // 3. Swap but send the wrong token address
             logger.info('Swap but send the wrong token address');
             await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, daiCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).prove({
+                from: ownerAddress,
                 authWitnesses: [
                     transferToPublicAuthwith
                 ]
@@ -475,10 +481,14 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, 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();
-            await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send().wait();
+            await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).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);
         });
@@ -493,8 +503,12 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: approvedUser,
                 action
             }, true);
-            await validateActionInteraction.send().wait();
-            await expect(action.simulate()).rejects.toThrow(/unauthorized/);
+            await validateActionInteraction.send({
+                from: sponsorAddress
+            }).wait();
+            await expect(action.simulate({
+                from: sponsorAddress
+            })).rejects.toThrow(/unauthorized/);
         });
         it("uniswap can't pull funds without transfer approval", async ()=>{
             // swap should fail since no transfer approval to uniswap:
@@ -503,8 +517,12 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
-            await validateActionInteraction.send().wait();
-            await expect(uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, new Fr(420), uniswapFeeTier, minimumOutputAmount, ownerAddress, Fr.random(), ownerEthAddress, Fr.ZERO).simulate()).rejects.toThrow(/unauthorized/);
+            await validateActionInteraction.send({
+                from: ownerAddress
+            }).wait();
+            await expect(uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, new Fr(420), uniswapFeeTier, minimumOutputAmount, ownerAddress, Fr.random(), ownerEthAddress, Fr.ZERO).simulate({
+                from: ownerAddress
+            })).rejects.toThrow(/unauthorized/);
         });
         // tests when trying to mix private and public flows:
         it("can't call swap_public on L1 if called swap_private on L2", async ()=>{
@@ -523,6 +541,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             logger.info('Withdrawing weth to L1 and sending message to swap to dai');
             const [, secretHashForDepositingSwappedDai] = await generateClaimSecret();
             const withdrawReceipt = await uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, secretHashForDepositingSwappedDai, ownerEthAddress).send({
+                from: ownerAddress,
                 authWitnesses: [
                     transferToPublicAuhtwit
                 ]
@@ -606,10 +625,14 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
-            await validateActionInteraction.send().wait();
+            await validateActionInteraction.send({
+                from: ownerAddress
+            }).wait();
             // Call swap_public on L2
             const secretHashForDepositingSwappedDai = Fr.random();
-            const withdrawReceipt = await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send().wait();
+            const withdrawReceipt = await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send({
+                from: ownerAddress
+            }).wait();
             const swapPublicContent = sha256ToField([
                 Buffer.from(toFunctionSelector('swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)').substring(2), 'hex'),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),

package/dest/simulators/lending_simulator.js

@@ -149,7 +149,9 @@ const computeMultiplier = (rate, dt)=>{
         const totalCollateral = Object.values(this.collateral).reduce((a, b)=>new Fr(a.value + b.value), Fr.ZERO);
         expect(totalCollateral).toEqual(new Fr(this.collateralAsset.balanceOfPublic(this.lendingContract.address)));
         expect(this.borrowed).toEqual(this.stableCoin.totalSupply - this.mintedOutside);
-        const asset = await this.lendingContract.methods.get_asset(0).simulate();
+        const asset = await this.lendingContract.methods.get_asset(0).simulate({
+            from: this.account.address
+        });
         const interestAccumulator = asset['interest_accumulator'];
         expect(interestAccumulator).toEqual(this.accumulator);
         expect(asset['last_updated_ts']).toEqual(BigInt(this.time));
@@ -157,7 +159,9 @@ const computeMultiplier = (rate, dt)=>{
             this.account.address,
             AztecAddress.fromField(await this.account.key())
         ]){
-            const privatePos = await this.lendingContract.methods.get_position(key).simulate();
+            const privatePos = await this.lendingContract.methods.get_position(key).simulate({
+                from: 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(muldivUp((this.staticDebt[key.toString()] ?? Fr.ZERO).value, this.accumulator, BASE));

package/dest/simulators/token_simulator.d.ts

@@ -3,13 +3,14 @@ import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 export declare class TokenSimulator {
     protected token: TokenContract;
     protected defaultWallet: Wallet;
+    protected defaultAddress: AztecAddress;
     protected logger: Logger;
     protected accounts: AztecAddress[];
     private balancesPrivate;
     private balancePublic;
     totalSupply: bigint;
     private lookupProvider;
-    constructor(token: TokenContract, defaultWallet: Wallet, logger: Logger, accounts: AztecAddress[]);
+    constructor(token: TokenContract, defaultWallet: Wallet, defaultAddress: AztecAddress, logger: Logger, accounts: AztecAddress[]);
     addAccount(account: AztecAddress): void;
     setLookupProvider(account: AztecAddress, wallet: Wallet): void;
     mintPrivate(to: AztecAddress, amount: bigint): void;

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

@@ -1 +1 @@
-{"version":3,"file":"token_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/token_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAa,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,qBAAa,cAAc;IAQvB,SAAS,CAAC,KAAK,EAAE,aAAa;IAC9B,SAAS,CAAC,aAAa,EAAE,MAAM;IAC/B,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE;IAVpC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IAChD,WAAW,EAAE,MAAM,CAAM;IAEhC,OAAO,CAAC,cAAc,CAAkC;gBAG5C,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EAAE;IAG7B,UAAU,CAAC,OAAO,EAAE,YAAY;IAIhC,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIvD,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAK5C,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASnE,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASpE,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQtE,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQrE,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ9C,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ7C,eAAe,CAAC,OAAO,EAAE,YAAY;IAIrC,gBAAgB,CAAC,OAAO,EAAE,YAAY;IAIvC,WAAW;IAkBX,YAAY;IAgCL,KAAK;CAInB"}
+{"version":3,"file":"token_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/token_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAa,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,qBAAa,cAAc;IAQvB,SAAS,CAAC,KAAK,EAAE,aAAa;IAC9B,SAAS,CAAC,aAAa,EAAE,MAAM;IAC/B,SAAS,CAAC,cAAc,EAAE,YAAY;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE;IAXpC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IAChD,WAAW,EAAE,MAAM,CAAM;IAEhC,OAAO,CAAC,cAAc,CAAkC;gBAG5C,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,YAAY,EAC5B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EAAE;IAG7B,UAAU,CAAC,OAAO,EAAE,YAAY;IAIhC,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIvD,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAK5C,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASnE,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASpE,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQtE,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQrE,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ9C,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ7C,eAAe,CAAC,OAAO,EAAE,YAAY;IAIrC,gBAAgB,CAAC,OAAO,EAAE,YAAY;IAIvC,WAAW;IAoBX,YAAY;IAsCL,KAAK;CAInB"}

package/dest/simulators/token_simulator.js

@@ -3,15 +3,17 @@ import chunk from 'lodash.chunk';
 export class TokenSimulator {
     token;
     defaultWallet;
+    defaultAddress;
     logger;
     accounts;
     balancesPrivate;
     balancePublic;
     totalSupply;
     lookupProvider;
-    constructor(token, defaultWallet, logger, accounts){
+    constructor(token, defaultWallet, defaultAddress, logger, accounts){
         this.token = token;
         this.defaultWallet = defaultWallet;
+        this.defaultAddress = defaultAddress;
         this.logger = logger;
         this.accounts = accounts;
         this.balancesPrivate = new Map();
@@ -86,7 +88,9 @@ 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()))).flat();
+        const results = (await Promise.all(chunk(calls, 4).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate({
+                from: this.defaultAddress
+            })))).flat();
         expect(results[0]).toEqual(this.totalSupply);
         // Check that all our balances match
         for(let i = 0; i < this.accounts.length; i++){
@@ -105,7 +109,9 @@ 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()))).flat();
+        const results = (await Promise.all(chunk(defaultCalls, 4).map((batch)=>new BatchCall(this.defaultWallet, batch).simulate({
+                from: this.defaultAddress
+            })))).flat();
         for(let i = 0; i < defaultLookups.length; i++){
             expect(results[i]).toEqual(this.balanceOfPrivate(defaultLookups[i]));
         }
@@ -116,7 +122,9 @@ export class TokenSimulator {
             const asset = wallet ? this.token.withWallet(wallet) : this.token;
             const actualPrivateBalance = await asset.methods.balance_of_private({
                 address
-            }).simulate();
+            }).simulate({
+                from: this.defaultAddress
+            });
             expect(actualPrivateBalance).toEqual(this.balanceOfPrivate(address));
         }
     }

package/dest/spartan/setup_test_wallets.d.ts

@@ -5,8 +5,10 @@ export interface TestWallets {
     pxe: PXE;
     wallets: AccountWalletWithSecretKey[];
     tokenAdminWallet: TokenContract;
+    tokenAdminAddress: AztecAddress;
     tokenName: string;
     recipientWallet: AccountWalletWithSecretKey;
+    recipientAddress: AztecAddress;
     tokenAddress: AztecAddress;
 }
 export declare function setupTestWalletsWithTokens(pxeUrl: string, mintAmount: bigint, logger: Logger): Promise<TestWallets>;

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

@@ -1 +1 @@
-{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAMjB,KAAK,GAAG,EAKT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAQ/D,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,gBAAgB,EAAE,aAAa,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,0BAA0B,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAYtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,WAAW,CAAC,CAiCtB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,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,WAAW,CAAC,CAqCtB;AA4ED,wBAAsB,gBAAgB,CAAC,EACrC,WAAW,EACX,MAAM,EACN,cAAc,EACd,MAAM,GACP,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAqBA;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAmBrD"}
+{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAMjB,KAAK,GAAG,EAKT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAQ/D,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,gBAAgB,EAAE,aAAa,CAAC;IAChC,iBAAiB,EAAE,YAAY,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,0BAA0B,CAAC;IAC5C,gBAAgB,EAAE,YAAY,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAqBtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,WAAW,CAAC,CA0CtB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,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,WAAW,CAAC,CA8CtB;AA6ED,wBAAsB,gBAAgB,CAAC,EACrC,WAAW,EACX,MAAM,EACN,cAAc,EACd,MAAM,GACP,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAeA;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAmBrD"}

package/dest/spartan/setup_test_wallets.js

@@ -21,8 +21,10 @@ export async function setupTestWalletsWithTokens(pxeUrl, mintAmount, logger) {
         pxe,
         wallets,
         tokenAdminWallet,
+        tokenAdminAddress: tokenAdmin.getAddress(),
         tokenName: TOKEN_NAME,
         tokenAddress,
+        recipientAddress: recipientWallet.getAddress(),
         recipientWallet
     };
 }
@@ -50,10 +52,12 @@ export async function deploySponsoredTestWallets(pxe, mintAmount, logger, number
     return {
         pxe,
         wallets,
+        tokenAdminAddress: tokenAdmin.getAddress(),
         tokenAdminWallet,
         tokenName: TOKEN_NAME,
         tokenAddress,
-        recipientWallet
+        recipientWallet,
+        recipientAddress: recipientWallet.getAddress()
     };
 }
 export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1) {
@@ -84,10 +88,12 @@ export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mne
     return {
         pxe,
         wallets,
+        tokenAdminAddress: tokenAdmin.getAddress(),
         tokenAdminWallet,
         tokenName: TOKEN_NAME,
         tokenAddress,
-        recipientWallet
+        recipientWallet,
+        recipientAddress: recipientWallet.getAddress()
     };
 }
 async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, recipient, amount, log) {
@@ -122,6 +128,7 @@ async function advanceL2Block(node, nodeAdmin) {
 async function deployTokenAndMint(wallets, admin, mintAmount, paymentMethod, logger) {
     logger.verbose(`Deploying TokenContract...`);
     const tokenContract = await TokenContract.deploy(wallets[0], admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS).send({
+        from: admin,
         fee: {
             paymentMethod
         }
@@ -131,6 +138,7 @@ async function deployTokenAndMint(wallets, admin, mintAmount, paymentMethod, log
     const tokenAddress = tokenContract.address;
     logger.verbose(`Minting ${mintAmount} public assets to the ${wallets.length} wallets...`);
     await Promise.all(wallets.map(async (w)=>(await TokenContract.at(tokenAddress, w)).methods.mint_to_public(w.getAddress(), mintAmount).send({
+            from: admin,
             fee: {
                 paymentMethod
             }
@@ -143,9 +151,11 @@ async function deployTokenAndMint(wallets, admin, mintAmount, paymentMethod, log
 export async function performTransfers({ testWallets, rounds, transferAmount, logger }) {
     const recipient = testWallets.recipientWallet.getAddress();
     for(let i = 0; i < rounds; i++){
-        const interactions = await Promise.all(testWallets.wallets.map(async (w)=>(await TokenContract.at(testWallets.tokenAddress, w)).methods.transfer_in_public(w.getAddress(), recipient, transferAmount, 0)));
-        const txs = await Promise.all(interactions.map(async (i)=>await i.prove()));
-        await Promise.all(txs.map((t)=>t.send().wait({
+        const txs = testWallets.wallets.map(async (w)=>(await TokenContract.at(testWallets.tokenAddress, w)).methods.transfer_in_public(w.getAddress(), recipient, transferAmount, 0).prove({
+                from: w.getAddress()
+            }));
+        const provenTxs = await Promise.all(txs);
+        await Promise.all(provenTxs.map((t)=>t.send().wait({
                 timeout: 600
             })));
         logger.info(`Completed round ${i + 1} / ${rounds}`);

package/package.json

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

package/src/bench/client_flows/benchmark.ts

@@ -301,7 +301,7 @@ export function convertProfileToGHBenchmark(benchmark: ClientFlowBenchmark): Git
 export async function captureProfile(
   label: string,
   interaction: ContractFunctionInteraction | DeployMethod,
-  opts?: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>,
+  opts: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>,
   expectedSteps?: number,
 ) {
   // Make sure the proxy logger starts from a clean slate

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -158,16 +158,20 @@ export class ClientFlowsBenchmark {
   async mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint) {
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods.claim(address, amount, secret, index).send().wait();
+    await this.feeJuiceContract.methods.claim(address, amount, secret, index).send({ from: this.adminAddress }).wait();
   }
 
   /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
   async mintPrivateBananas(amount: bigint, address: AztecAddress) {
-    const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate();
+    const balanceBefore = await this.bananaCoin.methods
+      .balance_of_private(address)
+      .simulate({ from: this.adminAddress });
 
-    await mintTokensToPrivate(this.bananaCoin, this.adminWallet, address, amount);
+    await mintTokensToPrivate(this.bananaCoin, this.adminAddress, this.adminWallet, address, amount);
 
-    const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate();
+    const balanceAfter = await this.bananaCoin.methods
+      .balance_of_private(address)
+      .simulate({ from: this.adminAddress });
     expect(balanceAfter).toEqual(balanceBefore + amount);
   }
 
@@ -259,7 +263,7 @@ export class ClientFlowsBenchmark {
       'deploy_banana_token',
       async () => {
         const bananaCoin = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
         return { bananaCoinAddress: bananaCoin.address };
@@ -275,7 +279,7 @@ export class ClientFlowsBenchmark {
       'deploy_candy_bar_token',
       async () => {
         const candyBarCoin = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
         return { candyBarCoinAddress: candyBarCoin.address };
@@ -295,12 +299,16 @@ export class ClientFlowsBenchmark {
 
         const bananaCoin = this.bananaCoin;
         const bananaFPC = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(FEE_FUNDING_FOR_TESTER_ACCOUNT, bananaFPC.address);
+        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(
+          FEE_FUNDING_FOR_TESTER_ACCOUNT,
+          bananaFPC.address,
+          this.adminAddress,
+        );
 
         return { bananaFPCAddress: bananaFPC.address };
       },
@@ -339,6 +347,7 @@ export class ClientFlowsBenchmark {
       this.pxe,
       l1Client,
       owner,
+      owner.getAddress(),
       this.logger,
       underlyingERC20Address,
     );
@@ -378,7 +387,7 @@ export class ClientFlowsBenchmark {
       'deploy_amm',
       async () => {
         const liquidityToken = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         const amm = await AMMContract.deploy(
           this.adminWallet,
@@ -386,10 +395,10 @@ export class ClientFlowsBenchmark {
           this.candyBarCoin.address,
           liquidityToken.address,
         )
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         this.logger.info(`AMM deployed at ${amm.address}`);
-        await liquidityToken.methods.set_minter(amm.address, true).send().wait();
+        await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
         return { ammAddress: amm.address, liquidityTokenAddress: liquidityToken.address };
       },
       async ({ ammAddress, liquidityTokenAddress }) => {

package/src/bench/utils.ts

@@ -22,7 +22,9 @@ export async function benchmarkSetup(
   },
 ) {
   const context = await setup(1, { ...opts, telemetryConfig: { benchmark: true } });
-  const contract = await BenchmarkingContract.deploy(context.wallet).send().deployed();
+  const contract = await BenchmarkingContract.deploy(context.wallet)
+    .send({ from: context.wallet.getAddress() })
+    .deployed();
   context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
   const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
   const telemetry = context.telemetryClient! as BenchmarkTelemetryClient;
@@ -137,7 +139,7 @@ export async function sendTxs(
 ): Promise<SentTx[]> {
   const calls = times(txCount, index => makeCall(index, context, contract, heavyPublicCompute));
   context.logger.info(`Creating ${txCount} txs`);
-  const provenTxs = await Promise.all(calls.map(call => call.prove()));
+  const provenTxs = await Promise.all(calls.map(call => call.prove({ from: context.wallet.getAddress() })));
   context.logger.info(`Sending ${txCount} txs`);
   return provenTxs.map(tx => tx.send());
 }