@walletmesh/aztec-rpc-wallet 0.1.0 → 0.2.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 +18 -0
- package/README.md +4 -4
- package/dist/.tsbuildinfo +1 -1
- package/dist/aztecRemoteWallet.d.ts +7 -6
- package/dist/aztecRemoteWallet.d.ts.map +1 -1
- package/dist/aztecRemoteWallet.js +15 -10
- package/dist/chainProvider.d.ts.map +1 -1
- package/dist/chainProvider.js +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +1 -1
- package/dist/handlers/aztecAccountWallet.d.ts.map +1 -1
- package/dist/handlers/aztecAccountWallet.js +23 -23
- package/dist/handlers/transactions.d.ts.map +1 -1
- package/dist/handlers/transactions.js +11 -3
- package/dist/serializers/account.d.ts +19 -22
- package/dist/serializers/account.d.ts.map +1 -1
- package/dist/serializers/account.js +44 -45
- package/dist/serializers/contract.d.ts +11 -63
- package/dist/serializers/contract.d.ts.map +1 -1
- package/dist/serializers/contract.js +67 -153
- package/dist/serializers/index.d.ts +1 -4
- package/dist/serializers/index.d.ts.map +1 -1
- package/dist/serializers/index.js +12 -12
- package/dist/serializers/log.d.ts +38 -85
- package/dist/serializers/log.d.ts.map +1 -1
- package/dist/serializers/log.js +106 -115
- package/dist/serializers/note.d.ts +24 -27
- package/dist/serializers/note.d.ts.map +1 -1
- package/dist/serializers/note.js +67 -41
- package/dist/serializers/transaction-utils.d.ts +44 -100
- package/dist/serializers/transaction-utils.d.ts.map +1 -1
- package/dist/serializers/transaction-utils.js +89 -116
- package/dist/serializers/transaction.d.ts +15 -18
- package/dist/serializers/transaction.d.ts.map +1 -1
- package/dist/serializers/transaction.js +51 -62
- package/dist/types.d.ts +9 -9
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +1 -1
- package/package.json +9 -9
- package/src/aztecRemoteWallet.test.ts +34 -33
- package/src/aztecRemoteWallet.ts +25 -15
- package/src/chainProvider.ts +1 -7
- package/src/errors.ts +0 -1
- package/src/handlers/aztecAccountWallet.test.ts +78 -75
- package/src/handlers/aztecAccountWallet.ts +33 -36
- package/src/handlers/transactions.ts +16 -2
- package/src/serializers/account.test.ts +18 -17
- package/src/serializers/account.ts +46 -64
- package/src/serializers/contract.test.ts +14 -16
- package/src/serializers/contract.ts +77 -171
- package/src/serializers/index.test.ts +20 -8
- package/src/serializers/index.ts +16 -32
- package/src/serializers/log.test.ts +201 -28
- package/src/serializers/log.ts +162 -153
- package/src/serializers/note.test.ts +26 -28
- package/src/serializers/note.ts +71 -48
- package/src/serializers/transaction-utils.ts +147 -210
- package/src/serializers/transaction.test.ts +190 -30
- package/src/serializers/transaction.ts +62 -83
- package/src/types.ts +10 -9
- package/tsconfig.json +1 -1
- package/vitest.config.ts +1 -1
- package/dist/serializers/contract-utils.d.ts +0 -40
- package/dist/serializers/contract-utils.d.ts.map +0 -1
- package/dist/serializers/contract-utils.js +0 -102
- package/dist/serializers/core.d.ts +0 -110
- package/dist/serializers/core.d.ts.map +0 -1
- package/dist/serializers/core.js +0 -130
- package/dist/serializers/types.d.ts +0 -49
- package/dist/serializers/types.d.ts.map +0 -1
- package/dist/serializers/types.js +0 -22
- package/src/serializers/contract-utils.ts +0 -104
- package/src/serializers/core.test.ts +0 -56
- package/src/serializers/core.ts +0 -141
- package/src/serializers/types.ts +0 -58
package/src/aztecRemoteWallet.ts
CHANGED
@@ -23,16 +23,17 @@ import type { IntentAction, IntentInnerHash } from '@aztec/aztec.js/utils';
|
|
23
23
|
import type { ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
|
24
24
|
import type { AbiDecoded } from '@aztec/foundation/abi';
|
25
25
|
import type {
|
26
|
-
|
26
|
+
NotesFilter,
|
27
27
|
EventMetadataDefinition,
|
28
28
|
PrivateExecutionResult,
|
29
29
|
TxProvingResult,
|
30
30
|
UniqueNote,
|
31
|
-
GetUnencryptedLogsResponse,
|
32
31
|
PXEInfo,
|
33
32
|
TxSimulationResult,
|
34
33
|
InBlock,
|
35
34
|
TxEffect,
|
35
|
+
GetPublicLogsResponse,
|
36
|
+
GetContractClassLogsResponse,
|
36
37
|
} from '@aztec/circuit-types';
|
37
38
|
import type { GasFees, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
|
38
39
|
|
@@ -277,7 +278,6 @@ export class AztecRemoteWallet implements Wallet {
|
|
277
278
|
enforceFeePayment?: boolean,
|
278
279
|
profile?: boolean,
|
279
280
|
): Promise<TxSimulationResult> {
|
280
|
-
const scopes = await this.getScopesAsync();
|
281
281
|
return this._provider
|
282
282
|
.chain(this._providerChainId)
|
283
283
|
.call('aztec_simulateTx', {
|
@@ -311,11 +311,11 @@ export class AztecRemoteWallet implements Wallet {
|
|
311
311
|
.execute() as Promise<AztecWalletMethodMap['aztec_getTxReceipt']['result']>;
|
312
312
|
}
|
313
313
|
|
314
|
-
async
|
314
|
+
async getNotes(filter: NotesFilter): Promise<UniqueNote[]> {
|
315
315
|
return this._provider
|
316
316
|
.chain(this._providerChainId)
|
317
|
-
.call('
|
318
|
-
.execute() as Promise<AztecWalletMethodMap['
|
317
|
+
.call('aztec_getNotes', { filter })
|
318
|
+
.execute() as Promise<AztecWalletMethodMap['aztec_getNotes']['result']>;
|
319
319
|
}
|
320
320
|
|
321
321
|
async getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<Fr> {
|
@@ -366,18 +366,18 @@ export class AztecRemoteWallet implements Wallet {
|
|
366
366
|
.execute() as Promise<AztecWalletMethodMap['aztec_simulateUnconstrained']['result']>;
|
367
367
|
}
|
368
368
|
|
369
|
-
async
|
369
|
+
async getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
|
370
370
|
return this._provider
|
371
371
|
.chain(this._providerChainId)
|
372
|
-
.call('
|
373
|
-
.execute() as Promise<AztecWalletMethodMap['
|
372
|
+
.call('aztec_getPublicLogs', { filter })
|
373
|
+
.execute() as Promise<AztecWalletMethodMap['aztec_getPublicLogs']['result']>;
|
374
374
|
}
|
375
375
|
|
376
|
-
async getContractClassLogs(filter: LogFilter): Promise<
|
376
|
+
async getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
|
377
377
|
return this._provider
|
378
378
|
.chain(this._providerChainId)
|
379
379
|
.call('aztec_getContractClassLogs', { filter })
|
380
|
-
.execute() as Promise<
|
380
|
+
.execute() as Promise<GetContractClassLogsResponse>;
|
381
381
|
}
|
382
382
|
|
383
383
|
async getBlockNumber(): Promise<number> {
|
@@ -441,7 +441,7 @@ export class AztecRemoteWallet implements Wallet {
|
|
441
441
|
>;
|
442
442
|
}
|
443
443
|
|
444
|
-
|
444
|
+
getPrivateEvents<T>(
|
445
445
|
event: EventMetadataDefinition,
|
446
446
|
from: number,
|
447
447
|
limit: number,
|
@@ -450,7 +450,7 @@ export class AztecRemoteWallet implements Wallet {
|
|
450
450
|
const completeAddress = this.getCompleteAddress();
|
451
451
|
return this._provider
|
452
452
|
.chain(this._providerChainId)
|
453
|
-
.call('
|
453
|
+
.call('aztec_getPrivateEvents', {
|
454
454
|
event,
|
455
455
|
from,
|
456
456
|
limit,
|
@@ -459,10 +459,10 @@ export class AztecRemoteWallet implements Wallet {
|
|
459
459
|
.execute() as Promise<T[]>;
|
460
460
|
}
|
461
461
|
|
462
|
-
|
462
|
+
getPublicEvents<T>(event: EventMetadataDefinition, from: number, limit: number): Promise<T[]> {
|
463
463
|
return this._provider
|
464
464
|
.chain(this._providerChainId)
|
465
|
-
.call('
|
465
|
+
.call('aztec_getPublicEvents', { event, from, limit })
|
466
466
|
.execute() as Promise<T[]>;
|
467
467
|
}
|
468
468
|
|
@@ -476,6 +476,16 @@ export class AztecRemoteWallet implements Wallet {
|
|
476
476
|
.call('aztec_getL1ToL2MembershipWitness', { contractAddress, messageHash, secret })
|
477
477
|
.execute() as Promise<AztecWalletMethodMap['aztec_getL1ToL2MembershipWitness']['result']>;
|
478
478
|
}
|
479
|
+
|
480
|
+
async getL2ToL1MembershipWitness(
|
481
|
+
blockNumber: number,
|
482
|
+
l2Tol1Message: Fr,
|
483
|
+
): Promise<[bigint, SiblingPath<number>]> {
|
484
|
+
return this._provider
|
485
|
+
.chain(this._providerChainId)
|
486
|
+
.call('aztec_getL2ToL1MembershipWitness', { blockNumber, l2Tol1Message })
|
487
|
+
.execute() as Promise<[bigint, SiblingPath<number>]>;
|
488
|
+
}
|
479
489
|
}
|
480
490
|
|
481
491
|
export function createAztecRPCWallet(transport: JSONRPCTransport, chainId: AztecChainId): AztecRemoteWallet {
|
package/src/chainProvider.ts
CHANGED
@@ -1,12 +1,6 @@
|
|
1
1
|
import { JSONRPCNode } from '@walletmesh/jsonrpc';
|
2
|
-
import type { JSONRPCTransport } from '@walletmesh/jsonrpc';
|
3
2
|
import { AztecWalletError, AztecWalletErrorType } from './errors.js';
|
4
|
-
import type {
|
5
|
-
AztecChainId,
|
6
|
-
AztecWalletMethodMap,
|
7
|
-
TransactionParams,
|
8
|
-
TransactionFunctionCall,
|
9
|
-
} from './types.js';
|
3
|
+
import type { AztecWalletMethodMap, TransactionParams, TransactionFunctionCall } from './types.js';
|
10
4
|
import type { ContractInstanceWithAddress, ContractArtifact } from '@aztec/aztec.js';
|
11
5
|
|
12
6
|
/**
|
package/src/errors.ts
CHANGED
@@ -62,13 +62,13 @@ describe('Aztec Account Wallet Handler', () => {
|
|
62
62
|
getTxReceipt: vi.fn(),
|
63
63
|
simulateTx: vi.fn(),
|
64
64
|
simulateUnconstrained: vi.fn(),
|
65
|
-
|
65
|
+
getNotes: vi.fn(),
|
66
66
|
addNote: vi.fn(),
|
67
67
|
addNullifiedNote: vi.fn(),
|
68
|
-
|
68
|
+
getPublicLogs: vi.fn(),
|
69
69
|
getContractClassLogs: vi.fn(),
|
70
|
-
|
71
|
-
|
70
|
+
getPrivateEvents: vi.fn(),
|
71
|
+
getPublicEvents: vi.fn(),
|
72
72
|
getL1ToL2MembershipWitness: vi.fn(),
|
73
73
|
} as unknown as AccountWallet;
|
74
74
|
|
@@ -118,7 +118,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
118
118
|
|
119
119
|
describe('Scope Methods', () => {
|
120
120
|
it('handles aztec_setScopes', async () => {
|
121
|
-
const mockAddress = AztecAddress.random();
|
121
|
+
const mockAddress = await AztecAddress.random();
|
122
122
|
const scopes = [mockAddress];
|
123
123
|
wallet.setScopes = vi.fn().mockResolvedValue(undefined);
|
124
124
|
|
@@ -128,7 +128,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
128
128
|
});
|
129
129
|
|
130
130
|
it('handles aztec_getScopes', async () => {
|
131
|
-
const scopes = [AztecAddress.random(), AztecAddress.random()];
|
131
|
+
const scopes = [await AztecAddress.random(), await AztecAddress.random()];
|
132
132
|
wallet.getScopes = vi.fn().mockResolvedValue(scopes);
|
133
133
|
|
134
134
|
const result = await aztecWalletHandler(context, 'aztec_getScopes', {});
|
@@ -145,7 +145,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
145
145
|
|
146
146
|
describe('Account Methods', () => {
|
147
147
|
it('handles aztec_getAddress', async () => {
|
148
|
-
const mockAddress = AztecAddress.random();
|
148
|
+
const mockAddress = await AztecAddress.random();
|
149
149
|
wallet.getAddress = vi.fn().mockReturnValue(mockAddress);
|
150
150
|
|
151
151
|
const result = await aztecWalletHandler(context, 'aztec_getAddress', {});
|
@@ -154,8 +154,8 @@ describe('Aztec Account Wallet Handler', () => {
|
|
154
154
|
|
155
155
|
it('handles aztec_getCompleteAddress', async () => {
|
156
156
|
const mockAddress = {
|
157
|
-
address: AztecAddress.random(),
|
158
|
-
publicKey: AztecAddress.random(),
|
157
|
+
address: await AztecAddress.random(),
|
158
|
+
publicKey: await AztecAddress.random(),
|
159
159
|
};
|
160
160
|
wallet.getCompleteAddress = vi.fn().mockReturnValue(mockAddress);
|
161
161
|
|
@@ -194,7 +194,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
194
194
|
|
195
195
|
describe('L1->L2 Message Methods', () => {
|
196
196
|
it('handles aztec_isL1ToL2MessageSynced', async () => {
|
197
|
-
const mockMessage = Fr.random();
|
197
|
+
const mockMessage = await Fr.random();
|
198
198
|
wallet.isL1ToL2MessageSynced = vi.fn().mockResolvedValue(true);
|
199
199
|
|
200
200
|
const result = await aztecWalletHandler(context, 'aztec_isL1ToL2MessageSynced', {
|
@@ -205,9 +205,9 @@ describe('Aztec Account Wallet Handler', () => {
|
|
205
205
|
|
206
206
|
it('handles aztec_getL1ToL2MembershipWitness', async () => {
|
207
207
|
const mockParams = {
|
208
|
-
contractAddress: AztecAddress.random(),
|
209
|
-
messageHash: Fr.random(),
|
210
|
-
secret: Fr.random(),
|
208
|
+
contractAddress: await AztecAddress.random(),
|
209
|
+
messageHash: await Fr.random(),
|
210
|
+
secret: await Fr.random(),
|
211
211
|
};
|
212
212
|
const mockWitness = { witness: new Uint8Array([1, 2, 3]) };
|
213
213
|
wallet.getL1ToL2MembershipWitness = vi.fn().mockResolvedValue(mockWitness);
|
@@ -223,17 +223,19 @@ describe('Aztec Account Wallet Handler', () => {
|
|
223
223
|
});
|
224
224
|
|
225
225
|
describe('Note Methods', () => {
|
226
|
-
it('handles
|
227
|
-
const mockFilter = { contractAddress: AztecAddress.random() };
|
228
|
-
const
|
229
|
-
|
226
|
+
it('handles aztec_getNotes', async () => {
|
227
|
+
const mockFilter = { contractAddress: await AztecAddress.random() };
|
228
|
+
const mockNote = await ExtendedNote.random();
|
229
|
+
const mockNotes = [mockNote];
|
230
|
+
wallet.getNotes = vi.fn().mockResolvedValue(mockNotes);
|
230
231
|
|
231
|
-
const result = await aztecWalletHandler(context, '
|
232
|
+
const result = await aztecWalletHandler(context, 'aztec_getNotes', { filter: mockFilter });
|
232
233
|
expect(result).toBe(mockNotes);
|
234
|
+
expect(wallet.getNotes).toHaveBeenCalledWith(mockFilter);
|
233
235
|
});
|
234
236
|
|
235
237
|
it('handles aztec_addNote', async () => {
|
236
|
-
const mockNote = ExtendedNote.random();
|
238
|
+
const mockNote = await ExtendedNote.random();
|
237
239
|
wallet.addNote = vi.fn().mockResolvedValue(undefined);
|
238
240
|
|
239
241
|
const result = await aztecWalletHandler(context, 'aztec_addNote', { note: mockNote });
|
@@ -242,7 +244,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
242
244
|
});
|
243
245
|
|
244
246
|
it('handles aztec_addNullifiedNote', async () => {
|
245
|
-
const mockNote = ExtendedNote.random();
|
247
|
+
const mockNote = await ExtendedNote.random();
|
246
248
|
Object.assign(mockNote, { nullified: true });
|
247
249
|
wallet.addNullifiedNote = vi.fn().mockResolvedValue(undefined);
|
248
250
|
|
@@ -254,7 +256,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
254
256
|
|
255
257
|
describe('Contract Methods', () => {
|
256
258
|
it('handles aztec_getContractInstance', async () => {
|
257
|
-
const mockAddress = AztecAddress.random();
|
259
|
+
const mockAddress = await AztecAddress.random();
|
258
260
|
const mockInstance = {
|
259
261
|
address: mockAddress,
|
260
262
|
toString: () => mockAddress.toString(),
|
@@ -268,14 +270,14 @@ describe('Aztec Account Wallet Handler', () => {
|
|
268
270
|
it('throws error when contract instance not found', async () => {
|
269
271
|
wallet.getContractInstance = vi.fn().mockResolvedValue(null);
|
270
272
|
|
271
|
-
const testAddress = AztecAddress.random();
|
273
|
+
const testAddress = await AztecAddress.random();
|
272
274
|
await expect(
|
273
275
|
aztecWalletHandler(context, 'aztec_getContractInstance', { address: testAddress }),
|
274
276
|
).rejects.toThrow(AztecWalletError);
|
275
277
|
});
|
276
278
|
|
277
279
|
it('handles aztec_getContractClass', async () => {
|
278
|
-
const mockId = Fr.random();
|
280
|
+
const mockId = await Fr.random();
|
279
281
|
const mockContractClass = { id: mockId };
|
280
282
|
wallet.getContractClass = vi.fn().mockResolvedValue(mockContractClass);
|
281
283
|
|
@@ -285,7 +287,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
285
287
|
|
286
288
|
it('throws error when contract class not found', async () => {
|
287
289
|
wallet.getContractClass = vi.fn().mockResolvedValue(null);
|
288
|
-
const mockId = Fr.random();
|
290
|
+
const mockId = await Fr.random();
|
289
291
|
|
290
292
|
await expect(aztecWalletHandler(context, 'aztec_getContractClass', { id: mockId })).rejects.toThrow(
|
291
293
|
AztecWalletError,
|
@@ -293,7 +295,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
293
295
|
});
|
294
296
|
|
295
297
|
it('handles aztec_getContractArtifact', async () => {
|
296
|
-
const mockId = Fr.random();
|
298
|
+
const mockId = await Fr.random();
|
297
299
|
const mockArtifact = { id: mockId, name: 'TestContract' };
|
298
300
|
wallet.getContractArtifact = vi.fn().mockResolvedValue(mockArtifact);
|
299
301
|
|
@@ -303,7 +305,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
303
305
|
|
304
306
|
it('throws error when contract artifact not found', async () => {
|
305
307
|
wallet.getContractArtifact = vi.fn().mockResolvedValue(null);
|
306
|
-
const mockId = Fr.random();
|
308
|
+
const mockId = await Fr.random();
|
307
309
|
|
308
310
|
await expect(aztecWalletHandler(context, 'aztec_getContractArtifact', { id: mockId })).rejects.toThrow(
|
309
311
|
AztecWalletError,
|
@@ -311,7 +313,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
311
313
|
});
|
312
314
|
|
313
315
|
it('handles aztec_isContractClassPubliclyRegistered', async () => {
|
314
|
-
const mockId = Fr.random();
|
316
|
+
const mockId = await Fr.random();
|
315
317
|
wallet.isContractClassPubliclyRegistered = vi.fn().mockResolvedValue(true);
|
316
318
|
|
317
319
|
const result = await aztecWalletHandler(context, 'aztec_isContractClassPubliclyRegistered', {
|
@@ -321,7 +323,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
321
323
|
});
|
322
324
|
|
323
325
|
it('handles aztec_isContractPubliclyDeployed', async () => {
|
324
|
-
const mockAddress = AztecAddress.random();
|
326
|
+
const mockAddress = await AztecAddress.random();
|
325
327
|
wallet.isContractPubliclyDeployed = vi.fn().mockResolvedValue(true);
|
326
328
|
|
327
329
|
const result = await aztecWalletHandler(context, 'aztec_isContractPubliclyDeployed', {
|
@@ -331,7 +333,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
331
333
|
});
|
332
334
|
|
333
335
|
it('handles aztec_isContractInitialized', async () => {
|
334
|
-
const mockAddress = AztecAddress.random();
|
336
|
+
const mockAddress = await AztecAddress.random();
|
335
337
|
wallet.isContractInitialized = vi.fn().mockResolvedValue(true);
|
336
338
|
|
337
339
|
const result = await aztecWalletHandler(context, 'aztec_isContractInitialized', {
|
@@ -341,7 +343,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
341
343
|
});
|
342
344
|
|
343
345
|
it('handles aztec_registerContract', async () => {
|
344
|
-
const mockAddress = AztecAddress.random();
|
346
|
+
const mockAddress = await AztecAddress.random();
|
345
347
|
const mockPublicKeys = {
|
346
348
|
masterNullifierPublicKey: new Fr(1),
|
347
349
|
masterIncomingViewingPublicKey: new Fr(2),
|
@@ -403,17 +405,18 @@ describe('Aztec Account Wallet Handler', () => {
|
|
403
405
|
});
|
404
406
|
|
405
407
|
describe('Log Methods', () => {
|
406
|
-
it('handles
|
407
|
-
const mockFilter = { contractAddress: AztecAddress.random() };
|
408
|
+
it('handles aztec_getPublicLogs', async () => {
|
409
|
+
const mockFilter = { contractAddress: await AztecAddress.random() };
|
408
410
|
const mockLogs = [{ data: new Uint8Array([1, 2, 3]) }];
|
409
|
-
wallet.
|
411
|
+
wallet.getPublicLogs = vi.fn().mockResolvedValue(mockLogs);
|
410
412
|
|
411
|
-
const result = await aztecWalletHandler(context, '
|
413
|
+
const result = await aztecWalletHandler(context, 'aztec_getPublicLogs', { filter: mockFilter });
|
412
414
|
expect(result).toBe(mockLogs);
|
415
|
+
expect(wallet.getPublicLogs).toHaveBeenCalledWith(mockFilter);
|
413
416
|
});
|
414
417
|
|
415
418
|
it('handles aztec_getContractClassLogs', async () => {
|
416
|
-
const mockFilter = { contractAddress: AztecAddress.random() };
|
419
|
+
const mockFilter = { contractAddress: await AztecAddress.random() };
|
417
420
|
const mockLogs = [{ data: new Uint8Array([1, 2, 3]) }];
|
418
421
|
wallet.getContractClassLogs = vi.fn().mockResolvedValue(mockLogs);
|
419
422
|
|
@@ -421,12 +424,12 @@ describe('Aztec Account Wallet Handler', () => {
|
|
421
424
|
expect(result).toBe(mockLogs);
|
422
425
|
});
|
423
426
|
|
424
|
-
it('handles
|
427
|
+
it('handles aztec_getPrivateEvents', async () => {
|
425
428
|
const mockEvent = {
|
426
429
|
name: 'TestEvent',
|
427
430
|
parameters: [{ name: 'value', type: 'field' }],
|
428
431
|
returnType: { type: 'struct', items: [{ name: 'value', type: 'field' }] },
|
429
|
-
eventSelector: EventSelector.random(),
|
432
|
+
eventSelector: await EventSelector.random(),
|
430
433
|
abiType: 'event',
|
431
434
|
fieldNames: ['value'],
|
432
435
|
} as unknown as EventMetadataDefinition;
|
@@ -434,14 +437,14 @@ describe('Aztec Account Wallet Handler', () => {
|
|
434
437
|
event: mockEvent,
|
435
438
|
from: 0,
|
436
439
|
limit: 10,
|
437
|
-
vpks: [Point.random()],
|
440
|
+
vpks: [await Point.random()],
|
438
441
|
};
|
439
442
|
const mockEvents = [{ data: new Uint8Array([1, 2, 3]) }];
|
440
|
-
wallet.
|
443
|
+
wallet.getPrivateEvents = vi.fn().mockResolvedValue(mockEvents);
|
441
444
|
|
442
|
-
const result = await aztecWalletHandler(context, '
|
445
|
+
const result = await aztecWalletHandler(context, 'aztec_getPrivateEvents', mockParams);
|
443
446
|
expect(result).toBe(mockEvents);
|
444
|
-
expect(wallet.
|
447
|
+
expect(wallet.getPrivateEvents).toHaveBeenCalledWith(
|
445
448
|
mockParams.event,
|
446
449
|
mockParams.from,
|
447
450
|
mockParams.limit,
|
@@ -449,12 +452,12 @@ describe('Aztec Account Wallet Handler', () => {
|
|
449
452
|
);
|
450
453
|
});
|
451
454
|
|
452
|
-
it('handles
|
455
|
+
it('handles aztec_getPublicEvents', async () => {
|
453
456
|
const mockEvent = {
|
454
457
|
name: 'TestEvent',
|
455
458
|
parameters: [{ name: 'value', type: 'field' }],
|
456
459
|
returnType: { type: 'struct', items: [{ name: 'value', type: 'field' }] },
|
457
|
-
eventSelector: EventSelector.random(),
|
460
|
+
eventSelector: await EventSelector.random(),
|
458
461
|
abiType: 'event',
|
459
462
|
fieldNames: ['value'],
|
460
463
|
} as unknown as EventMetadataDefinition;
|
@@ -464,11 +467,11 @@ describe('Aztec Account Wallet Handler', () => {
|
|
464
467
|
limit: 10,
|
465
468
|
};
|
466
469
|
const mockEvents = [{ data: new Uint8Array([1, 2, 3]) }];
|
467
|
-
wallet.
|
470
|
+
wallet.getPublicEvents = vi.fn().mockResolvedValue(mockEvents);
|
468
471
|
|
469
|
-
const result = await aztecWalletHandler(context, '
|
472
|
+
const result = await aztecWalletHandler(context, 'aztec_getPublicEvents', mockParams);
|
470
473
|
expect(result).toBe(mockEvents);
|
471
|
-
expect(wallet.
|
474
|
+
expect(wallet.getPublicEvents).toHaveBeenCalledWith(
|
472
475
|
mockParams.event,
|
473
476
|
mockParams.from,
|
474
477
|
mockParams.limit,
|
@@ -478,7 +481,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
478
481
|
|
479
482
|
describe('Transaction Methods', () => {
|
480
483
|
it('handles aztec_getTxReceipt', async () => {
|
481
|
-
const mockTxHash = TxHash.random();
|
484
|
+
const mockTxHash = await TxHash.random();
|
482
485
|
const mockReceipt = { status: 1 };
|
483
486
|
wallet.getTxReceipt = vi.fn().mockResolvedValue(mockReceipt);
|
484
487
|
|
@@ -489,7 +492,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
489
492
|
it('throws error when transaction receipt not found', async () => {
|
490
493
|
wallet.getTxReceipt = vi.fn().mockResolvedValue(null);
|
491
494
|
|
492
|
-
const mockTxHash = TxHash.random();
|
495
|
+
const mockTxHash = await TxHash.random();
|
493
496
|
await expect(aztecWalletHandler(context, 'aztec_getTxReceipt', { txHash: mockTxHash })).rejects.toThrow(
|
494
497
|
AztecWalletError,
|
495
498
|
);
|
@@ -498,27 +501,27 @@ describe('Aztec Account Wallet Handler', () => {
|
|
498
501
|
it('handles aztec_simulateTx', async () => {
|
499
502
|
const mockParams = {
|
500
503
|
txRequest: {
|
501
|
-
origin: AztecAddress.random(),
|
504
|
+
origin: await AztecAddress.random(),
|
502
505
|
functionSelector: new Fr(1),
|
503
506
|
firstCallArgsHash: new Fr(2),
|
504
507
|
txContext: {
|
505
508
|
chainId: 1,
|
506
509
|
version: 1,
|
507
510
|
protocolVersion: 1,
|
508
|
-
excessFeeReceiver: AztecAddress.random(),
|
511
|
+
excessFeeReceiver: await AztecAddress.random(),
|
509
512
|
},
|
510
513
|
callData: new Uint8Array(),
|
511
514
|
gasLimit: 1000000n,
|
512
515
|
gasPrice: 1000000n,
|
513
|
-
storageContractAddress: AztecAddress.random(),
|
514
|
-
portalContract: AztecAddress.random(),
|
516
|
+
storageContractAddress: await AztecAddress.random(),
|
517
|
+
portalContract: await AztecAddress.random(),
|
515
518
|
argsOfCalls: [],
|
516
519
|
authWitnesses: [],
|
517
520
|
toTxRequest: () => ({ id: '0x123' }),
|
518
521
|
toBuffer: () => new Uint8Array(),
|
519
522
|
} as unknown as TxExecutionRequest,
|
520
523
|
simulatePublic: true,
|
521
|
-
msgSender: AztecAddress.random(),
|
524
|
+
msgSender: await AztecAddress.random(),
|
522
525
|
skipTxValidation: false,
|
523
526
|
enforceFeePayment: true,
|
524
527
|
profile: true,
|
@@ -541,7 +544,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
541
544
|
|
542
545
|
describe('Capsule Methods', () => {
|
543
546
|
it('handles aztec_addCapsule', async () => {
|
544
|
-
const mockCapsule = [Fr.random(), Fr.random(), Fr.random()];
|
547
|
+
const mockCapsule = [await Fr.random(), await Fr.random(), await Fr.random()];
|
545
548
|
wallet.addCapsule = vi.fn().mockResolvedValue(undefined);
|
546
549
|
|
547
550
|
const result = await aztecWalletHandler(context, 'aztec_addCapsule', { capsule: mockCapsule });
|
@@ -553,7 +556,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
553
556
|
describe('Auth Witness Methods', () => {
|
554
557
|
it('handles aztec_addAuthWitness', async () => {
|
555
558
|
const mockAuthWitness = {
|
556
|
-
requestHash: Fr.random(),
|
559
|
+
requestHash: await Fr.random(),
|
557
560
|
witness: new Uint8Array([1, 2, 3]),
|
558
561
|
toJSON: () => ({}),
|
559
562
|
toBuffer: () => new Uint8Array([1, 2, 3]),
|
@@ -568,7 +571,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
568
571
|
});
|
569
572
|
|
570
573
|
it('handles aztec_createAuthWit', async () => {
|
571
|
-
const mockIntent = Fr.random() as unknown as IntentAction | IntentInnerHash;
|
574
|
+
const mockIntent = (await Fr.random()) as unknown as IntentAction | IntentInnerHash;
|
572
575
|
const mockAuthWit = { witness: new Uint8Array([4, 5, 6]) };
|
573
576
|
wallet.createAuthWit = vi.fn().mockResolvedValue(mockAuthWit);
|
574
577
|
|
@@ -580,7 +583,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
580
583
|
|
581
584
|
describe('Sender Methods', () => {
|
582
585
|
it('handles aztec_registerSender', async () => {
|
583
|
-
const mockSender = AztecAddress.random();
|
586
|
+
const mockSender = await AztecAddress.random();
|
584
587
|
const mockResult = { success: true };
|
585
588
|
wallet.registerSender = vi.fn().mockResolvedValue(mockResult);
|
586
589
|
|
@@ -590,7 +593,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
590
593
|
});
|
591
594
|
|
592
595
|
it('handles aztec_removeSender', async () => {
|
593
|
-
const mockSender = AztecAddress.random();
|
596
|
+
const mockSender = await AztecAddress.random();
|
594
597
|
wallet.removeSender = vi.fn().mockResolvedValue(undefined);
|
595
598
|
|
596
599
|
const result = await aztecWalletHandler(context, 'aztec_removeSender', { sender: mockSender });
|
@@ -602,20 +605,20 @@ describe('Aztec Account Wallet Handler', () => {
|
|
602
605
|
describe('Transaction Methods', () => {
|
603
606
|
it('handles aztec_proveTx', async () => {
|
604
607
|
const mockTxRequest = {
|
605
|
-
origin: AztecAddress.random(),
|
608
|
+
origin: await AztecAddress.random(),
|
606
609
|
functionSelector: new Fr(1),
|
607
610
|
firstCallArgsHash: new Fr(2),
|
608
611
|
txContext: {
|
609
612
|
chainId: 1,
|
610
613
|
version: 1,
|
611
614
|
protocolVersion: 1,
|
612
|
-
excessFeeReceiver: AztecAddress.random(),
|
615
|
+
excessFeeReceiver: await AztecAddress.random(),
|
613
616
|
},
|
614
617
|
callData: new Uint8Array(),
|
615
618
|
gasLimit: 1000000n,
|
616
619
|
gasPrice: 1000000n,
|
617
|
-
storageContractAddress: AztecAddress.random(),
|
618
|
-
portalContract: AztecAddress.random(),
|
620
|
+
storageContractAddress: await AztecAddress.random(),
|
621
|
+
portalContract: await AztecAddress.random(),
|
619
622
|
argsOfCalls: [],
|
620
623
|
authWitnesses: [],
|
621
624
|
toTxRequest: () => ({ id: '0x123' }),
|
@@ -625,7 +628,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
625
628
|
acir: new Uint8Array([1, 2, 3]),
|
626
629
|
vk: new Uint8Array([4, 5, 6]),
|
627
630
|
partialWitness: new Uint8Array([7, 8, 9]),
|
628
|
-
publicInputs: [Fr.random()],
|
631
|
+
publicInputs: [await Fr.random()],
|
629
632
|
success: true,
|
630
633
|
gasUsed: 1000n,
|
631
634
|
returnValue: new Uint8Array(),
|
@@ -635,7 +638,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
635
638
|
encryptedLogPreimages: [],
|
636
639
|
encryptedLogKeys: [],
|
637
640
|
} as unknown as PrivateExecutionResult;
|
638
|
-
const mockProvenTx = { hash: TxHash.random() };
|
641
|
+
const mockProvenTx = { hash: await TxHash.random() };
|
639
642
|
wallet.proveTx = vi.fn().mockResolvedValue(mockProvenTx);
|
640
643
|
|
641
644
|
const result = await aztecWalletHandler(context, 'aztec_proveTx', {
|
@@ -648,7 +651,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
648
651
|
|
649
652
|
it('handles aztec_sendTx', async () => {
|
650
653
|
const mockTx = {
|
651
|
-
hash: TxHash.random(),
|
654
|
+
hash: await TxHash.random(),
|
652
655
|
data: new Uint8Array([1, 2, 3]),
|
653
656
|
clientIvcProof: new Uint8Array([4, 5, 6]),
|
654
657
|
unencryptedLogs: [],
|
@@ -656,17 +659,17 @@ describe('Aztec Account Wallet Handler', () => {
|
|
656
659
|
encryptedLogs: [],
|
657
660
|
encryptedLogPreimages: [],
|
658
661
|
encryptedLogKeys: [],
|
659
|
-
encryptedLogsSalt: Fr.random(),
|
660
|
-
encryptedLogsCommitment: Fr.random(),
|
662
|
+
encryptedLogsSalt: await Fr.random(),
|
663
|
+
encryptedLogsCommitment: await Fr.random(),
|
661
664
|
encryptedLogsTreeIndex: 0,
|
662
665
|
encryptedLogProofs: [],
|
663
666
|
encryptedLogProofsTreeIndex: 0,
|
664
|
-
encryptedLogProofsCommitment: Fr.random(),
|
665
|
-
encryptedLogProofsSalt: Fr.random(),
|
667
|
+
encryptedLogProofsCommitment: await Fr.random(),
|
668
|
+
encryptedLogProofsSalt: await Fr.random(),
|
666
669
|
toBuffer: () => new Uint8Array(),
|
667
670
|
toString: () => 'mockTx',
|
668
671
|
} as unknown as Tx;
|
669
|
-
const mockTxHash = TxHash.random();
|
672
|
+
const mockTxHash = await TxHash.random();
|
670
673
|
wallet.sendTx = vi.fn().mockResolvedValue(mockTxHash);
|
671
674
|
|
672
675
|
const result = await aztecWalletHandler(context, 'aztec_sendTx', { tx: mockTx });
|
@@ -675,7 +678,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
675
678
|
});
|
676
679
|
|
677
680
|
it('handles aztec_getTxEffect', async () => {
|
678
|
-
const mockTxHash = TxHash.random();
|
681
|
+
const mockTxHash = await TxHash.random();
|
679
682
|
const mockEffect = { success: true };
|
680
683
|
wallet.getTxEffect = vi.fn().mockResolvedValue(mockEffect);
|
681
684
|
|
@@ -687,7 +690,7 @@ describe('Aztec Account Wallet Handler', () => {
|
|
687
690
|
it('throws error when transaction effect not found', async () => {
|
688
691
|
wallet.getTxEffect = vi.fn().mockResolvedValue(null);
|
689
692
|
|
690
|
-
const mockTxHash = TxHash.random();
|
693
|
+
const mockTxHash = await TxHash.random();
|
691
694
|
await expect(aztecWalletHandler(context, 'aztec_getTxEffect', { txHash: mockTxHash })).rejects.toThrow(
|
692
695
|
AztecWalletError,
|
693
696
|
);
|
@@ -696,9 +699,9 @@ describe('Aztec Account Wallet Handler', () => {
|
|
696
699
|
|
697
700
|
describe('Public Storage Methods', () => {
|
698
701
|
it('handles aztec_getPublicStorageAt', async () => {
|
699
|
-
const mockContract = AztecAddress.random();
|
700
|
-
const mockStorageSlot = Fr.random();
|
701
|
-
const mockValue = Fr.random();
|
702
|
+
const mockContract = await AztecAddress.random();
|
703
|
+
const mockStorageSlot = await Fr.random();
|
704
|
+
const mockValue = await Fr.random();
|
702
705
|
wallet.getPublicStorageAt = vi.fn().mockResolvedValue(mockValue);
|
703
706
|
|
704
707
|
const result = await aztecWalletHandler(context, 'aztec_getPublicStorageAt', {
|