@walletmesh/aztec-rpc-wallet 0.1.0 → 0.2.0

package/dist/serializers/transaction.js

@@ -1,8 +1,8 @@
-import { encodeBase64, decodeBase64 } from './types.js';
-import { txHashSerializer } from './core.js';
-import { TxEffect, TxSimulationResult, inBlockSchemaFor } from '@aztec/circuit-types';
+import { TxProvingResult } from '@aztec/circuit-types';
+import { PrivateExecutionResult, TxEffect, TxSimulationResult, inBlockSchemaFor, TxHash, } from '@aztec/circuit-types';
 import { TxExecutionRequest, TxReceipt, Tx, AztecAddress } from '@aztec/aztec.js';
-import { SerializablePrivateExecutionResult, SerializableTxProvingResult } from './transaction-utils.js';
+import { serializeExecutionRequestInit, deserializeExecutionRequestInit } from './transaction-utils.js';
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 /**
  * Serializer for the aztec_createTxExecutionRequest RPC method.
  * Handles serialization of transaction execution requests between JSON-RPC format and native Aztec types.
@@ -14,11 +14,11 @@ export class AztecCreateTxExecutionRequestSerializer {
                 const { exec } = value;
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify(exec)),
+                    serialized: serializeExecutionRequestInit(exec),
                 };
             },
-            deserialize: (method, data) => {
-                const exec = JSON.parse(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                const exec = deserializeExecutionRequestInit(data.serialized);
                 return { exec };
             },
         };
@@ -26,11 +26,11 @@ export class AztecCreateTxExecutionRequestSerializer {
             serialize: (method, value) => {
                 return {
                     method,
-                    serialized: encodeBase64(value.toString()),
+                    serialized: jsonStringify(value),
                 };
             },
-            deserialize: (method, data) => {
-                return TxExecutionRequest.fromString(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                return jsonParseWithSchema(data.serialized, TxExecutionRequest.schema);
             },
         };
     }
@@ -38,37 +38,37 @@ export class AztecCreateTxExecutionRequestSerializer {
 /**
  * Serializer for the aztec_proveTx RPC method.
  * Handles serialization of transaction proving requests and results between JSON-RPC format and native Aztec types.
- * Includes handling of private execution results and proving outcomes.
  */
 export class AztecProveTxSerializer {
     constructor() {
         this.params = {
             serialize: (method, value) => {
                 const { txRequest, privateExecutionResult } = value;
-                const serializablePrivateExecutionResult = SerializablePrivateExecutionResult.from(privateExecutionResult);
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify([txRequest.toString(), serializablePrivateExecutionResult])),
+                    serialized: JSON.stringify({
+                        txRequest: jsonStringify(txRequest),
+                        privateExecutionResult: jsonStringify(privateExecutionResult),
+                    }),
                 };
             },
-            deserialize: (method, data) => {
-                const [txRequest, privateExecutionResult] = JSON.parse(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                const { txRequest, privateExecutionResult } = JSON.parse(data.serialized);
                 return {
-                    txRequest: TxExecutionRequest.fromString(txRequest),
-                    privateExecutionResult: SerializablePrivateExecutionResult.fromJSON(privateExecutionResult),
+                    txRequest: jsonParseWithSchema(txRequest, TxExecutionRequest.schema),
+                    privateExecutionResult: jsonParseWithSchema(privateExecutionResult, PrivateExecutionResult.schema),
                 };
             },
         };
         this.result = {
             serialize: (method, value) => {
-                const serializableTxProvingResult = SerializableTxProvingResult.from(value);
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify(serializableTxProvingResult)),
+                    serialized: jsonStringify(value),
                 };
             },
-            deserialize: (method, data) => {
-                return SerializableTxProvingResult.fromJSON(JSON.parse(decodeBase64(data.serialized)));
+            deserialize: (_method, data) => {
+                return jsonParseWithSchema(data.serialized, TxProvingResult.schema);
             },
         };
     }
@@ -84,23 +84,22 @@ export class AztecSendTxSerializer {
                 const { tx } = value;
                 return {
                     method,
-                    serialized: encodeBase64(tx.toBuffer().toString('hex')),
+                    serialized: jsonStringify(tx),
                 };
             },
-            deserialize: (method, data) => {
-                const tx = Tx.fromBuffer(Buffer.from(decodeBase64(data.serialized), 'hex'));
-                return { tx };
+            deserialize: (_method, data) => {
+                return { tx: jsonParseWithSchema(data.serialized, Tx.schema) };
             },
         };
         this.result = {
             serialize: (method, value) => {
                 return {
                     method,
-                    serialized: encodeBase64(txHashSerializer.serialize(value)),
+                    serialized: jsonStringify(value),
                 };
             },
-            deserialize: (method, data) => {
-                return txHashSerializer.deserialize(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                return jsonParseWithSchema(data.serialized, TxHash.schema);
             },
         };
     }
@@ -108,7 +107,6 @@ export class AztecSendTxSerializer {
 /**
  * Serializer for the aztec_getTxEffect RPC method.
  * Handles serialization of transaction effect queries and results between JSON-RPC format and native Aztec types.
- * Transaction effects represent the outcome and state changes caused by a transaction.
  */
 export class AztecGetTxEffectSerializer {
     constructor() {
@@ -117,11 +115,11 @@ export class AztecGetTxEffectSerializer {
                 const { txHash } = value;
                 return {
                     method,
-                    serialized: encodeBase64(txHashSerializer.serialize(txHash)),
+                    serialized: jsonStringify(txHash),
                 };
             },
-            deserialize: (method, data) => {
-                const txHash = txHashSerializer.deserialize(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                const txHash = jsonParseWithSchema(data.serialized, TxHash.schema);
                 return { txHash };
             },
         };
@@ -129,11 +127,11 @@ export class AztecGetTxEffectSerializer {
             serialize: (method, value) => {
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify(TxEffect.schema.parse(value))),
+                    serialized: jsonStringify(value),
                 };
             },
-            deserialize: (method, data) => {
-                return inBlockSchemaFor(TxEffect.schema).parse(JSON.parse(decodeBase64(data.serialized)));
+            deserialize: (_method, data) => {
+                return jsonParseWithSchema(data.serialized, inBlockSchemaFor(TxEffect.schema));
             },
         };
     }
@@ -141,7 +139,6 @@ export class AztecGetTxEffectSerializer {
 /**
  * Serializer for the aztec_getTxReceipt RPC method.
  * Handles serialization of transaction receipt queries and results between JSON-RPC format and native Aztec types.
- * Transaction receipts contain detailed information about executed transactions.
  */
 export class AztecGetTxReceiptSerializer {
     constructor() {
@@ -150,11 +147,11 @@ export class AztecGetTxReceiptSerializer {
                 const { txHash } = value;
                 return {
                     method,
-                    serialized: encodeBase64(txHashSerializer.serialize(txHash)),
+                    serialized: jsonStringify(txHash),
                 };
             },
-            deserialize: (method, data) => {
-                const txHash = txHashSerializer.deserialize(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                const txHash = jsonParseWithSchema(data.serialized, TxHash.schema);
                 return { txHash };
             },
         };
@@ -162,11 +159,11 @@ export class AztecGetTxReceiptSerializer {
             serialize: (method, value) => {
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify(TxReceipt.schema.parse(value))),
+                    serialized: jsonStringify(value),
                 };
             },
-            deserialize: (method, data) => {
-                return TxReceipt.schema.parse(JSON.parse(decodeBase64(data.serialized)));
+            deserialize: (_method, data) => {
+                return jsonParseWithSchema(data.serialized, TxReceipt.schema);
             },
         };
     }
@@ -174,7 +171,6 @@ export class AztecGetTxReceiptSerializer {
 /**
  * Serializer for the aztec_simulateTx RPC method.
  * Handles serialization of transaction simulation requests and results between JSON-RPC format and native Aztec types.
- * Supports simulation configuration including public simulation, custom sender, validation options, and profiling.
  */
 export class AztecSimulateTxSerializer {
     constructor() {
@@ -183,22 +179,22 @@ export class AztecSimulateTxSerializer {
                 const { txRequest, simulatePublic, msgSender, skipTxValidation, enforceFeePayment, profile } = value;
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify([
-                        txRequest.toString(),
+                    serialized: JSON.stringify({
+                        txRequest: jsonStringify(txRequest),
                         simulatePublic,
-                        msgSender,
+                        msgSender: JSON.stringify(msgSender),
                         skipTxValidation,
                         enforceFeePayment,
                         profile,
-                    ])),
+                    }),
                 };
             },
-            deserialize: (method, data) => {
-                const [txRequest, simulatePublic, msgSender, skipTxValidation, enforceFeePayment, profile] = JSON.parse(decodeBase64(data.serialized));
+            deserialize: (_method, data) => {
+                const { txRequest, simulatePublic, msgSender, skipTxValidation, enforceFeePayment, profile } = JSON.parse(data.serialized);
                 return {
-                    txRequest: TxExecutionRequest.fromString(txRequest),
+                    txRequest: jsonParseWithSchema(txRequest, TxExecutionRequest.schema),
                     simulatePublic,
-                    msgSender: msgSender ? AztecAddress.fromString(msgSender) : undefined,
+                    msgSender: jsonParseWithSchema(msgSender, AztecAddress.schema),
                     skipTxValidation,
                     enforceFeePayment,
                     profile,
@@ -207,20 +203,13 @@ export class AztecSimulateTxSerializer {
         };
         this.result = {
             serialize: (method, value) => {
-                const serializablePrivateExecutionResult = SerializablePrivateExecutionResult.from(value.privateExecutionResult);
                 return {
                     method,
-                    serialized: encodeBase64(JSON.stringify({
-                        privateExecutionResult: serializablePrivateExecutionResult,
-                        publicInputs: value.publicInputs,
-                        publicOutput: value.publicOutput,
-                        profileResult: value.profileResult,
-                    })),
+                    serialized: jsonStringify(value),
                 };
             },
-            deserialize: (method, data) => {
-                const { privateExecutionResult, publicInputs, publicOutput, profileResult } = JSON.parse(decodeBase64(data.serialized));
-                return new TxSimulationResult(SerializablePrivateExecutionResult.fromJSON(privateExecutionResult), publicInputs, publicOutput, profileResult);
+            deserialize: (_method, data) => {
+                return jsonParseWithSchema(data.serialized, TxSimulationResult.schema);
             },
         };
     }
@@ -235,4 +224,4 @@ export const aztecSendTxSerializer = new AztecSendTxSerializer();
 export const aztecGetTxEffectSerializer = new AztecGetTxEffectSerializer();
 export const aztecGetTxReceiptSerializer = new AztecGetTxReceiptSerializer();
 export const aztecSimulateTxSerializer = new AztecSimulateTxSerializer();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/serializers/transaction.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VyaWFsaXplcnMvdHJhbnNhY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3ZELE9BQU8sRUFDTCxzQkFBc0IsRUFDdEIsUUFBUSxFQUNSLGtCQUFrQixFQUNsQixnQkFBZ0IsRUFDaEIsTUFBTSxHQUNQLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbEYsT0FBTyxFQUFFLDZCQUE2QixFQUFFLCtCQUErQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFeEcsT0FBTyxFQUFFLG1CQUFtQixFQUFFLGFBQWEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWhGOzs7R0FHRztBQUNILE1BQU0sT0FBTyx1Q0FBdUM7SUFBcEQ7UUFPRSxXQUFNLEdBQUc7WUFDUCxTQUFTLEVBQUUsQ0FDVCxNQUFjLEVBQ2QsS0FBdUUsRUFDaEQsRUFBRTtnQkFDekIsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQztnQkFDdkIsT0FBTztvQkFDTCxNQUFNO29CQUNOLFVBQVUsRUFBRSw2QkFBNkIsQ0FBQyxJQUFJLENBQUM7aUJBQ2hELENBQUM7WUFDSixDQUFDO1lBQ0QsV0FBVyxFQUFFLENBQ1gsT0FBZSxFQUNmLElBQTJCLEVBQ3VDLEVBQUU7Z0JBQ3BFLE1BQU0sSUFBSSxHQUFHLCtCQUErQixDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDOUQsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO1lBQ2xCLENBQUM7U0FDRixDQUFDO1FBRUYsV0FBTSxHQUFHO1lBQ1AsU0FBUyxFQUFFLENBQUMsTUFBYyxFQUFFLEtBQXlCLEVBQXlCLEVBQUU7Z0JB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

package/dist/types.d.ts

@@ -2,7 +2,7 @@ import type { AuthWitness, AztecAddress, ContractArtifact, ContractClassWithId,
 import type { IntentAction, IntentInnerHash } from '@aztec/aztec.js/utils';
 import type { ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
 import type { AbiDecoded } from '@aztec/foundation/abi';
-import type { InBlock, IncomingNotesFilter, EventMetadataDefinition, PrivateExecutionResult, TxEffect, TxProvingResult, UniqueNote, GetUnencryptedLogsResponse, PXEInfo, TxSimulationResult } from '@aztec/circuit-types';
+import type { InBlock, NotesFilter, EventMetadataDefinition, PrivateExecutionResult, TxEffect, TxProvingResult, UniqueNote, PXEInfo, TxSimulationResult, GetPublicLogsResponse, GetContractClassLogsResponse } from '@aztec/circuit-types';
 import type { GasFees, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import type { JSONRPCEventMap, JSONRPCMiddleware } from '@walletmesh/jsonrpc';
 import type { JSONRPCWalletClient, WalletMethodMap } from '@walletmesh/router';
@@ -265,7 +265,7 @@ export interface AztecWalletMethodMap extends AztecWalletBaseMethodMap {
     aztec_registerContract: {
         params: {
             instance: ContractInstanceWithAddress;
-            artifact?: ContractArtifact;
+            artifact?: ContractArtifact | undefined;
         };
         result: boolean;
     };
@@ -338,9 +338,9 @@ export interface AztecWalletMethodMap extends AztecWalletBaseMethodMap {
         };
         result: AbiDecoded;
     };
-    aztec_getIncomingNotes: {
+    aztec_getNotes: {
         params: {
-            filter: IncomingNotesFilter;
+            filter: NotesFilter;
         };
         result: UniqueNote[];
     };
@@ -356,19 +356,19 @@ export interface AztecWalletMethodMap extends AztecWalletBaseMethodMap {
         };
         result: boolean;
     };
-    aztec_getUnencryptedLogs: {
+    aztec_getPublicLogs: {
         params: {
             filter: LogFilter;
         };
-        result: GetUnencryptedLogsResponse;
+        result: GetPublicLogsResponse;
     };
     aztec_getContractClassLogs: {
         params: {
             filter: LogFilter;
         };
-        result: GetUnencryptedLogsResponse;
+        result: GetContractClassLogsResponse;
     };
-    aztec_getEncryptedEvents: {
+    aztec_getPrivateEvents: {
         params: {
             event: EventMetadataDefinition;
             from: number;
@@ -377,7 +377,7 @@ export interface AztecWalletMethodMap extends AztecWalletBaseMethodMap {
         };
         result: unknown[];
     };
-    aztec_getUnencryptedEvents: {
+    aztec_getPublicEvents: {
         params: {
             event: EventMetadataDefinition;
             from: number;

package/dist/types.d.ts.map

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

package/dist/types.js

@@ -5,4 +5,4 @@ export const BASE_WALLET_METHODS = [
     'aztec_sendTransaction',
     'aztec_simulateTransaction',
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBa0VBLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUF1QztJQUNyRSx3QkFBd0I7SUFDeEIsZUFBZTtJQUNmLGtCQUFrQjtJQUNsQix1QkFBdUI7SUFDdkIsMkJBQTJCO0NBQ25CLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBbUVBLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUF1QztJQUNyRSx3QkFBd0I7SUFDeEIsZUFBZTtJQUNmLGtCQUFrQjtJQUNsQix1QkFBdUI7SUFDdkIsMkJBQTJCO0NBQ25CLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walletmesh/aztec-rpc-wallet",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -10,9 +10,9 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/WalletMesh/aztec.git"
+    "url": "git+https://github.com/WalletMesh/walletmesh-packages.git"
   },
-  "homepage": "https://github.com/WalletMesh/aztec/tree/main/packages/aztec-rpc-wallet#readme",
+  "homepage": "https://github.com/WalletMesh/walletmesh-packages/tree/main/aztec/aztec-rpc-wallet#readme",
   "keywords": [],
   "author": "",
   "license": "Apache-2.0",
@@ -21,12 +21,12 @@
     "typedoc-plugin-markdown": "^4.3.1"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.68.2",
-    "@aztec/circuit-types": "0.68.2",
-    "@aztec/circuits.js": "^0.68.2",
-    "@aztec/foundation": "0.68.2",
-    "@walletmesh/jsonrpc": "0.2.2",
-    "@walletmesh/router": "0.2.7"
+    "@aztec/aztec.js": "0.72.1",
+    "@aztec/circuit-types": "0.72.1",
+    "@aztec/circuits.js": "0.72.1",
+    "@aztec/foundation": "0.72.1",
+    "@walletmesh/jsonrpc": "0.3.0",
+    "@walletmesh/router": "0.3.0"
   },
   "scripts": {
     "build": "tsc --build tsconfig.build.json",

package/src/aztecRemoteWallet.test.ts

@@ -9,9 +9,7 @@ import type {
   ExtendedNote,
   TxHash,
   L2Block,
-  NodeInfo,
   Point,
-  LogFilter,
   TxReceipt,
   Tx,
   CompleteAddress,
@@ -19,7 +17,6 @@ import type {
   AuthWitness,
 } from '@aztec/aztec.js';
 import type {
-  GetUnencryptedLogsResponse,
   PrivateExecutionResult,
   TxProvingResult,
   TxSimulationResult,
@@ -27,7 +24,7 @@ import type {
   TxEffect,
   EventMetadataDefinition,
   PXEInfo,
-  IncomingNotesFilter,
+  NotesFilter,
   UniqueNote,
 } from '@aztec/circuit-types';
 import { randomDeployedContract } from '@aztec/circuit-types';
@@ -197,16 +194,21 @@ describe('AztecRemoteWallet', () => {
   });
 
   describe('contract operations', () => {
-    const { instance, artifact } = randomDeployedContract();
-    const contractClass = getContractClassFromArtifact(artifact);
+    let mockContract: { instance: ContractInstanceWithAddress; artifact: ContractArtifact };
+    let contractClass: ContractClassWithId;
+
+    beforeEach(async () => {
+      mockContract = await randomDeployedContract();
+      contractClass = await getContractClassFromArtifact(mockContract.artifact);
+    });
 
     it('gets contract instance', async () => {
-      mockChainBuilder.execute.mockResolvedValueOnce(instance);
+      mockChainBuilder.execute.mockResolvedValueOnce(mockContract.instance);
 
-      const result = await wallet.getContractInstance(instance.address);
-      expect(result).toBe(instance);
+      const result = await wallet.getContractInstance(mockContract.instance.address);
+      expect(result).toBe(mockContract.instance);
       expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getContractInstance', {
-        address: instance.address,
+        address: mockContract.instance.address,
       });
     });
 
@@ -219,10 +221,10 @@ describe('AztecRemoteWallet', () => {
     });
 
     it('gets contract artifact', async () => {
-      mockChainBuilder.execute.mockResolvedValueOnce(artifact);
+      mockChainBuilder.execute.mockResolvedValueOnce(mockContract.artifact);
 
       const result = await wallet.getContractArtifact(contractClass.id);
-      expect(result).toBe(artifact);
+      expect(result).toBe(mockContract.artifact);
       expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getContractArtifact', {
         id: contractClass.id,
       });
@@ -230,23 +232,23 @@ describe('AztecRemoteWallet', () => {
 
     it('registers contract', async () => {
       mockChainBuilder.execute.mockResolvedValueOnce(true);
-      await wallet.registerContract({ instance: instance, artifact: artifact });
+      await wallet.registerContract({ instance: mockContract.instance, artifact: mockContract.artifact });
       expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_registerContract', {
-        instance,
-        artifact,
+        instance: mockContract.instance,
+        artifact: mockContract.artifact,
       });
     });
 
     it('registers contract class', async () => {
       mockChainBuilder.execute.mockResolvedValueOnce(true);
-      await wallet.registerContractClass(artifact);
+      await wallet.registerContractClass(mockContract.artifact);
       expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_registerContractClass', {
-        artifact: artifact,
+        artifact: mockContract.artifact,
       });
     });
 
     it('gets contracts', async () => {
-      const mockContracts = [instance.address];
+      const mockContracts = [mockContract.instance.address];
       mockChainBuilder.execute.mockResolvedValueOnce(mockContracts);
 
       const result = await wallet.getContracts();
@@ -292,8 +294,7 @@ describe('AztecRemoteWallet', () => {
       const mockScopes = [mockAddress];
       mockChainBuilder.execute.mockResolvedValueOnce(mockScopes).mockResolvedValueOnce(mockSimulationResult);
 
-      const result = await wallet.simulateTx(mockTxRequest, true);
-      expect(result).toBe(mockSimulationResult);
+      await wallet.simulateTx(mockTxRequest, true);
       expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_simulateTx', {
         txRequest: mockTxRequest,
         simulatePublic: true,
@@ -436,7 +437,7 @@ describe('AztecRemoteWallet', () => {
 
   describe('note operations', () => {
     const mockNote = {} as ExtendedNote;
-    const mockFilter = {} as IncomingNotesFilter;
+    const mockFilter = {} as NotesFilter;
 
     it('adds note', async () => {
       mockChainBuilder.execute.mockResolvedValueOnce(true);
@@ -450,12 +451,12 @@ describe('AztecRemoteWallet', () => {
       expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_addNullifiedNote', { note: mockNote });
     });
 
-    it('gets incoming notes', async () => {
+    it('gets notes', async () => {
       const mockNotes = [{}] as UniqueNote[];
       mockChainBuilder.execute.mockResolvedValueOnce(mockNotes);
-      const result = await wallet.getIncomingNotes(mockFilter);
+      const result = await wallet.getNotes(mockFilter);
       expect(result).toBe(mockNotes);
-      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getIncomingNotes', { filter: mockFilter });
+      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getNotes', { filter: mockFilter });
     });
   });
 
@@ -468,7 +469,7 @@ describe('AztecRemoteWallet', () => {
     const mockVpks = [{}] as Point[];
     const mockCompleteAddress = { publicKeys: { masterIncomingViewingPublicKey: {} } } as CompleteAddress;
 
-    it('gets encrypted events with default vpks', async () => {
+    it('gets private events with default vpks', async () => {
       const mockEvents = [{ data: '0x1234' }];
       mockChainBuilder.execute.mockResolvedValueOnce(mockCompleteAddress).mockResolvedValueOnce(mockEvents);
 
@@ -482,9 +483,9 @@ describe('AztecRemoteWallet', () => {
       // Wait for promise to resolve
       await new Promise(process.nextTick);
 
-      const result = await wallet.getEncryptedEvents(mockEvent, 0, 10);
+      const result = await wallet.getPrivateEvents(mockEvent, 0, 10);
       expect(result).toBe(mockEvents);
-      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getEncryptedEvents', {
+      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getPrivateEvents', {
         event: mockEvent,
         from: 0,
         limit: 10,
@@ -492,7 +493,7 @@ describe('AztecRemoteWallet', () => {
       });
     });
 
-    it('gets encrypted events with custom vpks', async () => {
+    it('gets private events with custom vpks', async () => {
       const mockEvents = [{ data: '0x1234' }];
       mockChainBuilder.execute.mockResolvedValueOnce(mockCompleteAddress).mockResolvedValueOnce(mockEvents);
 
@@ -506,9 +507,9 @@ describe('AztecRemoteWallet', () => {
       // Wait for promise to resolve
       await new Promise(process.nextTick);
 
-      const result = await wallet.getEncryptedEvents(mockEvent, 0, 10, mockVpks);
+      const result = await wallet.getPrivateEvents(mockEvent, 0, 10, mockVpks);
       expect(result).toBe(mockEvents);
-      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getEncryptedEvents', {
+      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getPrivateEvents', {
         event: mockEvent,
         from: 0,
         limit: 10,
@@ -516,12 +517,12 @@ describe('AztecRemoteWallet', () => {
       });
     });
 
-    it('gets unencrypted events', async () => {
+    it('gets public events', async () => {
       const mockEvents = [{ data: '0x1234' }];
       mockChainBuilder.execute.mockResolvedValueOnce(mockEvents);
-      const result = await wallet.getUnencryptedEvents(mockEvent, 0, 10);
+      const result = await wallet.getPublicEvents(mockEvent, 0, 10);
       expect(result).toBe(mockEvents);
-      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getUnencryptedEvents', {
+      expect(mockChainBuilder.call).toHaveBeenCalledWith('aztec_getPublicEvents', {
         event: mockEvent,
         from: 0,
         limit: 10,