@walletmesh/aztec-rpc-wallet 0.1.0 → 0.1.1

package/src/handlers/aztecAccountWallet.ts

@@ -41,13 +41,13 @@ export const AZTEC_WALLET_METHODS: (keyof AztecWalletMethodMap)[] = [
   'aztec_getTxReceipt',
   'aztec_simulateTx',
   'aztec_simulateUnconstrained',
-  'aztec_getIncomingNotes',
+  'aztec_getNotes',
   'aztec_addNote',
   'aztec_addNullifiedNote',
-  'aztec_getUnencryptedLogs',
+  'aztec_getPublicLogs',
   'aztec_getContractClassLogs',
-  'aztec_getEncryptedEvents',
-  'aztec_getUnencryptedEvents',
+  'aztec_getPrivateEvents',
+  'aztec_getPublicEvents',
 ] as const;
 
 // Handler functions with proper type safety
@@ -331,11 +331,11 @@ async function handleGetPublicStorageAt(
   return await wallet.getPublicStorageAt(params.contract, params.storageSlot);
 }
 
-async function handleGetIncomingNotes(
+async function handleGetNotes(
   wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getIncomingNotes']['params'],
-): Promise<AztecWalletMethodMap['aztec_getIncomingNotes']['result']> {
-  return await wallet.getIncomingNotes(params.filter);
+  params: AztecWalletMethodMap['aztec_getNotes']['params'],
+): Promise<AztecWalletMethodMap['aztec_getNotes']['result']> {
+  return await wallet.getNotes(params.filter);
 }
 
 async function handleAddNote(
@@ -354,11 +354,11 @@ async function handleAddNullifiedNote(
   return true;
 }
 
-async function handleGetUnencryptedLogs(
+async function handleGetPublicLogs(
   wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getUnencryptedLogs']['params'],
-): Promise<AztecWalletMethodMap['aztec_getUnencryptedLogs']['result']> {
-  return await wallet.getUnencryptedLogs(params.filter);
+  params: AztecWalletMethodMap['aztec_getPublicLogs']['params'],
+): Promise<AztecWalletMethodMap['aztec_getPublicLogs']['result']> {
+  return await wallet.getPublicLogs(params.filter);
 }
 
 async function handleGetContractClassLogs(
@@ -368,20 +368,20 @@ async function handleGetContractClassLogs(
   return await wallet.getContractClassLogs(params.filter);
 }
 
-async function handleGetEncryptedEvents(
+async function handleGetPrivateEvents(
   wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getEncryptedEvents']['params'],
-): Promise<AztecWalletMethodMap['aztec_getEncryptedEvents']['result']> {
+  params: AztecWalletMethodMap['aztec_getPrivateEvents']['params'],
+): Promise<AztecWalletMethodMap['aztec_getPrivateEvents']['result']> {
   const { event, from, limit, vpks } = params;
-  return await wallet.getEncryptedEvents(event, from, limit, vpks);
+  return await wallet.getPrivateEvents(event, from, limit, vpks);
 }
 
-async function handleGetUnencryptedEvents(
+async function handleGetPublicEvents(
   wallet: AccountWallet,
-  params: AztecWalletMethodMap['aztec_getUnencryptedEvents']['params'],
-): Promise<AztecWalletMethodMap['aztec_getUnencryptedEvents']['result']> {
+  params: AztecWalletMethodMap['aztec_getPublicEvents']['params'],
+): Promise<AztecWalletMethodMap['aztec_getPublicEvents']['result']> {
   const { event, from, limit } = params;
-  return await wallet.getUnencryptedEvents(event, from, limit);
+  return await wallet.getPublicEvents(event, from, limit);
 }
 
 async function handleL1ToL2MembershipWitness(
@@ -553,11 +553,8 @@ export async function aztecWalletHandler<M extends keyof AztecWalletMethodMap>(
       );
 
     // Notes methods
-    case 'aztec_getIncomingNotes':
-      return handleGetIncomingNotes(
-        context.wallet,
-        params as AztecWalletMethodMap['aztec_getIncomingNotes']['params'],
-      );
+    case 'aztec_getNotes':
+      return handleGetNotes(context.wallet, params as AztecWalletMethodMap['aztec_getNotes']['params']);
     case 'aztec_addNote':
       return handleAddNote(context.wallet, params as AztecWalletMethodMap['aztec_addNote']['params']);
     case 'aztec_addNullifiedNote':
@@ -566,26 +563,26 @@ export async function aztecWalletHandler<M extends keyof AztecWalletMethodMap>(
         params as AztecWalletMethodMap['aztec_addNullifiedNote']['params'],
       );
 
-    // Logs methods
-    case 'aztec_getUnencryptedLogs':
-      return handleGetUnencryptedLogs(
+    // Logs and Events methods
+    case 'aztec_getPublicLogs':
+      return handleGetPublicLogs(
         context.wallet,
-        params as AztecWalletMethodMap['aztec_getUnencryptedLogs']['params'],
+        params as AztecWalletMethodMap['aztec_getPublicLogs']['params'],
       );
     case 'aztec_getContractClassLogs':
       return handleGetContractClassLogs(
         context.wallet,
         params as AztecWalletMethodMap['aztec_getContractClassLogs']['params'],
       );
-    case 'aztec_getEncryptedEvents':
-      return handleGetEncryptedEvents(
+    case 'aztec_getPrivateEvents':
+      return handleGetPrivateEvents(
         context.wallet,
-        params as AztecWalletMethodMap['aztec_getEncryptedEvents']['params'],
+        params as AztecWalletMethodMap['aztec_getPrivateEvents']['params'],
       );
-    case 'aztec_getUnencryptedEvents':
-      return handleGetUnencryptedEvents(
+    case 'aztec_getPublicEvents':
+      return handleGetPublicEvents(
         context.wallet,
-        params as AztecWalletMethodMap['aztec_getUnencryptedEvents']['params'],
+        params as AztecWalletMethodMap['aztec_getPublicEvents']['params'],
       );
     default:
       throw new AztecWalletError('invalidRequest', `Method not supported: ${String(method)}`);

package/src/serializers/account.test.ts

@@ -7,14 +7,14 @@ import {
   aztecGetAuthWitnessSerializer,
 } from './account.js';
 import { decodeBase64 } from './types.js';
-import { frSerializer } from './core.js';
+import { schemas } from '@aztec/foundation/schemas';
 
 describe('Account Serializers', () => {
   describe('aztec_setScopes', () => {
     const METHOD = 'aztec_setScopes';
 
-    it('should serialize and deserialize params', () => {
-      const scopes = [AztecAddress.random(), AztecAddress.random()];
+    it('should serialize and deserialize params', async () => {
+      const scopes = [await AztecAddress.random(), await AztecAddress.random()];
       const params = { scopes };
 
       const serialized = aztecSetScopesSerializer.params.serialize(METHOD, params);
@@ -38,9 +38,9 @@ describe('Account Serializers', () => {
   describe('aztec_registerAccount', () => {
     const METHOD = 'aztec_registerAccount';
 
-    it('should serialize and deserialize params', () => {
-      const secretKey = Fr.random();
-      const partialAddress = Fr.random();
+    it('should serialize and deserialize params', async () => {
+      const secretKey = await Fr.random();
+      const partialAddress = await Fr.random();
       const params = { secretKey, partialAddress };
 
       const serialized = aztecRegisterAccountSerializer.params.serialize(METHOD, params);
@@ -51,8 +51,8 @@ describe('Account Serializers', () => {
       expect(deserialized.partialAddress.toString()).toBe(partialAddress.toString());
     });
 
-    it('should serialize and deserialize result', () => {
-      const result = CompleteAddress.random();
+    it('should serialize and deserialize result', async () => {
+      const result = await CompleteAddress.random();
 
       const serialized = aztecRegisterAccountSerializer.result.serialize(METHOD, result);
       expect(serialized.method).toBe(METHOD);
@@ -65,8 +65,8 @@ describe('Account Serializers', () => {
   describe('aztec_addAuthWitness', () => {
     const METHOD = 'aztec_addAuthWitness';
 
-    it('should serialize and deserialize params', () => {
-      const authWitness = AuthWitness.random();
+    it('should serialize and deserialize params', async () => {
+      const authWitness = await AuthWitness.random();
       const params = { authWitness };
 
       const serialized = aztecAddAuthWitnessSerializer.params.serialize(METHOD, params);
@@ -90,8 +90,8 @@ describe('Account Serializers', () => {
   describe('aztec_getAuthWitness', () => {
     const METHOD = 'aztec_getAuthWitness';
 
-    it('should serialize and deserialize params', () => {
-      const messageHash = Fr.random();
+    it('should serialize and deserialize params', async () => {
+      const messageHash = await Fr.random();
       const params = { messageHash };
 
       const serialized = aztecGetAuthWitnessSerializer.params.serialize(METHOD, params);
@@ -101,8 +101,8 @@ describe('Account Serializers', () => {
       expect(deserialized.messageHash.toString()).toBe(messageHash.toString());
     });
 
-    it('should serialize and deserialize result', () => {
-      const result = [Fr.random(), Fr.random()];
+    it('should serialize and deserialize result', async () => {
+      const result = [await Fr.random(), await Fr.random()];
 
       const serialized = aztecGetAuthWitnessSerializer.result.serialize(METHOD, result);
       expect(serialized.method).toBe(METHOD);
@@ -113,12 +113,13 @@ describe('Account Serializers', () => {
   });
 
   describe('Base64 encoding/decoding', () => {
-    it('should properly encode and decode data', () => {
-      const messageHash = Fr.random();
+    it('should properly encode and decode data', async () => {
+      const messageHash = await Fr.random();
+
       const serialized = aztecGetAuthWitnessSerializer.params.serialize('aztec_getAuthWitness', {
         messageHash,
       });
-      const decoded = frSerializer.deserialize(decodeBase64(serialized.serialized));
+      const decoded = schemas.Fr.parse(JSON.parse(serialized.serialized));
       expect(decoded.toString()).toBe(messageHash.toString());
     });
   });

package/src/serializers/account.ts

@@ -1,18 +1,11 @@
 import type { AztecWalletMethodMap } from '../types.js';
-import type { JSONRPCSerializedData, JSONRPCSerializer } from './types.js';
-import { encodeBase64, decodeBase64 } from './types.js';
-import {
-  aztecAddressSerializer,
-  completeAddressSerializer,
-  frSerializer,
-  authWitnessSerializer,
-} from './core.js';
-import type { PartialAddress, AztecAddress } from '@aztec/aztec.js';
+import type { JSONRPCSerializedData, JSONRPCSerializer } from '@walletmesh/jsonrpc';
+import type { PartialAddress } from '@aztec/aztec.js';
+import { CompleteAddress, AuthWitness, AztecAddress, Fr } from '@aztec/aztec.js';
 
 /**
  * Serializer for the aztec_setScopes RPC method.
  * Handles serialization of account scope settings between JSON-RPC format and native Aztec types.
- * Scopes define which contracts can interact with an account.
  */
 export class AztecSetScopesSerializer
   implements
@@ -35,9 +28,9 @@ export class AztecSetScopesSerializer
       const { scopes } = value;
       return {
         method,
-        serialized: encodeBase64(
-          JSON.stringify(scopes.map((s: AztecAddress) => aztecAddressSerializer.serialize(s))),
-        ),
+        serialized: JSON.stringify({
+          scopes: scopes.map((s) => s.toString()),
+        }),
       };
     },
     /**
@@ -50,10 +43,10 @@ export class AztecSetScopesSerializer
       method: string,
       data: JSONRPCSerializedData,
     ): AztecWalletMethodMap['aztec_setScopes']['params'] => {
-      const scopes = JSON.parse(decodeBase64(data.serialized)).map((s: string) =>
-        aztecAddressSerializer.deserialize(s),
-      );
-      return { scopes };
+      const { scopes } = JSON.parse(data.serialized);
+      return {
+        scopes: scopes.map((s: string) => AztecAddress.fromString(s)),
+      };
     },
   };
 
@@ -67,7 +60,7 @@ export class AztecSetScopesSerializer
     serialize: (method: string, value: boolean): JSONRPCSerializedData => {
       return {
         method,
-        serialized: encodeBase64(JSON.stringify(value)),
+        serialized: JSON.stringify(value),
       };
     },
     /**
@@ -77,7 +70,7 @@ export class AztecSetScopesSerializer
      * @returns Boolean indicating success
      */
     deserialize: (method: string, data: JSONRPCSerializedData): boolean => {
-      return JSON.parse(decodeBase64(data.serialized));
+      return JSON.parse(data.serialized);
     },
   };
 }
@@ -85,7 +78,6 @@ export class AztecSetScopesSerializer
 /**
  * Serializer for the aztec_registerAccount RPC method.
  * Handles serialization of account registration data between JSON-RPC format and native Aztec types.
- * Account registration involves creating a new account with a secret key and partial address.
  */
 export class AztecRegisterAccountSerializer
   implements
@@ -108,12 +100,10 @@ export class AztecRegisterAccountSerializer
       const { secretKey, partialAddress } = value;
       return {
         method,
-        serialized: encodeBase64(
-          JSON.stringify([
-            frSerializer.serialize(secretKey),
-            frSerializer.serialize(partialAddress as unknown as PartialAddress),
-          ]),
-        ),
+        serialized: JSON.stringify({
+          secretKey: secretKey.toString(),
+          partialAddress: partialAddress.toString(),
+        }),
       };
     },
     /**
@@ -126,10 +116,10 @@ export class AztecRegisterAccountSerializer
       method: string,
       data: JSONRPCSerializedData,
     ): AztecWalletMethodMap['aztec_registerAccount']['params'] => {
-      const [secretKey, partialAddress] = JSON.parse(decodeBase64(data.serialized));
+      const { secretKey, partialAddress } = JSON.parse(data.serialized);
       return {
-        secretKey: frSerializer.deserialize(secretKey),
-        partialAddress: frSerializer.deserialize(partialAddress) as PartialAddress,
+        secretKey: Fr.fromString(secretKey),
+        partialAddress: Fr.fromString(partialAddress) as PartialAddress,
       };
     },
   };
@@ -141,13 +131,10 @@ export class AztecRegisterAccountSerializer
      * @param value - The complete address of the registered account
      * @returns Serialized complete address
      */
-    serialize: (
-      method: string,
-      value: AztecWalletMethodMap['aztec_registerAccount']['result'],
-    ): JSONRPCSerializedData => {
+    serialize: (method: string, value: CompleteAddress): JSONRPCSerializedData => {
       return {
         method,
-        serialized: encodeBase64(completeAddressSerializer.serialize(value)),
+        serialized: JSON.stringify(value.toString()),
       };
     },
     /**
@@ -156,11 +143,8 @@ export class AztecRegisterAccountSerializer
      * @param data - The serialized complete address
      * @returns Deserialized complete address
      */
-    deserialize: (
-      method: string,
-      data: JSONRPCSerializedData,
-    ): AztecWalletMethodMap['aztec_registerAccount']['result'] => {
-      return completeAddressSerializer.deserialize(decodeBase64(data.serialized));
+    deserialize: (method: string, data: JSONRPCSerializedData): CompleteAddress => {
+      return CompleteAddress.fromString(JSON.parse(data.serialized));
     },
   };
 }
@@ -168,7 +152,6 @@ export class AztecRegisterAccountSerializer
 /**
  * Serializer for the aztec_addAuthWitness RPC method.
  * Handles serialization of authentication witness data between JSON-RPC format and native Aztec types.
- * Auth witnesses are used to prove transaction authorization.
  */
 export class AztecAddAuthWitnessSerializer
   implements
@@ -191,7 +174,7 @@ export class AztecAddAuthWitnessSerializer
       const { authWitness } = value;
       return {
         method,
-        serialized: encodeBase64(authWitnessSerializer.serialize(authWitness)),
+        serialized: JSON.stringify(authWitness.toString()),
       };
     },
     /**
@@ -204,7 +187,7 @@ export class AztecAddAuthWitnessSerializer
       method: string,
       data: JSONRPCSerializedData,
     ): AztecWalletMethodMap['aztec_addAuthWitness']['params'] => {
-      const authWitness = authWitnessSerializer.deserialize(decodeBase64(data.serialized));
+      const authWitness = AuthWitness.fromString(JSON.parse(data.serialized));
       return { authWitness };
     },
   };
@@ -219,7 +202,7 @@ export class AztecAddAuthWitnessSerializer
     serialize: (method: string, value: boolean): JSONRPCSerializedData => {
       return {
         method,
-        serialized: encodeBase64(JSON.stringify(value)),
+        serialized: JSON.stringify(value),
       };
     },
     /**
@@ -229,7 +212,7 @@ export class AztecAddAuthWitnessSerializer
      * @returns Boolean indicating success
      */
     deserialize: (method: string, data: JSONRPCSerializedData): boolean => {
-      return JSON.parse(decodeBase64(data.serialized));
+      return JSON.parse(data.serialized);
     },
   };
 }
@@ -237,7 +220,6 @@ export class AztecAddAuthWitnessSerializer
 /**
  * Serializer for the aztec_getAuthWitness RPC method.
  * Handles serialization of authentication witness retrieval between JSON-RPC format and native Aztec types.
- * Retrieves auth witnesses associated with a specific message hash.
  */
 export class AztecGetAuthWitnessSerializer
   implements
@@ -260,7 +242,7 @@ export class AztecGetAuthWitnessSerializer
       const { messageHash } = value;
       return {
         method,
-        serialized: encodeBase64(frSerializer.serialize(messageHash)),
+        serialized: JSON.stringify(messageHash.toString()),
       };
     },
     /**
@@ -273,7 +255,7 @@ export class AztecGetAuthWitnessSerializer
       method: string,
       data: JSONRPCSerializedData,
     ): AztecWalletMethodMap['aztec_getAuthWitness']['params'] => {
-      const messageHash = frSerializer.deserialize(decodeBase64(data.serialized));
+      const messageHash = Fr.fromString(JSON.parse(data.serialized));
       return { messageHash };
     },
   };
@@ -291,7 +273,7 @@ export class AztecGetAuthWitnessSerializer
     ): JSONRPCSerializedData => {
       return {
         method,
-        serialized: encodeBase64(JSON.stringify(value.map((w) => frSerializer.serialize(w)))),
+        serialized: JSON.stringify(value.map((w) => w.toString())),
       };
     },
     /**
@@ -304,7 +286,7 @@ export class AztecGetAuthWitnessSerializer
       method: string,
       data: JSONRPCSerializedData,
     ): AztecWalletMethodMap['aztec_getAuthWitness']['result'] => {
-      return JSON.parse(decodeBase64(data.serialized)).map((w: string) => frSerializer.deserialize(w));
+      return JSON.parse(data.serialized).map((w: string) => Fr.fromString(w));
     },
   };
 }

package/src/serializers/contract.test.ts

@@ -20,12 +20,10 @@ import {
   type ContractNote,
 } from '@aztec/foundation/abi';
 import { randomContractArtifact, randomDeployedContract } from '@aztec/circuit-types';
-import { aztecAddressSerializer, frSerializer } from './core.js';
-
 describe('Contract Serializers', () => {
   describe('aztec_getContractInstance', () => {
-    it('should serialize and deserialize params', () => {
-      const address = AztecAddress.random();
+    it('should serialize and deserialize params', async () => {
+      const address = await AztecAddress.random();
       const params = { address };
 
       const serialized = aztecGetContractInstanceSerializer.params.serialize(
@@ -41,9 +39,9 @@ describe('Contract Serializers', () => {
       expect(deserialized.address.toString()).toBe(address.toString());
     });
 
-    it('should serialize and deserialize result', () => {
+    it('should serialize and deserialize result', async () => {
       // Create a contract instance with all required fields
-      const result = SerializableContractInstance.random().withAddress(AztecAddress.random());
+      const result = (await SerializableContractInstance.random()).withAddress(await AztecAddress.random());
 
       const serialized = aztecGetContractInstanceSerializer.result.serialize(
         'aztec_getContractInstance',
@@ -64,8 +62,8 @@ describe('Contract Serializers', () => {
   });
 
   describe('aztec_getContractClass', () => {
-    it('should serialize and deserialize params', () => {
-      const id = Fr.random();
+    it('should serialize and deserialize params', async () => {
+      const id = await Fr.random();
       const params = { id };
 
       const serialized = aztecGetContractClassSerializer.params.serialize('aztec_getContractClass', params);
@@ -78,8 +76,8 @@ describe('Contract Serializers', () => {
       expect(deserialized.id.toString()).toBe(id.toString());
     });
 
-    it('should serialize and deserialize result', () => {
-      const artifact = randomContractArtifact();
+    it('should serialize and deserialize result', async () => {
+      const artifact = await randomContractArtifact();
       const result = getContractClassFromArtifact(artifact);
       const serialized = aztecGetContractClassSerializer.result.serialize('aztec_getContractClass', result);
       expect(serialized.method).toBe('aztec_getContractClass');
@@ -97,8 +95,8 @@ describe('Contract Serializers', () => {
   });
 
   describe('aztec_getContractArtifact', () => {
-    it('should serialize and deserialize params', () => {
-      const id = Fr.random();
+    it('should serialize and deserialize params', async () => {
+      const id = await Fr.random();
       const serialized = aztecGetContractArtifactSerializer.params.serialize('aztec_getContractArtifact', {
         id,
       });
@@ -111,8 +109,8 @@ describe('Contract Serializers', () => {
       expect(deserialized.id.toString()).toBe(id.toString());
     });
 
-    it('should serialize and deserialize result', () => {
-      const result = randomContractArtifact();
+    it('should serialize and deserialize result', async () => {
+      const result = await randomContractArtifact();
       const serialized = aztecGetContractArtifactSerializer.result.serialize(
         'aztec_getContractArtifact',
         result,
@@ -128,8 +126,8 @@ describe('Contract Serializers', () => {
   });
 
   describe('aztec_registerContract', () => {
-    it('should serialize and deserialize params', () => {
-      const { instance, artifact } = randomDeployedContract();
+    it('should serialize and deserialize params', async () => {
+      const { instance, artifact } = await randomDeployedContract();
       const serialized = aztecRegisterContractSerializer.params.serialize('aztec_registerContract', {
         instance,
         artifact,