@aztec/end-to-end 0.0.1-commit.42ee6df9b → 0.0.1-commit.431c48d

package/dest/test-wallet/utils.js

@@ -1,8 +1,11 @@
-import { DeployMethod, NO_WAIT, toSendOptions } from '@aztec/aztec.js/contracts';
+import { NO_WAIT, toSendOptions } from '@aztec/aztec.js/contracts';
 import { waitForTx } from '@aztec/aztec.js/node';
+import { timesAsync } from '@aztec/foundation/collection';
+import { sleep } from '@aztec/foundation/sleep';
 import { SimulationError } from '@aztec/stdlib/errors';
 import { Tx } from '@aztec/stdlib/tx';
 import { inspect } from 'util';
+import { testSpan, withTestSpanOwner } from '../fixtures/timing.js';
 export class ProvenTx extends Tx {
     node;
     offchainEffects;
@@ -10,7 +13,10 @@ export class ProvenTx extends Tx {
     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) {
+    send(options) {
+        return testSpan('tx:send', ()=>this.sendInner(options));
+    }
+    async sendInner(options) {
         const txHash = this.getTxHash();
         await this.node.sendTx(this).catch((err)=>{
             throw this.contextualizeError(err, inspect(this));
@@ -32,14 +38,63 @@ export class ProvenTx extends Tx {
         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));
+export function proveInteraction(wallet, interaction, options) {
+    return testSpan('tx:prove', async ()=>{
+        const execPayload = await interaction.request(options);
+        return wallet.proveTx(execPayload, toSendOptions(options));
+    });
+}
+/**
+ * Pre-proves `count` interactions built by `makeCall(i)` against `wallet`, all with the same
+ * `options`. Returns the proven txs so the caller can send them individually (e.g. with sleeps
+ * between sends, or anchored to intermediate tips). For the common "send the whole batch at once"
+ * case use {@link proveAndSendTxs}.
+ */ export function proveTxs(wallet, count, makeCall, options) {
+    return timesAsync(count, (i)=>proveInteraction(wallet, makeCall(i), options));
+}
+/**
+ * Pre-proves `count` interactions built by `makeCall(i)` and sends each one with `NO_WAIT`, all at
+ * once. Returns the tx hashes in batch order. Pairs with `waitForTxs` for the "send N, wait for N"
+ * arc. Use {@link proveTxs} instead when the sends need bespoke sequencing.
+ */ export async function proveAndSendTxs(wallet, count, makeCall, options) {
+    const txs = await proveTxs(wallet, count, makeCall, options);
+    return Promise.all(txs.map((tx)=>tx.send({
+            wait: NO_WAIT
+        })));
+}
+/**
+ * Starts a background loop that keeps `node`'s mempool topped up: whenever the pending-tx count drops
+ * below `opts.minPending`, it proves and sends one interaction built by `makeCall()` (NO_WAIT). Errors
+ * are swallowed and retried. Returns an {@link AsyncDisposable}; disposing stops the loop and awaits it.
+ */ export function startMempoolFeeder(wallet, node, makeCall, opts) {
+    const minPending = opts.minPending ?? 3;
+    const intervalMs = opts.intervalMs ?? 1000;
+    let stopped = false;
+    // Pin the feeder's prove/send spans to a fixed non-test owner. It runs interleaved with arbitrary
+    // tests, so without this its tx:prove/tx:send spans would smear onto whichever test was current
+    // when each round fired; the pinned owner matches no test/suite record, excluding them cleanly.
+    const loop = withTestSpanOwner('other:mempool-feeder', async ()=>{
+        while(!stopped){
+            try {
+                const pendingCount = await node.getPendingTxCount();
+                if (pendingCount < minPending) {
+                    await proveAndSendTxs(wallet, 1, makeCall, {
+                        from: opts.from
+                    });
+                    opts.logger?.verbose(`Topped up mempool (was ${pendingCount})`);
+                }
+            } catch (err) {
+                opts.logger?.verbose(`Mempool top-up error (will retry): ${err}`);
+            }
+            await sleep(intervalMs);
+        }
+    });
+    return {
+        async [Symbol.asyncDispose] () {
+            stopped = true;
+            await loop;
+        }
+    };
 }
 /**
  * Mutable wrapper around an AztecNode that forwards all calls to the current target.

package/dest/test-wallet/wallet_worker_script.js

@@ -1,7 +1,9 @@
+import { DefaultWaitOpts } from '@aztec/aztec.js/contracts';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { BackendType, BarretenbergSync } from '@aztec/bb.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
-import { parseWithOptionals, schemaHasMethod } from '@aztec/foundation/schemas';
+import { getSchemaParameters, parseWithOptionals, schemaHasMethod } from '@aztec/foundation/schemas';
 import { NodeListener, TransportServer } from '@aztec/foundation/transport';
 import { Tx } from '@aztec/stdlib/tx';
 import { workerData } from 'worker_threads';
@@ -14,15 +16,21 @@ try {
         nodeUrl
     });
     const node = createAztecNodeClient(nodeUrl);
+    // Worker sync bb use is limited to crypto and proof serialization helpers.
+    await BarretenbergSync.initSingleton({
+        backend: BackendType.Wasm
+    });
     const wallet = await TestWallet.create(node, pxeConfig);
+    // Worker wallets are only used by spartan tests against remote JSON-RPC nodes: keep the 1s poll cadence.
+    wallet.setDefaultWaitInterval(DefaultWaitOpts.interval);
     logger.info('Worker wallet initialized');
     const customMethods = {
         proveTx: async (exec, opts)=>{
             const provenTx = await wallet.proveTx(exec, opts);
             return new Tx(provenTx.getTxHash(), provenTx.data, provenTx.chonkProof, provenTx.contractClassLogFields, provenTx.publicFunctionCalldata);
         },
-        registerAccount: async (secret, salt)=>{
-            const manager = await wallet.createSchnorrAccount(secret, salt);
+        registerAccount: async (secret, salt, signingKey)=>{
+            const manager = await wallet.createSchnorrAccount(secret, salt, signingKey);
             return manager.address;
         }
     };
@@ -33,7 +41,7 @@ try {
             throw new Error(`Unknown method: ${msg.fn}`);
         }
         const jsonParams = JSON.parse(msg.args);
-        const args = await parseWithOptionals(jsonParams, schema[msg.fn].parameters());
+        const args = await parseWithOptionals(jsonParams, getSchemaParameters(schema[msg.fn]));
         // we have to erase the fn type in order to be able to spread ...args
         const handler = msg.fn in customMethods ? customMethods[msg.fn] : undefined;
         const result = handler ? await handler(...args) : await wallet[msg.fn](...args);

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

@@ -1,14 +1,14 @@
 import type { CallIntent, IntentInnerHash } from '@aztec/aztec.js/authorization';
 import type { InteractionWaitOptions, SendReturn } from '@aztec/aztec.js/contracts';
-import type { Aliased, AppCapabilities, BatchResults, BatchedMethod, ContractClassMetadata, ContractMetadata, ExecuteUtilityOptions, PrivateEvent, PrivateEventFilter, ProfileOptions, SendOptions, SimulateOptions, Wallet, WalletCapabilities } from '@aztec/aztec.js/wallet';
+import type { Aliased, AppCapabilities, BatchResults, BatchedMethod, ContractClassMetadata, ContractMetadata, ExecuteUtilityOptions, PrivateEvent, PrivateEventFilter, ProfileOptions, SendOptions, SimulateOptions, TxSimulationResultWithAppOffset, Wallet, WalletCapabilities } from '@aztec/aztec.js/wallet';
 import type { ChainInfo } from '@aztec/entrypoints/interfaces';
-import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { Fq, Fr } from '@aztec/foundation/curves/bn254';
 import type { PXEConfig } from '@aztec/pxe/config';
 import type { ContractArtifact, EventMetadataDefinition, FunctionCall } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { ExecutionPayload, TxProfileResult, TxSimulationResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
+import type { ContractInstancePreimage } from '@aztec/stdlib/contract';
+import type { ExecutionPayload, TxProfileResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
 import { Tx } from '@aztec/stdlib/tx';
 /**
  * Wallet implementation that offloads all work to a worker thread.
@@ -35,18 +35,19 @@ export declare class WorkerWallet implements Wallet {
     registerSender(address: AztecAddress, alias?: string): Promise<AztecAddress>;
     getAddressBook(): Promise<Aliased<AztecAddress>[]>;
     getAccounts(): Promise<Aliased<AztecAddress>[]>;
-    registerContract(instance: ContractInstanceWithAddress, artifact?: ContractArtifact, secretKey?: Fr): Promise<ContractInstanceWithAddress>;
-    simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult>;
+    registerContract(instance: ContractInstancePreimage, artifact?: ContractArtifact, secretKey?: Fr): Promise<void>;
+    registerContractClass(artifact: ContractArtifact): Promise<void>;
+    simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
     executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
     profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
     sendTx<W extends InteractionWaitOptions = undefined>(exec: ExecutionPayload, opts: SendOptions<W>): Promise<SendReturn<W>>;
     proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<Tx>;
     /** Registers an account inside the worker's TestWallet, populating its accounts map. */
-    registerAccount(secret: Fr, salt: Fr): Promise<AztecAddress>;
+    registerAccount(secret: Fr, salt: Fr, signingKey: Fq): Promise<AztecAddress>;
     createAuthWit(from: AztecAddress, messageHashOrIntent: IntentInnerHash | CallIntent): Promise<AuthWitness>;
     requestCapabilities(manifest: AppCapabilities): Promise<WalletCapabilities>;
     batch<const T extends readonly BatchedMethod[]>(methods: T): Promise<BatchResults<T>>;
     /** Shuts down the worker thread and closes the transport. */
     stop(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qtd2FsbGV0L3dvcmtlcl93YWxsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUNWLE9BQU8sRUFDUCxlQUFlLEVBQ2YsWUFBWSxFQUNaLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsZ0JBQWdCLEVBQ2hCLHFCQUFxQixFQUNyQixZQUFZLEVBQ1osa0JBQWtCLEVBQ2xCLGNBQWMsRUFDZCxXQUFXLEVBQ1gsZUFBZSxFQUNmLE1BQU0sRUFDTixrQkFBa0IsRUFDbkIsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQU96RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSx1QkFBdUIsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3RILE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQVl0Qzs7OztHQUlHO0FBQ0gscUJBQWEsWUFBYSxZQUFXLE1BQU07SUFFdkMsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsTUFBTTtJQUZoQixPQUFPLGVBR0g7SUFFSjs7Ozs7T0FLRztJQUNILE9BQWEsTUFBTSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FzRDFGO1lBRWEsT0FBTztZQUtQLElBQUk7SUFNbEIsWUFBWSxJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FFakM7SUFFRCxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUVwRTtJQUVELHdCQUF3QixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBRS9EO0lBRUQsZ0JBQWdCLENBQUMsQ0FBQyxFQUNoQixhQUFhLEVBQUUsdUJBQXVCLEVBQ3RDLFdBQVcsRUFBRSxrQkFBa0IsR0FDOUIsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBRTVCO0lBRUQsY0FBYyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FFM0U7SUFFRCxjQUFjLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBRWpEO0lBRUQsV0FBVyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUU5QztJQUVELGdCQUFnQixDQUNkLFFBQVEsRUFBRSwyQkFBMkIsRUFDckMsUUFBUSxDQUFDLEVBQUUsZ0JBQWdCLEVBQzNCLFNBQVMsQ0FBQyxFQUFFLEVBQUUsR0FDYixPQUFPLENBQUMsMkJBQTJCLENBQUMsQ0FFdEM7SUFFRCxVQUFVLENBQUMsSUFBSSxFQUFFLGdCQUFnQixFQUFFLElBQUksRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBRXJGO0lBRUQsY0FBYyxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxDQUUvRjtJQUVELFNBQVMsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLGNBQWMsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBRWhGO0lBRUQsTUFBTSxDQUFDLENBQUMsU0FBUyxzQkFBc0IsR0FBRyxTQUFTLEVBQ2pELElBQUksRUFBRSxnQkFBZ0IsRUFDdEIsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsR0FDbkIsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUV4QjtJQUVELE9BQU8sQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUU1RTtJQUVELHdGQUF3RjtJQUN4RixlQUFlLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FFM0Q7SUFFRCxhQUFhLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxlQUFlLEdBQUcsVUFBVSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FFekc7SUFFRCxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUUxRTtJQUVELEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLFNBQVMsYUFBYSxFQUFFLEVBQUUsT0FBTyxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBRXBGO0lBRUQsNkRBQTZEO0lBQ3ZELElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qtd2FsbGV0L3dvcmtlcl93YWxsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUNWLE9BQU8sRUFDUCxlQUFlLEVBQ2YsWUFBWSxFQUNaLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsZ0JBQWdCLEVBQ2hCLHFCQUFxQixFQUNyQixZQUFZLEVBQ1osa0JBQWtCLEVBQ2xCLGNBQWMsRUFDZCxXQUFXLEVBQ1gsZUFBZSxFQUNmLCtCQUErQixFQUMvQixNQUFNLEVBQ04sa0JBQWtCLEVBQ25CLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBTzdELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLHVCQUF1QixFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pHLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7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

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

@@ -1 +1 @@
-{"version":3,"file":"worker_wallet.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker_wallet.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet.ts"],"names":[],"mappings":"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"}

package/dest/test-wallet/worker_wallet.js

@@ -1,6 +1,7 @@
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
+import { getSchemaReturnType } from '@aztec/foundation/schemas';
 import { sleep } from '@aztec/foundation/sleep';
 import { NodeConnector, TransportClient } from '@aztec/foundation/transport';
 import { Worker } from 'worker_threads';
@@ -39,7 +40,7 @@ const WORKER_READY_TIMEOUT_MS = 120_000;
                 ...process.stderr.isTTY || process.env.FORCE_COLOR ? {
                     FORCE_COLOR: '1'
                 } : {},
-                LOG_LEVEL: process.env.WORKER_LOG_LEVEL ?? 'warn'
+                LOG_LEVEL: process.env.WORKER_LOG_LEVEL ?? 'info'
             }
         });
         const connector = new NodeConnector(worker);
@@ -91,7 +92,9 @@ const WORKER_READY_TIMEOUT_MS = 120_000;
     async call(fn, ...args) {
         const resultJson = await this.callRaw(fn, ...args);
         const methodSchema = WorkerWalletSchema[fn];
-        return methodSchema.returnType().parseAsync(JSON.parse(resultJson));
+        // Void-returning methods (e.g. registerContract) serialize to `undefined` on the worker side, which
+        // JSON.parse cannot handle; hand it straight to the schema, whose `z.void()` output accepts undefined.
+        return getSchemaReturnType(methodSchema).parseAsync(resultJson === undefined ? undefined : JSON.parse(resultJson));
     }
     getChainInfo() {
         return this.call('getChainInfo');
@@ -117,6 +120,9 @@ const WORKER_READY_TIMEOUT_MS = 120_000;
     registerContract(instance, artifact, secretKey) {
         return this.call('registerContract', instance, artifact, secretKey);
     }
+    registerContractClass(artifact) {
+        return this.call('registerContractClass', artifact);
+    }
     simulateTx(exec, opts) {
         return this.call('simulateTx', exec, opts);
     }
@@ -132,8 +138,8 @@ const WORKER_READY_TIMEOUT_MS = 120_000;
     proveTx(exec, opts) {
         return this.call('proveTx', exec, opts);
     }
-    /** Registers an account inside the worker's TestWallet, populating its accounts map. */ registerAccount(secret, salt) {
-        return this.call('registerAccount', secret, salt);
+    /** Registers an account inside the worker's TestWallet, populating its accounts map. */ registerAccount(secret, salt, signingKey) {
+        return this.call('registerAccount', secret, salt, signingKey);
     }
     createAuthWit(from, messageHashOrIntent) {
         return this.call('createAuthWit', from, messageHashOrIntent);

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

@@ -1,274 +1,4 @@
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { Tx } from '@aztec/stdlib/tx';
-import { z } from 'zod';
+import type { ApiSchema } from '@aztec/foundation/schemas';
 /** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */
-export declare const WorkerWalletSchema: {
-    getPrivateEvents: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/abi").EventMetadataDefinition, z.ZodTypeDef, any>, eventFilter: z.ZodType<import("@aztec/aztec.js/wallet").PrivateEventFilter, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").PrivateEvent<unknown>[], z.ZodTypeDef, any>>;
-    getChainInfo: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/entrypoints/interfaces").ChainInfo, z.ZodTypeDef, any>>;
-    getContractMetadata: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").ContractMetadata, z.ZodTypeDef, any>>;
-    getContractClassMetadata: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/foundation/schemas").Fr, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").ContractClassMetadata, z.ZodTypeDef, any>>;
-    registerSender: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>, alias?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<string | undefined, z.ZodTypeDef, any>> | undefined], z.ZodUnknown>, z.ZodType<AztecAddress, z.ZodTypeDef, any>>;
-    getAddressBook: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").Aliased<AztecAddress>[], z.ZodTypeDef, any>>;
-    getAccounts: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").Aliased<AztecAddress>[], z.ZodTypeDef, any>>;
-    registerContract: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/contract").ContractInstanceWithAddress, z.ZodTypeDef, any>, artifact?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<import("@aztec/stdlib/abi").ContractArtifact | undefined, z.ZodTypeDef, any>> | undefined, secretKey?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<import("@aztec/foundation/schemas").Fr | undefined, z.ZodTypeDef, any>> | undefined], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/contract").ContractInstanceWithAddress, z.ZodTypeDef, any>>;
-    simulateTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SimulateOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxSimulationResult, z.ZodTypeDef, any>>;
-    executeUtility: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/abi").FunctionCall, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").ExecuteUtilityOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").UtilityExecutionResult, z.ZodTypeDef, any>>;
-    profileTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").ProfileOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxProfileResult, z.ZodTypeDef, any>>;
-    sendTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SendOptions<import("@aztec/aztec.js/contracts").InteractionWaitOptions>, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/contracts").TxSendResultImmediate | import("@aztec/aztec.js/contracts").TxSendResultMined<import("@aztec/stdlib/tx").TxReceipt>, z.ZodTypeDef, any>>;
-    createAuthWit: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>, messageHashOrIntent: z.ZodType<import("@aztec/aztec.js/authorization").CallIntent | import("@aztec/aztec.js/authorization").IntentInnerHash, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, z.ZodTypeDef, any>>;
-    requestCapabilities: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/aztec.js/wallet").AppCapabilities, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").WalletCapabilities, z.ZodTypeDef, any>>;
-    batch: z.ZodFunction<z.ZodTuple<[z.ZodType<readonly import("@aztec/aztec.js/wallet").BatchedMethod[], z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<readonly import("@aztec/aztec.js/wallet").BatchedMethodResultWrapper<import("@aztec/aztec.js/wallet").BatchedMethod>[], z.ZodTypeDef, any>>;
-    proveTx: z.ZodFunction<z.ZodTuple<[z.ZodObject<{
-        calls: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            name: z.ZodString;
-            to: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-            selector: import("@aztec/foundation/schemas").ZodFor<import("@aztec/stdlib/abi").FunctionSelector>;
-            type: z.ZodNativeEnum<typeof import("@aztec/stdlib/abi").FunctionType>;
-            isStatic: z.ZodBoolean;
-            hideMsgSender: z.ZodBoolean;
-            args: z.ZodArray<import("@aztec/foundation/schemas").ZodFor<import("@aztec/foundation/schemas").Fr>, "many">;
-            returnTypes: z.ZodArray<z.ZodType<import("@aztec/stdlib/abi").AbiType, z.ZodTypeDef, import("@aztec/stdlib/abi").AbiType>, "many">;
-        }, "strip", z.ZodTypeAny, {
-            name: string;
-            to: AztecAddress;
-            selector: import("@aztec/stdlib/abi").FunctionSelector;
-            type: import("@aztec/stdlib/abi").FunctionType;
-            isStatic: boolean;
-            hideMsgSender: boolean;
-            args: import("@aztec/foundation/schemas").Fr[];
-            returnTypes: import("@aztec/stdlib/abi").AbiType[];
-        }, {
-            name: string;
-            to?: any;
-            selector?: any;
-            type: import("@aztec/stdlib/abi").FunctionType;
-            isStatic: boolean;
-            hideMsgSender: boolean;
-            args: any[];
-            returnTypes: import("@aztec/stdlib/abi").AbiType[];
-        }>, import("@aztec/stdlib/abi").FunctionCall, {
-            name: string;
-            to?: any;
-            selector?: any;
-            type: import("@aztec/stdlib/abi").FunctionType;
-            isStatic: boolean;
-            hideMsgSender: boolean;
-            args: any[];
-            returnTypes: import("@aztec/stdlib/abi").AbiType[];
-        }>, "many">;
-        authWitnesses: z.ZodArray<z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, any, string>, "many">;
-        capsules: z.ZodArray<z.ZodType<import("@aztec/stdlib/tx").Capsule, any, string>, "many">;
-        extraHashedArgs: z.ZodArray<import("@aztec/foundation/schemas").ZodFor<import("@aztec/stdlib/tx").HashedValues>, "many">;
-        feePayer: import("@aztec/foundation/schemas").ZodNullableOptional<import("@aztec/foundation/schemas").ZodFor<AztecAddress>>;
-    }, "strip", z.ZodTypeAny, {
-        calls: import("@aztec/stdlib/abi").FunctionCall[];
-        authWitnesses: import("@aztec/stdlib/auth-witness").AuthWitness[];
-        capsules: import("@aztec/stdlib/tx").Capsule[];
-        extraHashedArgs: import("@aztec/stdlib/tx").HashedValues[];
-        feePayer?: AztecAddress | undefined;
-    }, {
-        calls: {
-            name: string;
-            to?: any;
-            selector?: any;
-            type: import("@aztec/stdlib/abi").FunctionType;
-            isStatic: boolean;
-            hideMsgSender: boolean;
-            args: any[];
-            returnTypes: import("@aztec/stdlib/abi").AbiType[];
-        }[];
-        authWitnesses: string[];
-        capsules: string[];
-        extraHashedArgs: any[];
-        feePayer?: any;
-    }>, z.ZodObject<{
-        from: z.ZodUnion<[import("@aztec/foundation/schemas").ZodFor<AztecAddress>, z.ZodLiteral<"NO_FROM">]>;
-        authWitnesses: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, any, string>, "many">>;
-        capsules: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<import("@aztec/stdlib/tx").Capsule, any, string>, "many">>;
-        fee: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
-            gasSettings: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
-                gasLimits: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
-                    daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-                    l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-                }, "strip", z.ZodTypeAny, {
-                    daGas: number;
-                    l2Gas: number;
-                }, {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                }>, import("@aztec/stdlib/gas").Gas, {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                }>>;
-                teardownGasLimits: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
-                    daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-                    l2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-                }, "strip", z.ZodTypeAny, {
-                    daGas: number;
-                    l2Gas: number;
-                }, {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                }>, import("@aztec/stdlib/gas").Gas, {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                }>>;
-                maxFeePerGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
-                    feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                    feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                }, "strip", z.ZodTypeAny, {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                }, {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                }>>;
-                maxPriorityFeePerGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
-                    feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                    feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-                }, "strip", z.ZodTypeAny, {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                }, {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                }>>;
-            }, "strip", z.ZodTypeAny, {
-                gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
-                teardownGasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
-                maxFeePerGas?: {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                } | undefined;
-                maxPriorityFeePerGas?: {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                } | undefined;
-            }, {
-                gasLimits?: {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                } | undefined;
-                teardownGasLimits?: {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                } | undefined;
-                maxFeePerGas?: {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                } | undefined;
-                maxPriorityFeePerGas?: {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                } | undefined;
-            }>>;
-        }, "strip", z.ZodTypeAny, {
-            gasSettings?: {
-                gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
-                teardownGasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
-                maxFeePerGas?: {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                } | undefined;
-                maxPriorityFeePerGas?: {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                } | undefined;
-            } | undefined;
-        }, {
-            gasSettings?: {
-                gasLimits?: {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                } | undefined;
-                teardownGasLimits?: {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                } | undefined;
-                maxFeePerGas?: {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                } | undefined;
-                maxPriorityFeePerGas?: {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                } | undefined;
-            } | undefined;
-        }>>;
-        wait: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodLiteral<"NO_WAIT">, z.ZodObject<{
-            ignoreDroppedReceiptsFor: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
-            timeout: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
-            interval: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
-            dontThrowOnRevert: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
-        }, "strip", z.ZodTypeAny, {
-            ignoreDroppedReceiptsFor?: number | undefined;
-            timeout?: number | undefined;
-            interval?: number | undefined;
-            dontThrowOnRevert?: boolean | undefined;
-        }, {
-            ignoreDroppedReceiptsFor?: number | undefined;
-            timeout?: number | undefined;
-            interval?: number | undefined;
-            dontThrowOnRevert?: boolean | undefined;
-        }>]>>;
-        additionalScopes: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<import("@aztec/foundation/schemas").ZodFor<AztecAddress>, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        from: "NO_FROM" | AztecAddress;
-        authWitnesses?: import("@aztec/stdlib/auth-witness").AuthWitness[] | undefined;
-        capsules?: import("@aztec/stdlib/tx").Capsule[] | undefined;
-        fee?: {
-            gasSettings?: {
-                gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
-                teardownGasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
-                maxFeePerGas?: {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                } | undefined;
-                maxPriorityFeePerGas?: {
-                    feePerDaGas: bigint;
-                    feePerL2Gas: bigint;
-                } | undefined;
-            } | undefined;
-        } | undefined;
-        wait?: "NO_WAIT" | {
-            ignoreDroppedReceiptsFor?: number | undefined;
-            timeout?: number | undefined;
-            interval?: number | undefined;
-            dontThrowOnRevert?: boolean | undefined;
-        } | undefined;
-        additionalScopes?: AztecAddress[] | undefined;
-    }, {
-        from?: any;
-        authWitnesses?: string[] | undefined;
-        capsules?: string[] | undefined;
-        fee?: {
-            gasSettings?: {
-                gasLimits?: {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                } | undefined;
-                teardownGasLimits?: {
-                    daGas: string | number | bigint;
-                    l2Gas: string | number | bigint;
-                } | undefined;
-                maxFeePerGas?: {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                } | undefined;
-                maxPriorityFeePerGas?: {
-                    feePerDaGas: string | number | bigint;
-                    feePerL2Gas: string | number | bigint;
-                } | undefined;
-            } | undefined;
-        } | undefined;
-        wait?: "NO_WAIT" | {
-            ignoreDroppedReceiptsFor?: number | undefined;
-            timeout?: number | undefined;
-            interval?: number | undefined;
-            dontThrowOnRevert?: boolean | undefined;
-        } | undefined;
-        additionalScopes?: any[] | undefined;
-    }>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<Tx>>;
-    registerAccount: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<AztecAddress>>;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsaUdBQStGO0FBQy9GLGVBQU8sTUFBTSxrQkFBa0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FJOUIsQ0FBQyJ9
+export declare const WorkerWalletSchema: ApiSchema;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQU8zRCxpR0FBK0Y7QUFDL0YsZUFBTyxNQUFNLGtCQUFrQixFQUFFLFNBSWhDLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI9B,CAAC"}
+{"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAO3D,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB,EAAE,SAIhC,CAAC"}

package/dest/test-wallet/worker_wallet_schema.js

@@ -5,6 +5,19 @@ import { Tx } from '@aztec/stdlib/tx';
 import { z } from 'zod';
 /** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */ export const WorkerWalletSchema = {
     ...WalletSchema,
-    proveTx: z.function().args(ExecutionPayloadSchema, SendOptionsSchema).returns(Tx.schema),
-    registerAccount: z.function().args(schemas.Fr, schemas.Fr).returns(AztecAddress.schema)
+    proveTx: z.function({
+        input: z.tuple([
+            ExecutionPayloadSchema,
+            SendOptionsSchema
+        ]),
+        output: Tx.schema
+    }),
+    registerAccount: z.function({
+        input: z.tuple([
+            schemas.Fr,
+            schemas.Fr,
+            schemas.Fq
+        ]),
+        output: AztecAddress.schema
+    })
 };