fix: enforce from check on all interactions (#16462)

Missed during the initial version

Author: AztecBot

yarn-project/aztec.js/src/contract/base_contract_interaction.ts

@@ -2,6 +2,7 @@ import type { FeeOptions, TxExecutionOptions, UserFeeOptions } from '@aztec/entr
 import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { createLogger } from '@aztec/foundation/log';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasSettings } from '@aztec/stdlib/gas';
 import type { Capsule, TxExecutionRequest, TxProvingResult } from '@aztec/stdlib/tx';
 
@@ -48,6 +49,11 @@ export abstract class BaseContractInteraction {
    * @returns The proving result.
    */
   protected async proveInternal(options: SendMethodOptions): Promise<TxProvingResult> {
+    if (options.from !== AztecAddress.ZERO && !options.from.equals(this.wallet.getAddress())) {
+      throw new Error(
+        `The address provided as from does not match the wallet address. Expected ${this.wallet.getAddress().toString()}, got ${options.from.toString()}.`,
+      );
+    }
     const txRequest = await this.create(options);
     return await this.wallet.proveTx(txRequest);
   }
@@ -60,11 +66,6 @@ export abstract class BaseContractInteraction {
    */
   public async prove(options: SendMethodOptions): Promise<ProvenTx> {
     // docs:end:prove
-    if (!options.from.equals(this.wallet.getAddress())) {
-      throw new Error(
-        `The address provided as from does not match the wallet address. Expected ${this.wallet.getAddress().toString()}, got ${options.from.toString()}.`,
-      );
-    }
     const txProvingResult = await this.proveInternal(options);
     return new ProvenTx(
       this.wallet,

yarn-project/aztec.js/src/contract/contract.test.ts

@@ -163,6 +163,7 @@ describe('Contract Class', () => {
     };
 
     wallet = mock<Wallet>();
+    wallet.getAddress.mockReturnValue(account.address);
     wallet.simulateTx.mockResolvedValue(mockTxSimulationResult);
     wallet.createTxExecutionRequest.mockResolvedValue(mockTxRequest);
     wallet.getContractMetadata.mockResolvedValue({

yarn-project/aztec.js/src/contract/contract_function_interaction.ts

@@ -189,7 +189,7 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
    * @returns An object containing the function return value and profile result.
    */
   public async profile(options: ProfileMethodOptions): Promise<TxProfileResult> {
-    if (!options.from.equals(this.wallet.getAddress())) {
+    if (options.from !== AztecAddress.ZERO && !options.from.equals(this.wallet.getAddress())) {
       throw new Error(
         `The address provided as from does not match the wallet address. Expected ${this.wallet.getAddress().toString()}, got ${options.from.toString()}.`,
       );

yarn-project/end-to-end/src/bench/client_flows/transfers.test.ts

@@ -116,9 +116,7 @@ describe('Transfer benchmark', () => {
               caller: adminWallet.getAddress(),
               action: interaction,
             });
-            await interaction
-              .send({ from: benchysWallet.getAddress(), authWitnesses: [witness] })
-              .wait({ timeout: 120 });
+            await interaction.send({ from: adminAddress, authWitnesses: [witness] }).wait({ timeout: 120 });
           });
 
           // Ensure we create a change note, by sending an amount that is not a multiple of the note amount

yarn-project/end-to-end/src/composed/docs_examples.test.ts

@@ -29,9 +29,9 @@ describe('docs_examples', () => {
     await newAccount.deploy({ deployWallet: wallet }).wait();
     const newWallet = await newAccount.getWallet();
     const newAccountAddress = newWallet.getAddress();
-    // docs:end:create_wallet
 
     const defaultAccountAddress = wallet.getAddress();
+    // docs:end:create_wallet
 
     const deployedContract = await TokenContract.deploy(
       wallet, // wallet instance
@@ -49,16 +49,11 @@ describe('docs_examples', () => {
     // docs:end:full_deploy
 
     // docs:start:send_transaction
-    const _tx = await contract.methods
-      .mint_to_public(newWallet.getAddress(), 1)
-      .send({ from: newAccountAddress })
-      .wait();
+    await contract.methods.mint_to_public(newAccountAddress, 1).send({ from: defaultAccountAddress }).wait();
     // docs:end:send_transaction
 
     // docs:start:simulate_function
-    const balance = await contract.methods
-      .balance_of_public(newWallet.getAddress())
-      .simulate({ from: newAccountAddress });
+    const balance = await contract.methods.balance_of_public(newAccountAddress).simulate({ from: newAccountAddress });
     expect(balance).toEqual(1n);
     // docs:end:simulate_function
   });

yarn-project/end-to-end/src/e2e_2_pxes.test.ts

@@ -218,7 +218,7 @@ describe('e2e_2_pxes', () => {
     const contractWithSharedWalletA = await TokenContract.at(token.address, sharedWalletOnA);
     await contractWithSharedWalletA.methods
       .transfer(accountBAddress, transferAmount2)
-      .send({ from: accountAAddress })
+      .send({ from: sharedAccountAddress })
       .wait();
 
     // check balances from PXE-A's perspective

yarn-project/end-to-end/src/e2e_block_building.test.ts

@@ -289,6 +289,7 @@ describe('e2e_block_building', () => {
 
     beforeAll(async () => {
       ({ teardown, pxe, logger, wallet: owner } = await setup(1));
+      ownerAddress = owner.getAddress();
       contract = await TestContract.deploy(owner).send({ from: ownerAddress }).deployed();
       logger.info(`Test contract deployed at ${contract.address}`);
     });
@@ -515,6 +516,7 @@ describe('e2e_block_building', () => {
         skipProtocolContracts: true,
         ethereumSlotDuration: 6,
       }));
+      ownerAddress = owner.getAddress();
 
       logger.info('Deploying token contract');
       const token = await TokenContract.deploy(owner, owner.getCompleteAddress(), 'TokenName', 'TokenSymbol', 18)

yarn-project/end-to-end/src/e2e_card_game.test.ts

@@ -141,7 +141,7 @@ describe('e2e_card_game', () => {
     beforeEach(async () => {
       await Promise.all([
         contract.methods.buy_pack(seed).send({ from: firstPlayer }).wait(),
-        contractAsSecondPlayer.methods.buy_pack(seed).send({ from: firstPlayer }).wait(),
+        contractAsSecondPlayer.methods.buy_pack(seed).send({ from: secondPlayer }).wait(),
       ]);
       firstPlayerCollection = boundedVecToArray(
         await contract.methods.view_collection_cards(firstPlayer, 0).simulate({ from: firstPlayer }),

yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts

@@ -747,7 +747,7 @@ export const uniswapL1L2TestSuite = (
           nonceForSwap,
         );
       const validateActionInteraction = await ownerWallet.setPublicAuthWit({ caller: approvedUser, action }, true);
-      await validateActionInteraction.send({ from: sponsorAddress }).wait();
+      await validateActionInteraction.send({ from: ownerAddress }).wait();
 
       await expect(action.simulate({ from: sponsorAddress })).rejects.toThrow(/unauthorized/);
     });