@walletmesh/aztec-rpc-wallet 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/README.md +290 -228
- package/dist/.tsbuildinfo +1 -1
- package/dist/client/aztec-dapp-wallet.d.ts +401 -0
- package/dist/client/aztec-dapp-wallet.d.ts.map +1 -0
- package/dist/client/aztec-dapp-wallet.js +705 -0
- package/dist/client/aztec-router-provider.d.ts +58 -0
- package/dist/client/aztec-router-provider.d.ts.map +1 -0
- package/dist/client/aztec-router-provider.js +62 -0
- package/dist/client/helpers.d.ts +44 -0
- package/dist/client/helpers.d.ts.map +1 -0
- package/dist/client/helpers.js +79 -0
- package/dist/client/register-serializers.d.ts +41 -0
- package/dist/client/register-serializers.d.ts.map +1 -0
- package/dist/client/register-serializers.js +97 -0
- package/dist/contractArtifactCache.d.ts +49 -32
- package/dist/contractArtifactCache.d.ts.map +1 -1
- package/dist/contractArtifactCache.js +47 -34
- package/dist/errors.d.ts +50 -8
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +50 -10
- package/dist/index.d.ts +53 -40
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +52 -17
- package/dist/types.d.ts +345 -268
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +10 -8
- package/dist/wallet/create-node.d.ts +73 -0
- package/dist/wallet/create-node.d.ts.map +1 -0
- package/dist/wallet/create-node.js +99 -0
- package/dist/wallet/handlers/account.d.ts +67 -0
- package/dist/wallet/handlers/account.d.ts.map +1 -0
- package/dist/wallet/handlers/account.js +85 -0
- package/dist/wallet/handlers/contract-interaction.d.ts +77 -0
- package/dist/wallet/handlers/contract-interaction.d.ts.map +1 -0
- package/dist/wallet/handlers/contract-interaction.js +219 -0
- package/dist/wallet/handlers/contract.d.ts +96 -0
- package/dist/wallet/handlers/contract.d.ts.map +1 -0
- package/dist/wallet/handlers/contract.js +146 -0
- package/dist/wallet/handlers/event.d.ts +62 -0
- package/dist/wallet/handlers/event.d.ts.map +1 -0
- package/dist/wallet/handlers/event.js +85 -0
- package/dist/wallet/handlers/index.d.ts +88 -0
- package/dist/wallet/handlers/index.d.ts.map +1 -0
- package/dist/wallet/handlers/index.js +47 -0
- package/dist/wallet/handlers/node.d.ts +117 -0
- package/dist/wallet/handlers/node.d.ts.map +1 -0
- package/dist/wallet/handlers/node.js +196 -0
- package/dist/wallet/handlers/senders.d.ts +70 -0
- package/dist/wallet/handlers/senders.d.ts.map +1 -0
- package/dist/wallet/handlers/senders.js +92 -0
- package/dist/wallet/handlers/transaction.d.ts +123 -0
- package/dist/wallet/handlers/transaction.d.ts.map +1 -0
- package/dist/wallet/handlers/transaction.js +191 -0
- package/dist/wallet/serializers.d.ts +75 -0
- package/dist/wallet/serializers.d.ts.map +1 -0
- package/dist/wallet/serializers.js +501 -0
- package/docs/README.md +290 -229
- package/docs/classes/AztecDappWallet.md +1304 -0
- package/docs/classes/AztecRouterProvider.md +1058 -0
- package/docs/classes/AztecWalletError.md +124 -47
- package/docs/classes/ContractArtifactCache.md +48 -31
- package/docs/functions/connectAztec.md +62 -0
- package/docs/functions/createAztecWallet.md +46 -0
- package/docs/functions/createAztecWalletNode.md +96 -0
- package/docs/functions/registerAztecSerializers.md +61 -0
- package/docs/functions/registerWalletAztecSerializers.md +39 -0
- package/docs/globals.md +16 -14
- package/docs/interfaces/AztecHandlerContext.md +54 -0
- package/docs/interfaces/AztecWalletContext.md +50 -0
- package/docs/interfaces/AztecWalletMethodMap.md +471 -470
- package/docs/type-aliases/AztecChainId.md +16 -3
- package/docs/variables/ALL_AZTEC_METHODS.md +20 -0
- package/docs/variables/AztecWalletErrorMap.md +9 -4
- package/docs/variables/AztecWalletSerializer.md +45 -0
- package/package.json +9 -9
- package/src/client/aztec-dapp-wallet.test.ts +628 -0
- package/src/client/aztec-dapp-wallet.ts +879 -0
- package/src/client/aztec-router-provider.test.ts +235 -0
- package/src/client/aztec-router-provider.ts +64 -0
- package/src/client/helpers.test.ts +187 -0
- package/src/client/helpers.ts +91 -0
- package/src/client/register-serializers.ts +108 -0
- package/src/contractArtifactCache.test.ts +21 -10
- package/src/contractArtifactCache.ts +54 -35
- package/src/errors.ts +58 -10
- package/src/index.test.ts +2 -6
- package/src/index.ts +73 -37
- package/src/types.ts +379 -217
- package/src/wallet/create-node.test.ts +332 -0
- package/src/wallet/create-node.ts +120 -0
- package/src/wallet/handlers/account.test.ts +172 -0
- package/src/wallet/handlers/account.ts +99 -0
- package/src/wallet/handlers/contract-interaction.test.ts +248 -0
- package/src/wallet/handlers/contract-interaction.ts +269 -0
- package/src/wallet/handlers/contract.test.ts +245 -0
- package/src/wallet/handlers/contract.ts +174 -0
- package/src/wallet/handlers/event.test.ts +216 -0
- package/src/wallet/handlers/event.ts +99 -0
- package/src/wallet/handlers/index.ts +84 -0
- package/src/wallet/handlers/node.test.ts +304 -0
- package/src/wallet/handlers/node.ts +230 -0
- package/src/wallet/handlers/senders.test.ts +172 -0
- package/src/wallet/handlers/senders.ts +106 -0
- package/src/wallet/handlers/transaction.test.ts +371 -0
- package/src/wallet/handlers/transaction.ts +239 -0
- package/src/wallet/serializers.test.ts +253 -0
- package/src/wallet/serializers.ts +586 -0
- package/typedoc.json +23 -1
- package/dist/aztecRemoteWallet.d.ts +0 -70
- package/dist/aztecRemoteWallet.d.ts.map +0 -1
- package/dist/aztecRemoteWallet.js +0 -335
- package/dist/chainProvider.d.ts +0 -56
- package/dist/chainProvider.d.ts.map +0 -1
- package/dist/chainProvider.js +0 -98
- package/dist/handlers/aztecAccountWallet.d.ts +0 -4
- package/dist/handlers/aztecAccountWallet.d.ts.map +0 -1
- package/dist/handlers/aztecAccountWallet.js +0 -296
- package/dist/handlers/transactions.d.ts +0 -21
- package/dist/handlers/transactions.d.ts.map +0 -1
- package/dist/handlers/transactions.js +0 -98
- package/dist/handlers.d.ts +0 -27
- package/dist/handlers.d.ts.map +0 -1
- package/dist/handlers.js +0 -55
- package/dist/provider.d.ts +0 -105
- package/dist/provider.d.ts.map +0 -1
- package/dist/provider.js +0 -160
- package/dist/serializers/account.d.ts +0 -164
- package/dist/serializers/account.d.ts.map +0 -1
- package/dist/serializers/account.js +0 -244
- package/dist/serializers/contract.d.ts +0 -62
- package/dist/serializers/contract.d.ts.map +0 -1
- package/dist/serializers/contract.js +0 -130
- package/dist/serializers/index.d.ts +0 -21
- package/dist/serializers/index.d.ts.map +0 -1
- package/dist/serializers/index.js +0 -154
- package/dist/serializers/log.d.ts +0 -66
- package/dist/serializers/log.d.ts.map +0 -1
- package/dist/serializers/log.js +0 -222
- package/dist/serializers/note.d.ts +0 -124
- package/dist/serializers/note.d.ts.map +0 -1
- package/dist/serializers/note.js +0 -208
- package/dist/serializers/transaction.d.ts +0 -99
- package/dist/serializers/transaction.d.ts.map +0 -1
- package/dist/serializers/transaction.js +0 -275
- package/dist/wallet.d.ts +0 -62
- package/dist/wallet.d.ts.map +0 -1
- package/dist/wallet.js +0 -77
- package/docs/classes/AztecChainProvider.md +0 -553
- package/docs/classes/AztecChainWallet.md +0 -409
- package/docs/classes/AztecProvider.md +0 -1112
- package/docs/interfaces/AztecWalletBaseMethodMap.md +0 -135
- package/docs/interfaces/AztecWalletEventMap.md +0 -17
- package/docs/type-aliases/AztecChainWalletMiddleware.md +0 -13
- package/docs/type-aliases/AztecWalletContext.md +0 -29
- package/docs/type-aliases/AztecWalletMethodHandler.md +0 -37
- package/docs/type-aliases/AztecWalletMiddleware.md +0 -13
- package/docs/type-aliases/AztecWalletRouterClient.md +0 -13
- package/docs/type-aliases/TransactionFunctionCall.md +0 -33
- package/docs/type-aliases/TransactionParams.md +0 -27
- package/src/aztecRemoteWallet.test.ts +0 -504
- package/src/aztecRemoteWallet.ts +0 -467
- package/src/chainProvider.test.ts +0 -401
- package/src/chainProvider.ts +0 -116
- package/src/handlers/aztecAccountWallet.test.ts +0 -649
- package/src/handlers/aztecAccountWallet.ts +0 -532
- package/src/handlers/transactions.ts +0 -124
- package/src/handlers.test.ts +0 -270
- package/src/handlers.ts +0 -70
- package/src/provider.test.ts +0 -274
- package/src/provider.ts +0 -189
- package/src/serializers/account.test.ts +0 -125
- package/src/serializers/account.ts +0 -301
- package/src/serializers/contract.test.ts +0 -24
- package/src/serializers/contract.ts +0 -183
- package/src/serializers/index.test.ts +0 -136
- package/src/serializers/index.ts +0 -191
- package/src/serializers/log.test.ts +0 -286
- package/src/serializers/log.ts +0 -292
- package/src/serializers/note.test.ts +0 -125
- package/src/serializers/note.ts +0 -250
- package/src/serializers/transaction.test.ts +0 -320
- package/src/serializers/transaction.ts +0 -409
- package/src/wallet.test.ts +0 -275
- package/src/wallet.ts +0 -94
@@ -0,0 +1,501 @@
|
|
1
|
+
/**
|
2
|
+
* @module @walletmesh/aztec-rpc-wallet/wallet/serializers
|
3
|
+
*
|
4
|
+
* This module provides the primary JSON-RPC serializer (`AztecWalletSerializer`)
|
5
|
+
* for handling Aztec-specific data types over JSON-RPC. It leverages Zod schemas
|
6
|
+
* from `@aztec/foundation/schemas` and `@aztec/aztec.js` for robust serialization
|
7
|
+
* and deserialization of parameters and results for all Aztec wallet methods.
|
8
|
+
*
|
9
|
+
* It also includes a helper function `registerAztecSerializers` for applying these
|
10
|
+
* serializers to a `JSONRPCNode` instance, typically used on the wallet-side
|
11
|
+
* implementation (e.g., in `createAztecWalletNode`).
|
12
|
+
*
|
13
|
+
* The serialization strategy involves:
|
14
|
+
* - Using Aztec's `jsonStringify` and `jsonParseWithSchema` for types that have
|
15
|
+
* corresponding Zod schemas.
|
16
|
+
* - Custom logic for arrays of specific types (e.g., `AztecAddress[]`).
|
17
|
+
* - A fallback serializer for parameters and results not explicitly covered.
|
18
|
+
* - Detailed parameter deserialization logic within `AztecWalletSerializer.params.deserialize`
|
19
|
+
* to reconstruct complex Aztec objects from their JSON representations.
|
20
|
+
*/
|
21
|
+
import { JSONRPCError } from '@walletmesh/jsonrpc';
|
22
|
+
import { AztecAddress, CompleteAddress, TxExecutionRequest, Fr, Tx, TxHash, AuthWitness, } from '@aztec/aztec.js';
|
23
|
+
import { AbiTypeSchema, ContractArtifactSchema, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
|
24
|
+
import { schemas } from '@aztec/stdlib/schemas';
|
25
|
+
import { ContractClassWithIdSchema, ContractInstanceWithAddressSchema, NodeInfoSchema, ProtocolContractAddressesSchema, } from '@aztec/stdlib/contract';
|
26
|
+
import { GasFees } from '@aztec/stdlib/gas';
|
27
|
+
import { L2Block } from '@aztec/stdlib/block';
|
28
|
+
import { Capsule, HashedValues, PrivateExecutionResult, TxProfileResult, TxProvingResult, TxReceipt, TxSimulationResult, UtilitySimulationResult, } from '@aztec/stdlib/tx';
|
29
|
+
import { jsonStringify, jsonParseWithSchema } from '@aztec/foundation/json-rpc';
|
30
|
+
import { createLogger } from '@aztec/foundation/log';
|
31
|
+
import { z } from 'zod';
|
32
|
+
// These aren't exported by @aztec/stdlib/interfaces/client, we've copied them here
|
33
|
+
const ContractMetadataSchema = z.object({
|
34
|
+
contractInstance: z.union([ContractInstanceWithAddressSchema, z.undefined()]),
|
35
|
+
isContractInitialized: z.boolean(),
|
36
|
+
isContractPubliclyDeployed: z.boolean(),
|
37
|
+
});
|
38
|
+
const ContractClassMetadataSchema = z.object({
|
39
|
+
contractClass: z.union([ContractClassWithIdSchema, z.undefined()]),
|
40
|
+
isContractClassPubliclyRegistered: z.boolean(),
|
41
|
+
artifact: z.union([ContractArtifactSchema, z.undefined()]),
|
42
|
+
});
|
43
|
+
const PXEInfoSchema = z.object({
|
44
|
+
pxeVersion: z.string(),
|
45
|
+
protocolContractAddresses: ProtocolContractAddressesSchema,
|
46
|
+
});
|
47
|
+
const EventMetadataDefinitionSchema = z.object({
|
48
|
+
eventSelector: schemas.EventSelector,
|
49
|
+
abiType: AbiTypeSchema,
|
50
|
+
fieldNames: z.array(z.string()),
|
51
|
+
});
|
52
|
+
// Schema for FunctionCall (since it doesn't have one in the Aztec codebase)
|
53
|
+
const FunctionCallSchema = z.object({
|
54
|
+
name: z.string(),
|
55
|
+
to: schemas.AztecAddress,
|
56
|
+
selector: FunctionSelector.schema,
|
57
|
+
type: z.nativeEnum(FunctionType),
|
58
|
+
isStatic: z.boolean(),
|
59
|
+
args: z.array(schemas.Fr),
|
60
|
+
returnTypes: z.array(AbiTypeSchema),
|
61
|
+
});
|
62
|
+
// Schema for ExecutionPayload
|
63
|
+
const ExecutionPayloadSchema = z.object({
|
64
|
+
calls: z.array(FunctionCallSchema),
|
65
|
+
authWitnesses: z.array(AuthWitness.schema),
|
66
|
+
capsules: z.array(Capsule.schema),
|
67
|
+
extraHashedArgs: z.array(HashedValues.schema).default([]),
|
68
|
+
});
|
69
|
+
// Schema for DeployContractParams
|
70
|
+
const DeployContractParamsSchema = z.object({
|
71
|
+
artifact: ContractArtifactSchema,
|
72
|
+
args: z.array(z.any()),
|
73
|
+
constructorName: z.string().optional(),
|
74
|
+
});
|
75
|
+
const DeployContractResultSchema = z.object({
|
76
|
+
txHash: TxHash.schema,
|
77
|
+
contractAddress: AztecAddress.schema,
|
78
|
+
});
|
79
|
+
const logger = createLogger('aztec-rpc-wallet:serializers');
|
80
|
+
function createResultSerializer(resultSchema) {
|
81
|
+
return {
|
82
|
+
result: {
|
83
|
+
serialize: async (method, value) => ({ method, serialized: jsonStringify(value) }),
|
84
|
+
deserialize: async (method, data) => {
|
85
|
+
if (resultSchema) {
|
86
|
+
return await jsonParseWithSchema(data.serialized, resultSchema);
|
87
|
+
}
|
88
|
+
// If no schema is provided, parse as JSON
|
89
|
+
logger.debug(`Deserializing result for method without schema: ${method}`);
|
90
|
+
return JSON.parse(data.serialized);
|
91
|
+
},
|
92
|
+
},
|
93
|
+
};
|
94
|
+
}
|
95
|
+
const RESULT_SERIALIZERS = {
|
96
|
+
aztec_getAddress: createResultSerializer(AztecAddress.schema),
|
97
|
+
aztec_getCompleteAddress: createResultSerializer(CompleteAddress.schema),
|
98
|
+
aztec_getChainId: createResultSerializer(Fr.schema),
|
99
|
+
aztec_getVersion: createResultSerializer(Fr.schema),
|
100
|
+
aztec_getBlockNumber: createResultSerializer(),
|
101
|
+
aztec_getProvenBlockNumber: createResultSerializer(),
|
102
|
+
aztec_getSenders: {
|
103
|
+
result: {
|
104
|
+
serialize: async (_m, v) => ({
|
105
|
+
method: _m,
|
106
|
+
serialized: jsonStringify(v.map((a) => a.toString())),
|
107
|
+
}),
|
108
|
+
deserialize: async (_m, d) => JSON.parse(d.serialized).map((s) => AztecAddress.fromString(s)),
|
109
|
+
},
|
110
|
+
},
|
111
|
+
aztec_getContracts: {
|
112
|
+
result: {
|
113
|
+
serialize: async (_m, v) => ({
|
114
|
+
method: _m,
|
115
|
+
serialized: jsonStringify(v.map((a) => a.toString())),
|
116
|
+
}),
|
117
|
+
deserialize: async (_m, d) => JSON.parse(d.serialized).map((s) => AztecAddress.fromString(s)),
|
118
|
+
},
|
119
|
+
},
|
120
|
+
aztec_registerSender: createResultSerializer(AztecAddress.schema),
|
121
|
+
aztec_removeSender: createResultSerializer(),
|
122
|
+
aztec_registerContract: createResultSerializer(),
|
123
|
+
aztec_registerContractClass: createResultSerializer(),
|
124
|
+
aztec_createAuthWit: createResultSerializer(AuthWitness.schema),
|
125
|
+
aztec_profileTx: createResultSerializer(TxProfileResult.schema),
|
126
|
+
aztec_simulateUtility: createResultSerializer(UtilitySimulationResult.schema),
|
127
|
+
aztec_proveTx: createResultSerializer(TxProvingResult.schema),
|
128
|
+
aztec_sendTx: createResultSerializer(TxHash.schema),
|
129
|
+
aztec_getTxReceipt: createResultSerializer(TxReceipt.schema),
|
130
|
+
aztec_simulateTx: createResultSerializer(TxSimulationResult.schema),
|
131
|
+
aztec_getNodeInfo: createResultSerializer(NodeInfoSchema),
|
132
|
+
aztec_getPXEInfo: createResultSerializer(PXEInfoSchema),
|
133
|
+
aztec_getCurrentBaseFees: createResultSerializer(GasFees.schema),
|
134
|
+
aztec_getBlock: createResultSerializer(L2Block.schema.optional()),
|
135
|
+
aztec_getContractMetadata: createResultSerializer(ContractMetadataSchema),
|
136
|
+
aztec_getContractClassMetadata: createResultSerializer(ContractClassMetadataSchema),
|
137
|
+
aztec_getPrivateEvents: {
|
138
|
+
result: {
|
139
|
+
serialize: async (m, v) => ({ method: m, serialized: jsonStringify(v) }),
|
140
|
+
deserialize: async (_, d) => JSON.parse(d.serialized),
|
141
|
+
},
|
142
|
+
},
|
143
|
+
aztec_getPublicEvents: {
|
144
|
+
result: {
|
145
|
+
serialize: async (m, v) => ({ method: m, serialized: jsonStringify(v) }),
|
146
|
+
deserialize: async (_, d) => JSON.parse(d.serialized),
|
147
|
+
},
|
148
|
+
},
|
149
|
+
aztec_wmExecuteTx: createResultSerializer(TxHash.schema),
|
150
|
+
aztec_wmSimulateTx: createResultSerializer(TxSimulationResult.schema),
|
151
|
+
aztec_wmDeployContract: createResultSerializer(DeployContractResultSchema),
|
152
|
+
wm_getSupportedMethods: {
|
153
|
+
result: {
|
154
|
+
serialize: async (m, v) => ({ method: m, serialized: jsonStringify(v) }),
|
155
|
+
deserialize: async (_, d) => JSON.parse(d.serialized),
|
156
|
+
},
|
157
|
+
},
|
158
|
+
};
|
159
|
+
async function createFallbackSerializer(method, value) {
|
160
|
+
try {
|
161
|
+
return { method, serialized: jsonStringify(value) };
|
162
|
+
}
|
163
|
+
catch (error) {
|
164
|
+
return {
|
165
|
+
method,
|
166
|
+
serialized: JSON.stringify({
|
167
|
+
error: 'Serialization failed',
|
168
|
+
message: error instanceof Error ? error.message : String(error),
|
169
|
+
}),
|
170
|
+
};
|
171
|
+
}
|
172
|
+
}
|
173
|
+
/**
|
174
|
+
* A comprehensive {@link JSONRPCSerializer} for all Aztec wallet methods.
|
175
|
+
*
|
176
|
+
* This serializer handles both parameters and results:
|
177
|
+
*
|
178
|
+
* **Parameters (`params`):**
|
179
|
+
* - `serialize`: Currently uses a fallback mechanism (`createFallbackSerializer`) which
|
180
|
+
* stringifies parameters using `jsonStringify`. This assumes the client-side
|
181
|
+
* (e.g., {@link AztecDappWallet} via {@link AztecRouterProvider}) sends parameters
|
182
|
+
* already in a format that can be processed by the `deserialize` logic after
|
183
|
+
* basic JSON parsing.
|
184
|
+
* - `deserialize`: Contains detailed, method-specific logic to parse the JSON string
|
185
|
+
* of incoming parameters and reconstruct them into their correct Aztec types
|
186
|
+
* (e.g., `AztecAddress.fromString`, `TxExecutionRequest.schema.parse`). It uses
|
187
|
+
* Zod schemas and helper functions (`ensureParam`, `getOptionalParam`) for
|
188
|
+
* validation and type conversion.
|
189
|
+
*
|
190
|
+
* **Results (`result`):**
|
191
|
+
* - `serialize`: For each method, it attempts to use a specific serializer defined in
|
192
|
+
* `RESULT_SERIALIZERS`. These typically use `jsonStringify` with a Zod schema
|
193
|
+
* for the specific result type (e.g., `AztecAddress.schema`, `TxHash.schema`).
|
194
|
+
* If no specific serializer is found, it uses `createFallbackSerializer`.
|
195
|
+
* - `deserialize`: Similar to result serialization, it uses `RESULT_SERIALIZERS`
|
196
|
+
* to find a method-specific deserializer, often employing `jsonParseWithSchema`
|
197
|
+
* with the appropriate Zod schema. If no specific deserializer exists, it may
|
198
|
+
* return the raw data or attempt a simple JSON parse.
|
199
|
+
*
|
200
|
+
* This serializer is crucial for ensuring that complex Aztec objects maintain their
|
201
|
+
* type integrity and structure when transmitted over JSON-RPC.
|
202
|
+
*
|
203
|
+
* @see {@link AztecWalletMethodMap} for the definitions of methods, params, and results.
|
204
|
+
* @see {@link JSONRPCSerializer} for the interface it implements.
|
205
|
+
*/
|
206
|
+
export const AztecWalletSerializer = {
|
207
|
+
params: {
|
208
|
+
serialize: async (method, value) => {
|
209
|
+
logger.debug(`Serializing params for method: ${method} (current fallback)`, value);
|
210
|
+
return createFallbackSerializer(method, value);
|
211
|
+
},
|
212
|
+
deserialize: async (method, data) => {
|
213
|
+
logger.debug(`Deserializing params for method: ${method}, data: ${data.serialized.substring(0, 100)}...`);
|
214
|
+
const dAppParams = JSON.parse(data.serialized);
|
215
|
+
// Helper function to validate types using string literals
|
216
|
+
const validateType = (val, expectedType) => {
|
217
|
+
switch (expectedType) {
|
218
|
+
case 'string':
|
219
|
+
return typeof val === 'string';
|
220
|
+
case 'number':
|
221
|
+
return typeof val === 'number';
|
222
|
+
case 'boolean':
|
223
|
+
return typeof val === 'boolean';
|
224
|
+
case 'object':
|
225
|
+
return typeof val === 'object';
|
226
|
+
case 'function':
|
227
|
+
return typeof val === 'function';
|
228
|
+
case 'undefined':
|
229
|
+
return typeof val === 'undefined';
|
230
|
+
default:
|
231
|
+
return true; // If unknown type is specified, don't validate
|
232
|
+
}
|
233
|
+
};
|
234
|
+
const ensureParam = (obj, key, type) => {
|
235
|
+
if (!(key in obj)) {
|
236
|
+
throw new JSONRPCError(-32602, `Invalid params for ${method}: Missing required parameter '${key}'.`);
|
237
|
+
}
|
238
|
+
const val = obj[key];
|
239
|
+
if (type && !validateType(val, type)) {
|
240
|
+
throw new JSONRPCError(-32602, `Invalid params for ${method}: Parameter '${key}' has wrong type. Expected ${type}, got ${typeof val}.`);
|
241
|
+
}
|
242
|
+
return val;
|
243
|
+
};
|
244
|
+
const getOptionalParam = (obj, key, type) => {
|
245
|
+
if (key in obj && obj[key] !== undefined) {
|
246
|
+
const val = obj[key];
|
247
|
+
if (type && !validateType(val, type)) {
|
248
|
+
throw new JSONRPCError(-32602, `Invalid params for ${method}: Parameter '${key}' has wrong type. Expected ${type}, got ${typeof val}.`);
|
249
|
+
}
|
250
|
+
return val;
|
251
|
+
}
|
252
|
+
return undefined;
|
253
|
+
};
|
254
|
+
switch (method) {
|
255
|
+
case 'aztec_getBlock': {
|
256
|
+
const blockNum = ensureParam(dAppParams, 'number', 'number');
|
257
|
+
return [blockNum];
|
258
|
+
}
|
259
|
+
case 'aztec_getBlockNumber':
|
260
|
+
case 'aztec_getChainId':
|
261
|
+
case 'aztec_getVersion':
|
262
|
+
case 'aztec_getNodeInfo':
|
263
|
+
case 'aztec_getProvenBlockNumber':
|
264
|
+
case 'aztec_getPXEInfo':
|
265
|
+
case 'aztec_getCurrentBaseFees':
|
266
|
+
case 'aztec_getAddress':
|
267
|
+
case 'aztec_getCompleteAddress':
|
268
|
+
case 'aztec_getSenders':
|
269
|
+
case 'aztec_getContracts':
|
270
|
+
return [];
|
271
|
+
case 'aztec_createAuthWit': {
|
272
|
+
const intentRaw = ensureParam(dAppParams, 'intent');
|
273
|
+
let intentInput;
|
274
|
+
if (typeof intentRaw === 'string' &&
|
275
|
+
(intentRaw.startsWith('0x') || !Number.isNaN(Number(intentRaw)))) {
|
276
|
+
intentInput = Fr.fromString(intentRaw);
|
277
|
+
}
|
278
|
+
else if (intentRaw instanceof Buffer) {
|
279
|
+
intentInput = intentRaw;
|
280
|
+
}
|
281
|
+
else if (typeof intentRaw === 'object' && intentRaw !== null) {
|
282
|
+
intentInput = intentRaw;
|
283
|
+
}
|
284
|
+
else {
|
285
|
+
throw new JSONRPCError(-32602, `Invalid 'intent' parameter type for ${method}.`);
|
286
|
+
}
|
287
|
+
return [intentInput];
|
288
|
+
}
|
289
|
+
case 'aztec_registerSender':
|
290
|
+
case 'aztec_removeSender': {
|
291
|
+
const senderStr = ensureParam(dAppParams, 'sender', 'string');
|
292
|
+
const sender = AztecAddress.fromString(senderStr);
|
293
|
+
return [sender];
|
294
|
+
}
|
295
|
+
case 'aztec_getContractMetadata': {
|
296
|
+
const addressStr = ensureParam(dAppParams, 'address', 'string');
|
297
|
+
const address = AztecAddress.fromString(addressStr);
|
298
|
+
return [address];
|
299
|
+
}
|
300
|
+
case 'aztec_getContractClassMetadata': {
|
301
|
+
const idStr = ensureParam(dAppParams, 'id', 'string');
|
302
|
+
const id = Fr.fromString(idStr);
|
303
|
+
const includeArtifact = getOptionalParam(dAppParams, 'includeArtifact', 'boolean');
|
304
|
+
return [id, includeArtifact];
|
305
|
+
}
|
306
|
+
case 'aztec_registerContract': {
|
307
|
+
const instanceRaw = ensureParam(dAppParams, 'instance');
|
308
|
+
const artifactRaw = getOptionalParam(dAppParams, 'artifact');
|
309
|
+
const instance = ContractInstanceWithAddressSchema.parse(instanceRaw);
|
310
|
+
const artifact = artifactRaw ? ContractArtifactSchema.parse(artifactRaw) : undefined;
|
311
|
+
return [instance, artifact];
|
312
|
+
}
|
313
|
+
case 'aztec_registerContractClass': {
|
314
|
+
const artifactRaw = ensureParam(dAppParams, 'artifact');
|
315
|
+
const artifact = ContractArtifactSchema.parse(artifactRaw);
|
316
|
+
return [artifact];
|
317
|
+
}
|
318
|
+
case 'aztec_proveTx': {
|
319
|
+
const txRequestRaw = ensureParam(dAppParams, 'txRequest');
|
320
|
+
// Ensure txRequestRaw is a valid TxExecutionRequest
|
321
|
+
// Use getOptionalParam for privateExecutionResult
|
322
|
+
const privateExecutionResultRaw = getOptionalParam(dAppParams, 'privateExecutionResult');
|
323
|
+
const txRequest = TxExecutionRequest.schema.parse(txRequestRaw);
|
324
|
+
// Conditionally parse if privateExecutionResultRaw is present
|
325
|
+
const privateExecutionResult = privateExecutionResultRaw
|
326
|
+
? PrivateExecutionResult.schema.parse(privateExecutionResultRaw)
|
327
|
+
: undefined;
|
328
|
+
return [txRequest, privateExecutionResult];
|
329
|
+
}
|
330
|
+
case 'aztec_sendTx': {
|
331
|
+
const txRaw = ensureParam(dAppParams, 'tx');
|
332
|
+
const tx = Tx.schema.parse(txRaw);
|
333
|
+
return [tx];
|
334
|
+
}
|
335
|
+
case 'aztec_getTxReceipt': {
|
336
|
+
const txHashStr = ensureParam(dAppParams, 'txHash', 'string');
|
337
|
+
const txHash = TxHash.fromString(txHashStr);
|
338
|
+
return [txHash];
|
339
|
+
}
|
340
|
+
case 'aztec_simulateTx': {
|
341
|
+
const txRequestRaw = ensureParam(dAppParams, 'txRequest');
|
342
|
+
const txRequest = TxExecutionRequest.schema.parse(txRequestRaw);
|
343
|
+
const simulatePublic = getOptionalParam(dAppParams, 'simulatePublic', 'boolean');
|
344
|
+
const msgSenderStr = getOptionalParam(dAppParams, 'msgSender', 'string');
|
345
|
+
const msgSender = msgSenderStr ? AztecAddress.fromString(msgSenderStr) : undefined;
|
346
|
+
const skipTxValidation = getOptionalParam(dAppParams, 'skipTxValidation', 'boolean');
|
347
|
+
const skipFeeEnforcement = getOptionalParam(dAppParams, 'skipFeeEnforcement', 'boolean');
|
348
|
+
const scopesRaw = getOptionalParam(dAppParams, 'scopes');
|
349
|
+
const scopes = scopesRaw?.map((s) => AztecAddress.fromString(s));
|
350
|
+
return [txRequest, simulatePublic, msgSender, skipTxValidation, skipFeeEnforcement, scopes];
|
351
|
+
}
|
352
|
+
case 'aztec_profileTx': {
|
353
|
+
const txRequestRaw = ensureParam(dAppParams, 'txRequest');
|
354
|
+
const txRequest = TxExecutionRequest.schema.parse(txRequestRaw);
|
355
|
+
const profileMode = getOptionalParam(dAppParams, 'profileMode', 'string');
|
356
|
+
const skipProofGeneration = getOptionalParam(dAppParams, 'skipProofGeneration', 'boolean');
|
357
|
+
const msgSenderStr = getOptionalParam(dAppParams, 'msgSender', 'string');
|
358
|
+
const msgSender = msgSenderStr ? AztecAddress.fromString(msgSenderStr) : undefined;
|
359
|
+
return [txRequest, profileMode, skipProofGeneration, msgSender];
|
360
|
+
}
|
361
|
+
case 'aztec_simulateUtility': {
|
362
|
+
const functionName = ensureParam(dAppParams, 'functionName', 'string');
|
363
|
+
const args = ensureParam(dAppParams, 'args');
|
364
|
+
const toStr = ensureParam(dAppParams, 'to', 'string');
|
365
|
+
const to = AztecAddress.fromString(toStr);
|
366
|
+
const authWitsRaw = getOptionalParam(dAppParams, 'authWits');
|
367
|
+
const authWits = authWitsRaw?.map((aw) => AuthWitness.schema.parse(aw)); // Use AuthWitness from @aztec/aztec.js
|
368
|
+
const fromStr = getOptionalParam(dAppParams, 'from', 'string');
|
369
|
+
const from = fromStr ? AztecAddress.fromString(fromStr) : undefined;
|
370
|
+
return [functionName, args, to, authWits, from];
|
371
|
+
}
|
372
|
+
case 'aztec_getPrivateEvents': {
|
373
|
+
const contractAddressStr = ensureParam(dAppParams, 'contractAddress', 'string');
|
374
|
+
const contractAddress = AztecAddress.fromString(contractAddressStr);
|
375
|
+
const eventMetadataRaw = ensureParam(dAppParams, 'eventMetadata');
|
376
|
+
const eventMetadata = jsonParseWithSchema(eventMetadataRaw, EventMetadataDefinitionSchema);
|
377
|
+
const fromBlock = ensureParam(dAppParams, 'from', 'number');
|
378
|
+
const numBlocks = ensureParam(dAppParams, 'numBlocks', 'number');
|
379
|
+
const recipientsRaw = ensureParam(dAppParams, 'recipients');
|
380
|
+
const recipients = recipientsRaw.map((r) => AztecAddress.fromString(r));
|
381
|
+
return [contractAddress, eventMetadata, fromBlock, numBlocks, recipients];
|
382
|
+
}
|
383
|
+
case 'aztec_getPublicEvents': {
|
384
|
+
const eventMetadataRaw = ensureParam(dAppParams, 'eventMetadata');
|
385
|
+
const eventMetadata = jsonParseWithSchema(eventMetadataRaw, EventMetadataDefinitionSchema);
|
386
|
+
const fromBlock = ensureParam(dAppParams, 'from', 'number');
|
387
|
+
const limit = ensureParam(dAppParams, 'limit', 'number');
|
388
|
+
return [eventMetadata, fromBlock, limit];
|
389
|
+
}
|
390
|
+
case 'aztec_wmExecuteTx': {
|
391
|
+
const executionPayloadRaw = ensureParam(dAppParams, 'executionPayload');
|
392
|
+
const executionPayload = ExecutionPayloadSchema.parse(executionPayloadRaw);
|
393
|
+
return [executionPayload];
|
394
|
+
}
|
395
|
+
case 'aztec_wmSimulateTx': {
|
396
|
+
const executionPayloadRaw = ensureParam(dAppParams, 'executionPayload');
|
397
|
+
const executionPayload = ExecutionPayloadSchema.parse(executionPayloadRaw);
|
398
|
+
return [executionPayload];
|
399
|
+
}
|
400
|
+
case 'aztec_wmDeployContract': {
|
401
|
+
const deployParams = DeployContractParamsSchema.parse(dAppParams);
|
402
|
+
return [deployParams];
|
403
|
+
}
|
404
|
+
case 'wm_getSupportedMethods':
|
405
|
+
return [];
|
406
|
+
default:
|
407
|
+
logger.error(`Unhandled method in params.deserialize: ${method}`);
|
408
|
+
throw new JSONRPCError(-32601, `Method not found or not supported by serializer: ${method}`);
|
409
|
+
}
|
410
|
+
},
|
411
|
+
},
|
412
|
+
result: {
|
413
|
+
serialize: async (method, value) => {
|
414
|
+
const serializer = RESULT_SERIALIZERS[method];
|
415
|
+
if (serializer?.result) {
|
416
|
+
try {
|
417
|
+
const typedValue = value;
|
418
|
+
const serialized = await serializer.result.serialize(method, typedValue);
|
419
|
+
return serialized;
|
420
|
+
}
|
421
|
+
catch (error) {
|
422
|
+
logger.error(`Failed to serialize result for ${method}:`, error);
|
423
|
+
throw new Error(`Failed to serialize result for ${method}: ${error}`);
|
424
|
+
}
|
425
|
+
}
|
426
|
+
logger.debug(`Using fallback serializer for result of method: ${method}`);
|
427
|
+
return createFallbackSerializer(method, value);
|
428
|
+
},
|
429
|
+
deserialize: async (method, data) => {
|
430
|
+
const serializer = RESULT_SERIALIZERS[method];
|
431
|
+
if (serializer?.result) {
|
432
|
+
try {
|
433
|
+
return await serializer.result.deserialize(method, data);
|
434
|
+
}
|
435
|
+
catch (error) {
|
436
|
+
logger.error(`Failed to deserialize result for ${method}:`, error);
|
437
|
+
throw new Error(`Failed to deserialize result for ${method}: ${error}`);
|
438
|
+
}
|
439
|
+
}
|
440
|
+
logger.debug(`No specific deserializer found for result of method: ${method}, returning raw data`);
|
441
|
+
return data;
|
442
|
+
},
|
443
|
+
},
|
444
|
+
};
|
445
|
+
/**
|
446
|
+
* Registers the {@link AztecWalletSerializer} for all relevant Aztec JSON-RPC methods
|
447
|
+
* on a given {@link JSONRPCNode} instance.
|
448
|
+
*
|
449
|
+
* This function is typically called on the wallet-side (e.g., within
|
450
|
+
* `createAztecWalletNode`) to equip the node with the necessary serialization
|
451
|
+
* capabilities for handling Aztec methods.
|
452
|
+
*
|
453
|
+
* It iterates through a predefined list of Aztec methods and associates each
|
454
|
+
* with the `AztecWalletSerializer`.
|
455
|
+
*
|
456
|
+
* @param node - The {@link JSONRPCNode} instance on which to register the serializers.
|
457
|
+
* This node should be typed with {@link AztecWalletMethodMap}.
|
458
|
+
*
|
459
|
+
* @see {@link createAztecWalletNode} where this function is used.
|
460
|
+
* @see {@link AztecWalletSerializer} which provides the serialization logic.
|
461
|
+
*/
|
462
|
+
export function registerAztecSerializers(node) {
|
463
|
+
// This list should ideally cover all methods in AztecWalletMethodMap that require
|
464
|
+
// specific Aztec type serialization.
|
465
|
+
const aztecMethods = [
|
466
|
+
'aztec_getBlock',
|
467
|
+
'aztec_getBlockNumber',
|
468
|
+
'aztec_getChainId',
|
469
|
+
'aztec_getVersion',
|
470
|
+
'aztec_getNodeInfo',
|
471
|
+
'aztec_getProvenBlockNumber',
|
472
|
+
'aztec_getPXEInfo',
|
473
|
+
'aztec_getCurrentBaseFees',
|
474
|
+
'aztec_getAddress',
|
475
|
+
'aztec_getCompleteAddress',
|
476
|
+
'aztec_createAuthWit',
|
477
|
+
'aztec_registerSender',
|
478
|
+
'aztec_getSenders',
|
479
|
+
'aztec_removeSender',
|
480
|
+
'aztec_getContracts',
|
481
|
+
'aztec_getContractMetadata',
|
482
|
+
'aztec_getContractClassMetadata',
|
483
|
+
'aztec_registerContract',
|
484
|
+
'aztec_registerContractClass',
|
485
|
+
'aztec_proveTx',
|
486
|
+
'aztec_sendTx',
|
487
|
+
'aztec_getTxReceipt',
|
488
|
+
'aztec_simulateTx',
|
489
|
+
'aztec_profileTx',
|
490
|
+
'aztec_simulateUtility',
|
491
|
+
'aztec_getPrivateEvents',
|
492
|
+
'aztec_getPublicEvents',
|
493
|
+
'aztec_wmExecuteTx',
|
494
|
+
'aztec_wmDeployContract',
|
495
|
+
'wm_getSupportedMethods',
|
496
|
+
];
|
497
|
+
for (const method of aztecMethods) {
|
498
|
+
node.registerSerializer(method, AztecWalletSerializer);
|
499
|
+
}
|
500
|
+
}
|
501
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../../src/wallet/serializers.ts"],"names":[],"mappings":"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"}
|