@walletmesh/aztec-rpc-wallet 0.2.0 → 0.3.0

package/src/handlers/aztecAccountWallet.ts

@@ -1,4 +1,4 @@
-import type { AccountWallet } from '@aztec/aztec.js';
+import type { AccountWallet, PXE } from '@aztec/aztec.js';
 import { AztecWalletError } from '../errors.js';
 import type { AztecWalletContext, AztecWalletMethodMap } from '../types.js';
 
@@ -25,14 +25,10 @@ export const AZTEC_WALLET_METHODS: (keyof AztecWalletMethodMap)[] = [
   'aztec_getSenders',
   'aztec_removeSender',
   'aztec_getContracts',
-  'aztec_getContractInstance',
-  'aztec_getContractClass',
-  'aztec_getContractArtifact',
-  'aztec_isContractClassPubliclyRegistered',
-  'aztec_isContractPubliclyDeployed',
-  'aztec_isContractInitialized',
   'aztec_registerContract',
   'aztec_registerContractClass',
+  'aztec_getContractMetadata',
+  'aztec_getContractClassMetadata',
   'aztec_getPublicStorageAt',
   'aztec_createTxExecutionRequest',
   'aztec_proveTx',
@@ -196,52 +192,18 @@ async function handleGetContracts(
   return await wallet.getContracts();
 }
 
-async function handleGetContractInstance(
-  wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getContractInstance']['params'],
-): Promise<AztecWalletMethodMap['aztec_getContractInstance']['result']> {
-  const instance = await wallet.getContractInstance(params.address);
-  if (!instance) throw new AztecWalletError('contractInstanceNotRegistered', 'aztec_getContractInstance');
-  return instance;
-}
-
-async function handleGetContractClass(
-  wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getContractClass']['params'],
-): Promise<AztecWalletMethodMap['aztec_getContractClass']['result']> {
-  const contractClass = await wallet.getContractClass(params.id);
-  if (!contractClass) throw new AztecWalletError('contractClassNotRegistered', 'aztec_getContractClass');
-  return contractClass;
-}
-
-async function handleGetContractArtifact(
-  wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getContractArtifact']['params'],
-): Promise<AztecWalletMethodMap['aztec_getContractArtifact']['result']> {
-  const artifact = await wallet.getContractArtifact(params.id);
-  if (!artifact) throw new AztecWalletError('contractClassNotRegistered', 'aztec_getContractArtifact');
-  return artifact;
-}
-
-async function handleIsContractClassPubliclyRegistered(
-  wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_isContractClassPubliclyRegistered']['params'],
-): Promise<AztecWalletMethodMap['aztec_isContractClassPubliclyRegistered']['result']> {
-  return await wallet.isContractClassPubliclyRegistered(params.id);
-}
-
-async function handleIsContractPubliclyDeployed(
-  wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_isContractPubliclyDeployed']['params'],
-): Promise<AztecWalletMethodMap['aztec_isContractPubliclyDeployed']['result']> {
-  return await wallet.isContractPubliclyDeployed(params.address);
+async function handleGetContractMetadata(
+  pxe: PXE,
+  params: AztecWalletMethodMap['aztec_getContractMetadata']['params'],
+): Promise<AztecWalletMethodMap['aztec_getContractMetadata']['result']> {
+  return await pxe.getContractMetadata(params.address);
 }
 
-async function handleIsContractInitialized(
-  wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_isContractInitialized']['params'],
-): Promise<AztecWalletMethodMap['aztec_isContractInitialized']['result']> {
-  return await wallet.isContractInitialized(params.address);
+async function handleGetContractClassMetadata(
+  pxe: PXE,
+  params: AztecWalletMethodMap['aztec_getContractClassMetadata']['params'],
+): Promise<AztecWalletMethodMap['aztec_getContractClassMetadata']['result']> {
+  return await pxe.getContractClassMetadata(params.id, params.includeArtifact);
 }
 
 async function handleRegisterContract(
@@ -481,35 +443,15 @@ export async function aztecWalletHandler<M extends keyof AztecWalletMethodMap>(
     // Contracts methods
     case 'aztec_getContracts':
       return handleGetContracts(context.wallet);
-    case 'aztec_getContractInstance':
-      return handleGetContractInstance(
-        context.wallet,
-        params as AztecWalletMethodMap['aztec_getContractInstance']['params'],
-      );
-    case 'aztec_getContractClass':
-      return handleGetContractClass(
-        context.wallet,
-        params as AztecWalletMethodMap['aztec_getContractClass']['params'],
-      );
-    case 'aztec_getContractArtifact':
-      return handleGetContractArtifact(
-        context.wallet,
-        params as AztecWalletMethodMap['aztec_getContractArtifact']['params'],
-      );
-    case 'aztec_isContractClassPubliclyRegistered':
-      return handleIsContractClassPubliclyRegistered(
-        context.wallet,
-        params as AztecWalletMethodMap['aztec_isContractClassPubliclyRegistered']['params'],
-      );
-    case 'aztec_isContractPubliclyDeployed':
-      return handleIsContractPubliclyDeployed(
+    case 'aztec_getContractMetadata':
+      return handleGetContractMetadata(
         context.wallet,
-        params as AztecWalletMethodMap['aztec_isContractPubliclyDeployed']['params'],
+        params as AztecWalletMethodMap['aztec_getContractMetadata']['params'],
       );
-    case 'aztec_isContractInitialized':
-      return handleIsContractInitialized(
+    case 'aztec_getContractClassMetadata':
+      return handleGetContractClassMetadata(
         context.wallet,
-        params as AztecWalletMethodMap['aztec_isContractInitialized']['params'],
+        params as AztecWalletMethodMap['aztec_getContractClassMetadata']['params'],
       );
     case 'aztec_registerContract':
       return handleRegisterContract(

package/src/provider.test.ts

@@ -1,7 +1,6 @@
 import { describe, test, expect, vi, beforeEach } from 'vitest';
 import { AztecProvider } from './provider.js';
 import { AztecWalletError, AztecWalletErrorType } from './errors.js';
-import type { JSONRPCTransport } from '@walletmesh/jsonrpc';
 import type { ContractInstanceWithAddress, AztecAddress, ContractArtifact } from '@aztec/aztec.js';
 import { WalletRouterProvider } from '@walletmesh/router';
 import type { OperationBuilder } from '@walletmesh/router';
@@ -65,7 +64,6 @@ describe('AztecProvider', () => {
     test('registers event handlers', () => {
       // Create a spy on the on method before creating provider
       const onSpy = vi.spyOn(WalletRouterProvider.prototype, 'on');
-      const provider = new AztecProvider(mockTransport);
 
       expect(onSpy).toHaveBeenCalledWith('wm_walletStateChanged', expect.any(Function));
       expect(onSpy).toHaveBeenCalledWith('wm_sessionTerminated', expect.any(Function));

package/src/serializers/account.test.ts

@@ -6,7 +6,6 @@ import {
   aztecAddAuthWitnessSerializer,
   aztecGetAuthWitnessSerializer,
 } from './account.js';
-import { decodeBase64 } from './types.js';
 import { schemas } from '@aztec/foundation/schemas';
 
 describe('Account Serializers', () => {
@@ -17,20 +16,20 @@ describe('Account Serializers', () => {
       const scopes = [await AztecAddress.random(), await AztecAddress.random()];
       const params = { scopes };
 
-      const serialized = aztecSetScopesSerializer.params.serialize(METHOD, params);
+      const serialized = await aztecSetScopesSerializer.params.serialize(METHOD, params);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecSetScopesSerializer.params.deserialize(METHOD, serialized);
+      const deserialized = await aztecSetScopesSerializer.params.deserialize(METHOD, serialized);
       expect(deserialized.scopes.map((s) => s.toString())).toEqual(scopes.map((s) => s.toString()));
     });
 
-    it('should serialize and deserialize result', () => {
+    it('should serialize and deserialize result', async () => {
       const result = true;
 
-      const serialized = aztecSetScopesSerializer.result.serialize(METHOD, result);
+      const serialized = await aztecSetScopesSerializer.result.serialize(METHOD, result);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecSetScopesSerializer.result.deserialize(METHOD, serialized);
+      const deserialized = await aztecSetScopesSerializer.result.deserialize(METHOD, serialized);
       expect(deserialized).toBe(result);
     });
   });
@@ -43,10 +42,10 @@ describe('Account Serializers', () => {
       const partialAddress = await Fr.random();
       const params = { secretKey, partialAddress };
 
-      const serialized = aztecRegisterAccountSerializer.params.serialize(METHOD, params);
+      const serialized = await aztecRegisterAccountSerializer.params.serialize(METHOD, params);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecRegisterAccountSerializer.params.deserialize(METHOD, serialized);
+      const deserialized = await aztecRegisterAccountSerializer.params.deserialize(METHOD, serialized);
       expect(deserialized.secretKey.toString()).toBe(secretKey.toString());
       expect(deserialized.partialAddress.toString()).toBe(partialAddress.toString());
     });
@@ -54,10 +53,10 @@ describe('Account Serializers', () => {
     it('should serialize and deserialize result', async () => {
       const result = await CompleteAddress.random();
 
-      const serialized = aztecRegisterAccountSerializer.result.serialize(METHOD, result);
+      const serialized = await aztecRegisterAccountSerializer.result.serialize(METHOD, result);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecRegisterAccountSerializer.result.deserialize(METHOD, serialized);
+      const deserialized = await aztecRegisterAccountSerializer.result.deserialize(METHOD, serialized);
       expect(deserialized.toString()).toBe(result.toString());
     });
   });
@@ -69,20 +68,20 @@ describe('Account Serializers', () => {
       const authWitness = await AuthWitness.random();
       const params = { authWitness };
 
-      const serialized = aztecAddAuthWitnessSerializer.params.serialize(METHOD, params);
+      const serialized = await aztecAddAuthWitnessSerializer.params.serialize(METHOD, params);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecAddAuthWitnessSerializer.params.deserialize(METHOD, serialized);
+      const deserialized = await aztecAddAuthWitnessSerializer.params.deserialize(METHOD, serialized);
       expect(deserialized.authWitness.toString()).toBe(authWitness.toString());
     });
 
-    it('should serialize and deserialize result', () => {
+    it('should serialize and deserialize result', async () => {
       const result = true;
 
-      const serialized = aztecAddAuthWitnessSerializer.result.serialize(METHOD, result);
+      const serialized = await aztecAddAuthWitnessSerializer.result.serialize(METHOD, result);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecAddAuthWitnessSerializer.result.deserialize(METHOD, serialized);
+      const deserialized = await aztecAddAuthWitnessSerializer.result.deserialize(METHOD, serialized);
       expect(deserialized).toBe(result);
     });
   });
@@ -94,20 +93,20 @@ describe('Account Serializers', () => {
       const messageHash = await Fr.random();
       const params = { messageHash };
 
-      const serialized = aztecGetAuthWitnessSerializer.params.serialize(METHOD, params);
+      const serialized = await aztecGetAuthWitnessSerializer.params.serialize(METHOD, params);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecGetAuthWitnessSerializer.params.deserialize(METHOD, serialized);
+      const deserialized = await aztecGetAuthWitnessSerializer.params.deserialize(METHOD, serialized);
       expect(deserialized.messageHash.toString()).toBe(messageHash.toString());
     });
 
     it('should serialize and deserialize result', async () => {
       const result = [await Fr.random(), await Fr.random()];
 
-      const serialized = aztecGetAuthWitnessSerializer.result.serialize(METHOD, result);
+      const serialized = await aztecGetAuthWitnessSerializer.result.serialize(METHOD, result);
       expect(serialized.method).toBe(METHOD);
 
-      const deserialized = aztecGetAuthWitnessSerializer.result.deserialize(METHOD, serialized);
+      const deserialized = await aztecGetAuthWitnessSerializer.result.deserialize(METHOD, serialized);
       expect(deserialized.map((w) => w.toString())).toEqual(result.map((w) => w.toString()));
     });
   });
@@ -116,7 +115,7 @@ describe('Account Serializers', () => {
     it('should properly encode and decode data', async () => {
       const messageHash = await Fr.random();
 
-      const serialized = aztecGetAuthWitnessSerializer.params.serialize('aztec_getAuthWitness', {
+      const serialized = await aztecGetAuthWitnessSerializer.params.serialize('aztec_getAuthWitness', {
         messageHash,
       });
       const decoded = schemas.Fr.parse(JSON.parse(serialized.serialized));

package/src/serializers/account.ts

@@ -21,17 +21,17 @@ export class AztecSetScopesSerializer
      * @param value - The parameters containing an array of Aztec addresses representing scopes
      * @returns Serialized scope data
      */
-    serialize: (
+    serialize: async (
       method: string,
       value: AztecWalletMethodMap['aztec_setScopes']['params'],
-    ): JSONRPCSerializedData => {
+    ): Promise<JSONRPCSerializedData> => {
       const { scopes } = value;
-      return {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify({
           scopes: scopes.map((s) => s.toString()),
         }),
-      };
+      });
     },
     /**
      * Deserializes scope setting parameters from RPC transport.
@@ -39,14 +39,14 @@ export class AztecSetScopesSerializer
      * @param data - The serialized scope data
      * @returns Deserialized scope parameters
      */
-    deserialize: (
+    deserialize: async (
       _method: string,
       data: JSONRPCSerializedData,
-    ): AztecWalletMethodMap['aztec_setScopes']['params'] => {
+    ): Promise<AztecWalletMethodMap['aztec_setScopes']['params']> => {
       const { scopes } = JSON.parse(data.serialized);
-      return {
+      return Promise.resolve({
         scopes: scopes.map((s: string) => AztecAddress.fromString(s)),
-      };
+      });
     },
   };
 
@@ -57,11 +57,11 @@ export class AztecSetScopesSerializer
      * @param value - Boolean indicating success of the scope setting operation
      * @returns Serialized result
      */
-    serialize: (method: string, value: boolean): JSONRPCSerializedData => {
-      return {
+    serialize: async (method: string, value: boolean): Promise<JSONRPCSerializedData> => {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify(value),
-      };
+      });
     },
     /**
      * Deserializes the scope setting result.
@@ -69,8 +69,8 @@ export class AztecSetScopesSerializer
      * @param data - The serialized result data
      * @returns Boolean indicating success
      */
-    deserialize: (_method: string, data: JSONRPCSerializedData): boolean => {
-      return JSON.parse(data.serialized);
+    deserialize: async (_method: string, data: JSONRPCSerializedData): Promise<boolean> => {
+      return Promise.resolve(JSON.parse(data.serialized));
     },
   };
 }
@@ -93,18 +93,18 @@ export class AztecRegisterAccountSerializer
      * @param value - The parameters containing secret key and partial address
      * @returns Serialized registration data
      */
-    serialize: (
+    serialize: async (
       method: string,
       value: AztecWalletMethodMap['aztec_registerAccount']['params'],
-    ): JSONRPCSerializedData => {
+    ): Promise<JSONRPCSerializedData> => {
       const { secretKey, partialAddress } = value;
-      return {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify({
           secretKey: secretKey.toString(),
           partialAddress: partialAddress.toString(),
         }),
-      };
+      });
     },
     /**
      * Deserializes account registration parameters from RPC transport.
@@ -112,15 +112,15 @@ export class AztecRegisterAccountSerializer
      * @param data - The serialized registration data
      * @returns Deserialized registration parameters
      */
-    deserialize: (
+    deserialize: async (
       _method: string,
       data: JSONRPCSerializedData,
-    ): AztecWalletMethodMap['aztec_registerAccount']['params'] => {
+    ): Promise<AztecWalletMethodMap['aztec_registerAccount']['params']> => {
       const { secretKey, partialAddress } = JSON.parse(data.serialized);
-      return {
+      return Promise.resolve({
         secretKey: Fr.fromString(secretKey),
         partialAddress: Fr.fromString(partialAddress) as PartialAddress,
-      };
+      });
     },
   };
 
@@ -131,11 +131,11 @@ export class AztecRegisterAccountSerializer
      * @param value - The complete address of the registered account
      * @returns Serialized complete address
      */
-    serialize: (method: string, value: CompleteAddress): JSONRPCSerializedData => {
-      return {
+    serialize: async (method: string, value: CompleteAddress): Promise<JSONRPCSerializedData> => {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify(value.toString()),
-      };
+      });
     },
     /**
      * Deserializes the account registration result.
@@ -143,8 +143,8 @@ export class AztecRegisterAccountSerializer
      * @param data - The serialized complete address
      * @returns Deserialized complete address
      */
-    deserialize: (_method: string, data: JSONRPCSerializedData): CompleteAddress => {
-      return CompleteAddress.fromString(JSON.parse(data.serialized));
+    deserialize: async (_method: string, data: JSONRPCSerializedData): Promise<CompleteAddress> => {
+      return Promise.resolve(CompleteAddress.fromString(JSON.parse(data.serialized)));
     },
   };
 }
@@ -167,15 +167,15 @@ export class AztecAddAuthWitnessSerializer
      * @param value - The parameters containing the auth witness to add
      * @returns Serialized auth witness data
      */
-    serialize: (
+    serialize: async (
       method: string,
       value: AztecWalletMethodMap['aztec_addAuthWitness']['params'],
-    ): JSONRPCSerializedData => {
+    ): Promise<JSONRPCSerializedData> => {
       const { authWitness } = value;
-      return {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify(authWitness.toString()),
-      };
+      });
     },
     /**
      * Deserializes auth witness addition parameters from RPC transport.
@@ -183,12 +183,12 @@ export class AztecAddAuthWitnessSerializer
      * @param data - The serialized auth witness data
      * @returns Deserialized auth witness parameters
      */
-    deserialize: (
+    deserialize: async (
       _method: string,
       data: JSONRPCSerializedData,
-    ): AztecWalletMethodMap['aztec_addAuthWitness']['params'] => {
+    ): Promise<AztecWalletMethodMap['aztec_addAuthWitness']['params']> => {
       const authWitness = AuthWitness.fromString(JSON.parse(data.serialized));
-      return { authWitness };
+      return Promise.resolve({ authWitness });
     },
   };
 
@@ -199,11 +199,11 @@ export class AztecAddAuthWitnessSerializer
      * @param value - Boolean indicating success of the witness addition
      * @returns Serialized result
      */
-    serialize: (method: string, value: boolean): JSONRPCSerializedData => {
-      return {
+    serialize: async (method: string, value: boolean): Promise<JSONRPCSerializedData> => {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify(value),
-      };
+      });
     },
     /**
      * Deserializes the auth witness addition result.
@@ -211,8 +211,8 @@ export class AztecAddAuthWitnessSerializer
      * @param data - The serialized result data
      * @returns Boolean indicating success
      */
-    deserialize: (_method: string, data: JSONRPCSerializedData): boolean => {
-      return JSON.parse(data.serialized);
+    deserialize: async (_method: string, data: JSONRPCSerializedData): Promise<boolean> => {
+      return Promise.resolve(JSON.parse(data.serialized));
     },
   };
 }
@@ -235,15 +235,15 @@ export class AztecGetAuthWitnessSerializer
      * @param value - The parameters containing the message hash to look up
      * @returns Serialized message hash data
      */
-    serialize: (
+    serialize: async (
       method: string,
       value: AztecWalletMethodMap['aztec_getAuthWitness']['params'],
-    ): JSONRPCSerializedData => {
+    ): Promise<JSONRPCSerializedData> => {
       const { messageHash } = value;
-      return {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify(messageHash.toString()),
-      };
+      });
     },
     /**
      * Deserializes auth witness retrieval parameters from RPC transport.
@@ -251,12 +251,12 @@ export class AztecGetAuthWitnessSerializer
      * @param data - The serialized message hash data
      * @returns Deserialized message hash parameters
      */
-    deserialize: (
+    deserialize: async (
       _method: string,
       data: JSONRPCSerializedData,
-    ): AztecWalletMethodMap['aztec_getAuthWitness']['params'] => {
+    ): Promise<AztecWalletMethodMap['aztec_getAuthWitness']['params']> => {
       const messageHash = Fr.fromString(JSON.parse(data.serialized));
-      return { messageHash };
+      return Promise.resolve({ messageHash });
     },
   };
 
@@ -267,14 +267,14 @@ export class AztecGetAuthWitnessSerializer
      * @param value - Array of field elements representing auth witnesses
      * @returns Serialized witness array
      */
-    serialize: (
+    serialize: async (
       method: string,
       value: AztecWalletMethodMap['aztec_getAuthWitness']['result'],
-    ): JSONRPCSerializedData => {
-      return {
+    ): Promise<JSONRPCSerializedData> => {
+      return Promise.resolve({
         method,
         serialized: JSON.stringify(value.map((w) => w.toString())),
-      };
+      });
     },
     /**
      * Deserializes the auth witness retrieval result.
@@ -282,11 +282,11 @@ export class AztecGetAuthWitnessSerializer
      * @param data - The serialized witness array data
      * @returns Array of deserialized field elements
      */
-    deserialize: (
+    deserialize: async (
       _method: string,
       data: JSONRPCSerializedData,
-    ): AztecWalletMethodMap['aztec_getAuthWitness']['result'] => {
-      return JSON.parse(data.serialized).map((w: string) => Fr.fromString(w));
+    ): Promise<AztecWalletMethodMap['aztec_getAuthWitness']['result']> => {
+      return Promise.resolve(JSON.parse(data.serialized).map((w: string) => Fr.fromString(w)));
     },
   };
 }