@aztec/end-to-end 0.0.1-commit.b8a057fa → 0.0.1-commit.be03c316

package/src/test-wallet/worker_wallet.ts

@@ -18,7 +18,7 @@ import type {
   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 { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
@@ -116,15 +116,17 @@ export class WorkerWallet implements Wallet {
     return wallet;
   }
 
-  private async callRaw(fn: string, ...args: any[]): Promise<string> {
+  private async callRaw(fn: string, ...args: any[]): Promise<string | undefined> {
     const argsJson = jsonStringify(args);
-    return (await this.client.request({ fn, args: argsJson })) as string;
+    return (await this.client.request({ fn, args: argsJson })) as string | undefined;
   }
 
   private async call(fn: string, ...args: any[]): Promise<any> {
     const resultJson = await this.callRaw(fn, ...args);
     const methodSchema = (WorkerWalletSchema as ApiSchema)[fn];
-    return getSchemaReturnType(methodSchema).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(): Promise<ChainInfo> {
@@ -190,8 +192,8 @@ export class WorkerWallet implements Wallet {
   }
 
   /** Registers an account inside the worker's TestWallet, populating its accounts map. */
-  registerAccount(secret: Fr, salt: Fr): Promise<AztecAddress> {
-    return this.call('registerAccount', secret, salt);
+  registerAccount(secret: Fr, salt: Fr, signingKey: Fq): Promise<AztecAddress> {
+    return this.call('registerAccount', secret, salt, signingKey);
   }
 
   createAuthWit(from: AztecAddress, messageHashOrIntent: IntentInnerHash | CallIntent): Promise<AuthWitness> {

package/src/test-wallet/worker_wallet_schema.ts

@@ -10,5 +10,5 @@ import { z } from 'zod';
 export const WorkerWalletSchema: ApiSchema = {
   ...WalletSchema,
   proveTx: z.function({ input: z.tuple([ExecutionPayloadSchema, SendOptionsSchema]), output: Tx.schema }),
-  registerAccount: z.function({ input: z.tuple([schemas.Fr, schemas.Fr]), output: AztecAddress.schema }),
+  registerAccount: z.function({ input: z.tuple([schemas.Fr, schemas.Fr, schemas.Fq]), output: AztecAddress.schema }),
 };