feat: merge-train/fairies (#22826)

BEGIN_COMMIT_OVERRIDE
fix: pass send message as (#22820)
fix(aztec-up): handle CI=true in timeout function (#22827)
END_COMMIT_OVERRIDE

Author: AztecBot

aztec-up/bin/0.0.1/install

@@ -49,7 +49,7 @@ function echo_yellow {
 }
 
 function timeout {
-  if [ "${CI:-0}" -eq 1 ]; then
+  if [ "${CI:-0}" = "1" ] || [ "${CI:-0}" = "true" ]; then
     /usr/bin/timeout "$@"
   else
     shift

yarn-project/wallets/src/embedded/embedded_wallet.test.ts

@@ -0,0 +1,83 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
+import type { Aliased } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { PXE } from '@aztec/pxe/server';
+import { FunctionCall, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Gas, GasFees } from '@aztec/stdlib/gas';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { PrivateKernelTailCircuitPublicInputs } from '@aztec/stdlib/kernel';
+import {
+  ExecutionPayload,
+  PrivateCallExecutionResult,
+  PrivateExecutionResult,
+  TxSimulationResult,
+} from '@aztec/stdlib/tx';
+
+import { beforeEach, describe, expect, it, jest } from '@jest/globals';
+
+import type { AccountContractsProvider } from './account-contract-providers/types.js';
+import { EmbeddedWallet } from './embedded_wallet.js';
+import type { WalletDB } from './wallet_db.js';
+
+describe('EmbeddedWallet', () => {
+  let pxe: PXE;
+  let node: AztecNode;
+  let wallet: TestWallet;
+  let simulateTx: jest.MockedFunction<PXE['simulateTx']>;
+  let proveTx: jest.MockedFunction<PXE['proveTx']>;
+  let getPredictedMinFees: jest.MockedFunction<AztecNode['getPredictedMinFees']>;
+  let getNodeInfo: jest.MockedFunction<AztecNode['getNodeInfo']>;
+
+  beforeEach(() => {
+    simulateTx = jest.fn();
+    proveTx = jest.fn();
+    getPredictedMinFees = jest.fn();
+    getNodeInfo = jest.fn();
+    pxe = { simulateTx, proveTx } as unknown as PXE;
+    node = { getPredictedMinFees, getNodeInfo } as unknown as AztecNode;
+    wallet = new TestWallet(pxe, node, {} as WalletDB, {} as AccountContractsProvider);
+  });
+
+  describe('sendTx', () => {
+    it('passes sendMessagesAs as senderForTags to PXE simulation', async () => {
+      getPredictedMinFees.mockResolvedValue([new GasFees(2, 2)]);
+      getNodeInfo.mockResolvedValue({ l1ChainId: 1, rollupVersion: 1 } as any);
+      simulateTx.mockResolvedValue(makeMinimalSimResult());
+      proveTx.mockRejectedValue(new Error('stop-at-prove'));
+
+      const sendMessagesAs = await AztecAddress.random();
+      const call = FunctionCall.from({
+        name: 'test',
+        to: await AztecAddress.random(),
+        selector: FunctionSelector.random(),
+        type: FunctionType.PRIVATE,
+        hideMsgSender: false,
+        isStatic: false,
+        args: [],
+        returnTypes: [],
+      });
+      const payload = new ExecutionPayload([call], [], []);
+
+      await expect(wallet.sendTx(payload, { from: NO_FROM, sendMessagesAs })).rejects.toThrow('stop-at-prove');
+
+      expect(simulateTx).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ senderForTags: sendMessagesAs }),
+      );
+    });
+  });
+});
+
+class TestWallet extends EmbeddedWallet {
+  override getAccounts(): Promise<Aliased<AztecAddress>[]> {
+    return Promise.resolve([]);
+  }
+}
+
+function makeMinimalSimResult(): TxSimulationResult {
+  const entrypoint = { offchainEffects: [], nestedExecutionResults: [] } as unknown as PrivateCallExecutionResult;
+  const privateResult = new PrivateExecutionResult(entrypoint, Fr.zero(), []);
+  const publicInputs = { gasUsed: Gas.empty() } as unknown as PrivateKernelTailCircuitPublicInputs;
+  return new TxSimulationResult(privateResult, publicInputs);
+}

yarn-project/wallets/src/embedded/embedded_wallet.ts

@@ -141,6 +141,7 @@ export class EmbeddedWallet extends BaseWallet {
       feeOptions,
       additionalScopes: opts.additionalScopes,
       skipTxValidation: true,
+      sendMessagesAs: opts.sendMessagesAs,
     });
 
     const offchainEffects = collectOffchainEffects(simulationResult.privateExecutionResult);