@aztec/end-to-end 0.0.1-commit.8afd444 → 0.0.1-commit.8f9871590

package/dest/test-wallet/test_wallet.js

@@ -0,0 +1,214 @@
+import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
+import { SignerlessAccount } from '@aztec/aztec.js/account';
+import { SetPublicAuthwitContractInteraction, computeInnerAuthWitHashFromAction, isContractFunctionInteractionCallIntent, lookupValidity } from '@aztec/aztec.js/authorization';
+import { AccountManager } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import { getPXEConfig } from '@aztec/pxe/config';
+import { createPXE } from '@aztec/pxe/server';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
+import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
+import { AztecNodeProxy, ProvenTx } from './utils.js';
+/**
+ * Wallet implementation that stores accounts in memory and provides extra debugging
+ * utilities
+ * It is intended to be used in e2e tests.
+ */ export class TestWallet extends BaseWallet {
+    nodeRef;
+    constructor(pxe, nodeRef){
+        super(pxe, nodeRef), this.nodeRef = nodeRef, this.accounts = new Map(), this.simulatedSimulations = false;
+    }
+    static async create(node, overridePXEConfig, options = {
+        loggers: {}
+    }) {
+        const nodeRef = new AztecNodeProxy(node);
+        const pxeConfig = Object.assign(getPXEConfig(), {
+            proverEnabled: overridePXEConfig?.proverEnabled ?? false,
+            ...overridePXEConfig
+        });
+        const pxe = await createPXE(nodeRef, pxeConfig, options);
+        return new TestWallet(pxe, nodeRef);
+    }
+    /**
+   * Updates the underlying node that this wallet and its PXE communicate with.
+   * @param node - The new AztecNode to forward all calls to.
+   */ updateNode(node) {
+        this.nodeRef.updateTargetNode(node);
+    }
+    createSchnorrAccount(secret, salt, signingKey) {
+        signingKey = signingKey ?? deriveSigningKey(secret);
+        const accountData = {
+            secret,
+            salt,
+            contract: new SchnorrAccountContract(signingKey)
+        };
+        return this.createAccount(accountData);
+    }
+    createECDSARAccount(secret, salt, signingKey) {
+        const accountData = {
+            secret,
+            salt,
+            contract: new EcdsaRAccountContract(signingKey)
+        };
+        return this.createAccount(accountData);
+    }
+    createECDSAKAccount(secret, salt, signingKey) {
+        const accountData = {
+            secret,
+            salt,
+            contract: new EcdsaKAccountContract(signingKey)
+        };
+        return this.createAccount(accountData);
+    }
+    async getFakeAccountDataFor(address) {
+        const originalAccount = await this.getAccountFromAddress(address);
+        if (originalAccount instanceof SignerlessAccount) {
+            throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${address}`);
+        }
+        const originalAddress = originalAccount.getCompleteAddress();
+        const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
+        if (!contractInstance) {
+            throw new Error(`No contract instance found for address: ${originalAddress.address}`);
+        }
+        const stubAccount = createStubAccount(originalAddress);
+        const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
+            salt: Fr.random()
+        });
+        return {
+            account: stubAccount,
+            instance,
+            artifact: StubAccountContractArtifact
+        };
+    }
+    accounts;
+    /**
+   * Toggle for running "simulated simulations" when calling simulateTx.
+   *
+   * When this flag is true, simulateViaEntrypoint constructs a request using a fake account
+   * (and accepts contract overrides on the input) and the PXE emulates kernel effects without
+   * generating kernel witnesses. When false, simulateViaEntrypoint defers to the standard
+   * simulation path via the real account entrypoint.
+   */ simulatedSimulations;
+    enableSimulatedSimulations() {
+        this.simulatedSimulations = true;
+    }
+    disableSimulatedSimulations() {
+        this.simulatedSimulations = false;
+    }
+    setMinFeePadding(value) {
+        this.minFeePadding = value ?? 0.5;
+    }
+    getAccountFromAddress(address) {
+        let account;
+        if (address.equals(AztecAddress.ZERO)) {
+            account = new SignerlessAccount();
+        } else {
+            account = this.accounts.get(address?.toString() ?? '');
+        }
+        if (!account) {
+            throw new Error(`Account not found in wallet for address: ${address}`);
+        }
+        return Promise.resolve(account);
+    }
+    getAccounts() {
+        return Promise.resolve(Array.from(this.accounts.values()).map((acc)=>({
+                alias: '',
+                item: acc.getAddress()
+            })));
+    }
+    async createAccount(accountData) {
+        const secret = accountData?.secret ?? Fr.random();
+        const salt = accountData?.salt ?? Fr.random();
+        const contract = accountData?.contract ?? new SchnorrAccountContract(GrumpkinScalar.random());
+        const accountManager = await AccountManager.create(this, secret, contract, salt);
+        const instance = accountManager.getInstance();
+        const artifact = await contract.getContractArtifact();
+        await this.registerContract(instance, artifact, secret);
+        this.accounts.set(accountManager.address.toString(), await accountManager.getAccount());
+        return accountManager;
+    }
+    lookupValidity(onBehalfOf, intent, witness) {
+        return lookupValidity(this, onBehalfOf, intent, witness);
+    }
+    setPublicAuthWit(from, messageHashOrIntent, authorized) {
+        return SetPublicAuthwitContractInteraction.create(this, from, messageHashOrIntent, authorized);
+    }
+    async createAuthWit(from, intent) {
+        const account = await this.getAccountFromAddress(from);
+        const chainInfo = await this.getChainInfo();
+        let intentInnerHash;
+        if ('caller' in intent) {
+            const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
+            const innerHash = await computeInnerAuthWitHashFromAction(intent.caller, call);
+            intentInnerHash = {
+                innerHash,
+                consumer: call.to
+            };
+        } else {
+            intentInnerHash = intent;
+        }
+        return account.createAuthWit(intentInnerHash, chainInfo);
+    }
+    /**
+   * Override simulateViaEntrypoint to use fake accounts for kernelless simulation
+   * when simulatedSimulations is enabled. Otherwise falls through to the real entrypoint path.
+   */ async simulateViaEntrypoint(executionPayload, from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement) {
+        if (!this.simulatedSimulations) {
+            return super.simulateViaEntrypoint(executionPayload, from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement);
+        }
+        const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+        const executionOptions = {
+            txNonce: Fr.random(),
+            cancellable: this.cancellableTransactions,
+            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
+        };
+        const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
+            feeExecutionPayload,
+            executionPayload
+        ]) : executionPayload;
+        const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
+        const chainInfo = await this.getChainInfo();
+        const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
+        const contractOverrides = {
+            [from.toString()]: {
+                instance,
+                artifact
+            }
+        };
+        return this.pxe.simulateTx(txRequest, {
+            simulatePublic: true,
+            skipFeeEnforcement: true,
+            skipTxValidation: true,
+            overrides: {
+                contracts: contractOverrides
+            },
+            scopes
+        });
+    }
+    async proveTx(exec, opts) {
+        const fee = await this.completeFeeOptions(opts.from, exec.feePayer, opts.fee?.gasSettings);
+        const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(exec, opts.from, fee);
+        const txProvingResult = await this.pxe.proveTx(txRequest, this.scopesFor(opts.from));
+        return new ProvenTx(this.aztecNode, await txProvingResult.toTx(), txProvingResult.getOffchainEffects(), txProvingResult.stats);
+    }
+    getTxReceipt(txHash) {
+        return this.aztecNode.getTxReceipt(txHash);
+    }
+    getNotes(filter) {
+        return this.pxe.debug.getNotes(filter);
+    }
+    getSyncedBlockHeader() {
+        return this.pxe.getSyncedBlockHeader();
+    }
+    sync() {
+        return this.pxe.debug.sync();
+    }
+    stop() {
+        return this.pxe.stop();
+    }
+}

package/dest/test-wallet/utils.d.ts

@@ -0,0 +1,41 @@
+import { ContractFunctionInteraction, DeployMethod, type DeployOptions, type NoWait, type SendInteractionOptions, type WaitOpts } from '@aztec/aztec.js/contracts';
+import { type AztecNode } from '@aztec/aztec.js/node';
+import { type OffchainEffect, type ProvingStats, Tx, TxHash, type TxReceipt } from '@aztec/stdlib/tx';
+import type { TestWallet } from './test_wallet.js';
+export type ProvenTxSendOpts = {
+    wait?: NoWait | WaitOpts;
+};
+export type ProvenTxSendReturn<T extends NoWait | WaitOpts | undefined> = T extends NoWait ? TxHash : TxReceipt;
+export declare class ProvenTx extends Tx {
+    private node;
+    offchainEffects: OffchainEffect[];
+    stats?: ProvingStats | undefined;
+    constructor(node: AztecNode, tx: Tx, offchainEffects: OffchainEffect[], stats?: ProvingStats | undefined);
+    send(options?: Omit<ProvenTxSendOpts, 'wait'>): Promise<TxReceipt>;
+    send<W extends ProvenTxSendOpts['wait']>(options: ProvenTxSendOpts & {
+        wait: W;
+    }): Promise<ProvenTxSendReturn<W>>;
+    private contextualizeError;
+}
+export declare function proveInteraction(wallet: TestWallet, interaction: ContractFunctionInteraction | DeployMethod, options: SendInteractionOptions | DeployOptions): Promise<ProvenTx>;
+/**
+ * Extends AztecNode via declaration merging so instances can be used wherever AztecNode is expected.
+ * The actual method forwarding is handled by a Proxy in the class constructor.
+ */
+export interface AztecNodeProxy extends AztecNode {
+}
+/**
+ * Mutable wrapper around an AztecNode that forwards all calls to the current target.
+ * Allows swapping the underlying node at runtime via updateTargetNode, which is useful
+ * for tests that need to redirect a wallet from one node to another without recreating it.
+ */
+export declare class AztecNodeProxy {
+    private target;
+    constructor(target: AztecNode);
+    /**
+     * Updates the underlying node that this reference points to.
+     * @param node - The new node to forward calls to.
+     */
+    updateTargetNode(node: AztecNode): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsMkJBQTJCLEVBQzNCLFlBQVksRUFDWixLQUFLLGFBQWEsRUFFbEIsS0FBSyxNQUFNLEVBQ1gsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyxRQUFRLEVBRWQsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWEsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsS0FBSyxZQUFZLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLFNBQVMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSXRHLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5ELE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUM3QixJQUFJLENBQUMsRUFBRSxNQUFNLEdBQUcsUUFBUSxDQUFDO0NBQzFCLENBQUM7QUFFRixNQUFNLE1BQU0sa0JBQWtCLENBQUMsQ0FBQyxTQUFTLE1BQU0sR0FBRyxRQUFRLEdBQUcsU0FBUyxJQUFJLENBQUMsU0FBUyxNQUFNLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FBQztBQUVoSCxxQkFBYSxRQUFTLFNBQVEsRUFBRTtJQUU1QixPQUFPLENBQUMsSUFBSTtJQUVMLGVBQWUsRUFBRSxjQUFjLEVBQUU7SUFDakMsS0FBSyxDQUFDO0lBSmYsWUFDVSxJQUFJLEVBQUUsU0FBUyxFQUN2QixFQUFFLEVBQUUsRUFBRSxFQUNDLGVBQWUsRUFBRSxjQUFjLEVBQUUsRUFDakMsS0FBSyxDQUFDLDBCQUFjLEVBRzVCO0lBRUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDbkUsSUFBSSxDQUFDLENBQUMsU0FBUyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7UUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQWVsSCxPQUFPLENBQUMsa0JBQWtCO0NBVTNCO0FBRUQsd0JBQXNCLGdCQUFnQixDQUNwQyxNQUFNLEVBQUUsVUFBVSxFQUNsQixXQUFXLEVBQUUsMkJBQTJCLEdBQUcsWUFBWSxFQUN2RCxPQUFPLEVBQUUsc0JBQXNCLEdBQUcsYUFBYSxxQkFTaEQ7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFdBQVcsY0FBZSxTQUFRLFNBQVM7Q0FBRztBQUVwRDs7OztHQUlHO0FBRUgscUJBQWEsY0FBYztJQUNiLE9BQU8sQ0FBQyxNQUFNO0lBQTFCLFlBQW9CLE1BQU0sRUFBRSxTQUFTLEVBWXBDO0lBRUQ7OztPQUdHO0lBQ0gsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxJQUFJLENBRXRDO0NBQ0YifQ==

package/dest/test-wallet/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,YAAY,EACZ,KAAK,aAAa,EAElB,KAAK,MAAM,EACX,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EAEd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAItG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,GAAG,QAAQ,GAAG,SAAS,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AAEhH,qBAAa,QAAS,SAAQ,EAAE;IAE5B,OAAO,CAAC,IAAI;IAEL,eAAe,EAAE,cAAc,EAAE;IACjC,KAAK,CAAC;IAJf,YACU,IAAI,EAAE,SAAS,EACvB,EAAE,EAAE,EAAE,EACC,eAAe,EAAE,cAAc,EAAE,EACjC,KAAK,CAAC,0BAAc,EAG5B;IAED,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnE,IAAI,CAAC,CAAC,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAelH,OAAO,CAAC,kBAAkB;CAU3B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,OAAO,EAAE,sBAAsB,GAAG,aAAa,qBAShD;AAED;;;GAGG;AAEH,MAAM,WAAW,cAAe,SAAQ,SAAS;CAAG;AAEpD;;;;GAIG;AAEH,qBAAa,cAAc;IACb,OAAO,CAAC,MAAM;IAA1B,YAAoB,MAAM,EAAE,SAAS,EAYpC;IAED;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAEtC;CACF"}

package/dest/test-wallet/utils.js

@@ -0,0 +1,71 @@
+import { DeployMethod, NO_WAIT, toSendOptions } from '@aztec/aztec.js/contracts';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { SimulationError } from '@aztec/stdlib/errors';
+import { Tx } from '@aztec/stdlib/tx';
+import { inspect } from 'util';
+export class ProvenTx extends Tx {
+    node;
+    offchainEffects;
+    stats;
+    constructor(node, tx, offchainEffects, stats){
+        super(tx.getTxHash(), tx.data, tx.chonkProof, tx.contractClassLogFields, tx.publicFunctionCalldata), this.node = node, this.offchainEffects = offchainEffects, this.stats = stats;
+    }
+    async send(options) {
+        const txHash = this.getTxHash();
+        await this.node.sendTx(this).catch((err)=>{
+            throw this.contextualizeError(err, inspect(this));
+        });
+        if (options?.wait === NO_WAIT) {
+            return txHash;
+        }
+        const waitOpts = typeof options?.wait === 'object' ? options.wait : undefined;
+        return await waitForTx(this.node, txHash, waitOpts);
+    }
+    contextualizeError(err, ...context) {
+        let contextStr = '';
+        if (context.length > 0) {
+            contextStr = `\nContext:\n${context.join('\n')}`;
+        }
+        if (err instanceof SimulationError) {
+            err.setAztecContext(contextStr);
+        }
+        return err;
+    }
+}
+export async function proveInteraction(wallet, interaction, options) {
+    let execPayload;
+    if (interaction instanceof DeployMethod) {
+        execPayload = await interaction.request(interaction.convertDeployOptionsToRequestOptions(options));
+    } else {
+        execPayload = await interaction.request(options);
+    }
+    return wallet.proveTx(execPayload, toSendOptions(options));
+}
+/**
+ * Mutable wrapper around an AztecNode that forwards all calls to the current target.
+ * Allows swapping the underlying node at runtime via updateTargetNode, which is useful
+ * for tests that need to redirect a wallet from one node to another without recreating it.
+ */ // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export class AztecNodeProxy {
+    target;
+    constructor(target){
+        this.target = target;
+        return new Proxy(this, {
+            get: (obj, prop, receiver)=>{
+                // Own properties and methods (updateTargetNode, target) are served directly.
+                if (Reflect.has(obj, prop)) {
+                    return Reflect.get(obj, prop, receiver);
+                }
+                // Everything else is forwarded to the current target node.
+                const val = obj.target[prop];
+                return typeof val === 'function' ? val.bind(obj.target) : val;
+            }
+        });
+    }
+    /**
+   * Updates the underlying node that this reference points to.
+   * @param node - The new node to forward calls to.
+   */ updateTargetNode(node) {
+        this.target = node;
+    }
+}

package/package.json

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

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -26,7 +26,6 @@ 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';
 
 import { MNEMONIC } from '../../fixtures/fixtures.js';
 import { type EndToEndContext, type SetupOptions, deployAccounts, setup, teardown } from '../../fixtures/setup.js';
@@ -37,6 +36,7 @@ import {
   FeeJuicePortalTestingHarnessFactory,
   type GasBridgingTestHarness,
 } from '../../shared/gas_portal_test_harness.js';
+import { TestWallet } from '../../test-wallet/test_wallet.js';
 import { ProxyLogger } from './benchmark.js';
 import { type ClientFlowsConfig, FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './config.js';
 
@@ -138,10 +138,10 @@ export class ClientFlowsBenchmark {
     });
     await this.applyBaseSetup();
 
-    await this.context.aztecNodeService!.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
+    await this.context.aztecNodeService.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
 
     const rollupContract = RollupContract.getFromConfig(this.context.config);
-    this.chainMonitor = new ChainMonitor(rollupContract, this.context.dateProvider!, this.logger, 200).start();
+    this.chainMonitor = new ChainMonitor(rollupContract, this.context.dateProvider, this.logger, 200).start();
 
     return this;
   }
@@ -161,15 +161,11 @@ export class ClientFlowsBenchmark {
 
   /** 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({ from: this.adminAddress });
+    const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({ from: address });
 
     await mintTokensToPrivate(this.bananaCoin, this.adminAddress, address, amount);
 
-    const balanceAfter = await this.bananaCoin.methods
-      .balance_of_private(address)
-      .simulate({ from: this.adminAddress });
+    const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({ from: address });
     expect(balanceAfter).toEqual(balanceBefore + amount);
   }
 
@@ -207,7 +203,7 @@ export class ClientFlowsBenchmark {
     const [{ address: adminAddress }, { address: sequencerAddress }] = deployedAccounts;
 
     this.adminWallet = this.context.wallet;
-    this.aztecNode = this.context.aztecNodeService!;
+    this.aztecNode = this.context.aztecNodeService;
     this.cheatCodes = this.context.cheatCodes;
 
     this.adminAddress = adminAddress;
@@ -235,8 +231,8 @@ export class ClientFlowsBenchmark {
     this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
 
     this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-      aztecNode: this.context.aztecNodeService!,
-      aztecNodeAdmin: this.context.aztecNodeService!,
+      aztecNode: this.context.aztecNodeService,
+      aztecNodeAdmin: this.context.aztecNodeService,
       l1Client: this.context.deployL1ContractsValues.l1Client,
       wallet: this.adminWallet,
       logger: this.logger,

package/src/bench/client_flows/config.ts

@@ -6,7 +6,7 @@ export type ClientFlowConfig = {
   recursions?: number[];
 };
 
-type ClientFlows = 'accountDeployments' | 'deployments' | 'transfers' | 'bridging' | 'amm';
+type ClientFlows = 'accountDeployments' | 'deployments' | 'transfers' | 'bridging' | 'amm' | 'storageProof';
 
 export type ClientFlowsConfig = {
   [key in ClientFlows]: ClientFlowConfig;
@@ -34,6 +34,10 @@ export const KEY_FLOWS_CONFIG: ClientFlowsConfig = {
     feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
     recursions: [0, 1],
   },
+  storageProof: {
+    accounts: ['ecdsar1'],
+    feePaymentMethods: ['sponsored_fpc'],
+  },
 };
 
 export const FULL_FLOWS_CONFIG: ClientFlowsConfig = {
@@ -58,4 +62,8 @@ export const FULL_FLOWS_CONFIG: ClientFlowsConfig = {
     feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
     recursions: [0, 1, 2],
   },
+  storageProof: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
+  },
 };

package/src/bench/utils.ts

@@ -28,7 +28,7 @@ export async function benchmarkSetup(
   const contract = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
   context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
   const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
-  const telemetry = context.telemetryClient! as BenchmarkTelemetryClient;
+  const telemetry = context.telemetryClient as BenchmarkTelemetryClient;
   context.logger.warn(`Cleared benchmark data points from setup`);
   telemetry.clear();
   const origTeardown = context.teardown.bind(context);

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -7,14 +7,15 @@ import type { TxHash } from '@aztec/aztec.js/tx';
 import type { CheatCodes } from '@aztec/aztec/testing';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
+import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import type { SequencerClient } from '@aztec/sequencer-client';
-import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { jest } from '@jest/globals';
 
 import { type EndToEndContext, deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import type { TestWallet } from '../test-wallet/test_wallet.js';
 
 export class Role {
   private isAdmin = false;
@@ -53,6 +54,7 @@ export class BlacklistTokenContractTest {
   asset!: TokenBlacklistContract;
   tokenSim!: TokenSimulator;
   badAccount!: InvalidAccountContract;
+  authwitProxy!: GenericProxyContract;
   cheatCodes!: CheatCodes;
   sequencer!: SequencerClient;
   aztecNode!: AztecNode;
@@ -92,7 +94,7 @@ export class BlacklistTokenContractTest {
     });
 
     this.cheatCodes = this.context.cheatCodes;
-    this.aztecNode = this.context.aztecNodeService!;
+    this.aztecNode = this.context.aztecNodeService;
     this.sequencer = this.context.sequencer!;
     this.wallet = this.context.wallet;
     this.adminAddress = deployedAccounts[0].address;
@@ -114,6 +116,13 @@ export class BlacklistTokenContractTest {
     this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
     this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
+    // Deploy a proxy contract for "on behalf of other" tests. The note owner must be the tx sender
+    // (so their notes are in scope), but msg_sender in the target must differ from the note owner
+    // to trigger authwit validation. The proxy forwards calls so that msg_sender != tx sender.
+    this.logger.verbose(`Deploying generic proxy...`);
+    this.authwitProxy = await GenericProxyContract.deploy(this.wallet).send({ from: this.adminAddress });
+    this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
+
     await this.crossTimestampOfChange();
 
     this.tokenSim = new TokenSimulator(

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -13,13 +13,12 @@ import type {
 } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
-import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { sleep } from '@aztec/foundation/sleep';
 import { TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { MNEMONIC } from '../fixtures/fixtures.js';
 import {
@@ -31,6 +30,7 @@ import {
   teardown,
 } from '../fixtures/setup.js';
 import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
+import type { TestWallet } from '../test-wallet/test_wallet.js';
 
 export class CrossChainMessagingTest {
   private requireEpochProven: boolean;
@@ -86,9 +86,8 @@ export class CrossChainMessagingTest {
   }
 
   async advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber> {
-    const epoch = await this.rollup.getEpochNumberForCheckpoint(
-      CheckpointNumber.fromBlockNumber(l2TxReceipt.blockNumber!),
-    );
+    const block = await this.aztecNode.getBlock(l2TxReceipt.blockNumber!);
+    const epoch = await this.rollup.getEpochNumberForCheckpoint(block!.checkpointNumber);
     // Warp to the next epoch.
     await this.cheatCodes.rollup.advanceToEpoch(EpochNumber(epoch + 1));
     // Wait for the tx to be proven.
@@ -110,16 +109,16 @@ export class CrossChainMessagingTest {
 
   async applyBaseSetup() {
     // Set up base context fields
-    this.aztecNode = this.context.aztecNodeService!;
+    this.aztecNode = this.context.aztecNodeService;
     this.wallet = this.context.wallet;
     this.aztecNodeConfig = this.context.config;
     this.cheatCodes = this.context.cheatCodes;
     this.deployL1ContractsValues = this.context.deployL1ContractsValues;
-    this.aztecNodeAdmin = this.context.aztecNodeService!;
+    this.aztecNodeAdmin = this.context.aztecNodeService;
 
     if (this.requireEpochProven) {
       // Turn off the watcher to prevent it from keep marking blocks as proven.
-      this.context.watcher!.setIsMarkingAsProven(false);
+      this.context.watcher.setIsMarkingAsProven(false);
     }
 
     // Deploy 3 accounts

package/src/e2e_deploy_contract/deploy_test.ts

@@ -8,9 +8,9 @@ import type { AztecNode } from '@aztec/aztec.js/node';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { type EndToEndContext, deployAccounts, setup, teardown } from '../fixtures/setup.js';
+import type { TestWallet } from '../test-wallet/test_wallet.js';
 
 export class DeployTest {
   public context!: EndToEndContext;
@@ -30,9 +30,9 @@ export class DeployTest {
       fundSponsoredFPC: true,
       skipAccountDeployment: true,
     });
-    this.aztecNode = this.context.aztecNodeService!;
+    this.aztecNode = this.context.aztecNodeService;
     this.wallet = this.context.wallet;
-    this.aztecNodeAdmin = this.context.aztecNodeService!;
+    this.aztecNodeAdmin = this.context.aztecNodeService;
     await this.applyInitialAccount();
     return this;
   }