@aztec/builder 0.43.0 → 0.44.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAOtB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAOtB,MAAM,uBAAuB,CAAC;AA8S/B;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,MAAM,UAuEvG"}
|
|
@@ -172,9 +172,8 @@ function generateStorageLayoutGetter(input) {
|
|
|
172
172
|
}
|
|
173
173
|
const storageFieldsUnionType = entries.map(([name]) => `'${name}'`).join(' | ');
|
|
174
174
|
const layout = entries
|
|
175
|
-
.map(([name, { slot
|
|
175
|
+
.map(([name, { slot }]) => `${name}: {
|
|
176
176
|
slot: new Fr(${slot.toBigInt()}n),
|
|
177
|
-
typ: "${typ}",
|
|
178
177
|
}`)
|
|
179
178
|
.join(',\n');
|
|
180
179
|
return `public static get storage(): ContractStorageLayout<${storageFieldsUnionType}> {
|
|
@@ -196,7 +195,7 @@ function generateNotesGetter(input) {
|
|
|
196
195
|
const notesUnionType = entries.map(([name]) => `'${name}'`).join(' | ');
|
|
197
196
|
const noteMetadata = entries
|
|
198
197
|
.map(([name, { id }]) => `${name}: {
|
|
199
|
-
id: new
|
|
198
|
+
id: new NoteSelector(${id.value}),
|
|
200
199
|
}`)
|
|
201
200
|
.join(',\n');
|
|
202
201
|
return `public static get notes(): ContractNotes<${notesUnionType}> {
|
|
@@ -220,12 +219,12 @@ function generateEvents(events) {
|
|
|
220
219
|
}
|
|
221
220
|
`;
|
|
222
221
|
const fieldNames = event.fields.map((field) => `"${field.name}"`);
|
|
223
|
-
const eventType = `${eventName}: {decode: (payload: L1EventPayload | undefined) => ${eventName} | undefined,
|
|
222
|
+
const eventType = `${eventName}: {decode: (payload: L1EventPayload | undefined) => ${eventName} | undefined, eventSelector: EventSelector, fieldNames: string[] }`;
|
|
224
223
|
const eventImpl = `${eventName}: {
|
|
225
|
-
decode: this.decodeEvent(${event.fields.length},
|
|
224
|
+
decode: this.decodeEvent(${event.fields.length}, EventSelector.fromSignature('${eventName}(${event.fields
|
|
226
225
|
.map(() => 'Field')
|
|
227
226
|
.join(',')})'), [${fieldNames}]),
|
|
228
|
-
|
|
227
|
+
eventSelector: EventSelector.fromSignature('${eventName}(${event.fields.map(() => 'Field').join(',')})'),
|
|
229
228
|
fieldNames: [${fieldNames}],
|
|
230
229
|
}`;
|
|
231
230
|
return {
|
|
@@ -238,21 +237,17 @@ function generateEvents(events) {
|
|
|
238
237
|
eventDefs: eventsMetadata.map(({ eventDef }) => eventDef).join('\n'),
|
|
239
238
|
events: `
|
|
240
239
|
// Partial application is chosen is to avoid the duplication of so much codegen.
|
|
241
|
-
private static decodeEvent<T>(fieldsLength: number,
|
|
240
|
+
private static decodeEvent<T>(fieldsLength: number, eventSelector: EventSelector, fields: string[]): (payload: L1EventPayload | undefined) => T | undefined {
|
|
242
241
|
return (payload: L1EventPayload | undefined): T | undefined => {
|
|
243
242
|
if (payload === undefined) {
|
|
244
243
|
return undefined;
|
|
245
244
|
}
|
|
246
|
-
if (
|
|
247
|
-
!functionSelector.equals(
|
|
248
|
-
FunctionSelector.fromField(payload.eventTypeId),
|
|
249
|
-
)
|
|
250
|
-
) {
|
|
245
|
+
if (!eventSelector.equals(payload.eventTypeId)) {
|
|
251
246
|
return undefined;
|
|
252
247
|
}
|
|
253
248
|
if (payload.event.items.length !== fieldsLength) {
|
|
254
249
|
throw new Error(
|
|
255
|
-
'Something is weird here, we have matching
|
|
250
|
+
'Something is weird here, we have matching EventSelectors, but the actual payload has mismatched length',
|
|
256
251
|
);
|
|
257
252
|
}
|
|
258
253
|
|
|
@@ -309,13 +304,14 @@ import {
|
|
|
309
304
|
DeployMethod,
|
|
310
305
|
EthAddress,
|
|
311
306
|
EthAddressLike,
|
|
307
|
+
EventSelector,
|
|
312
308
|
FieldLike,
|
|
313
309
|
Fr,
|
|
314
|
-
FunctionSelector,
|
|
315
310
|
FunctionSelectorLike,
|
|
316
311
|
L1EventPayload,
|
|
317
312
|
loadContractArtifact,
|
|
318
313
|
NoirCompiledContract,
|
|
314
|
+
NoteSelector,
|
|
319
315
|
Point,
|
|
320
316
|
PublicKey,
|
|
321
317
|
Wallet,
|
|
@@ -350,4 +346,4 @@ export class ${input.name}Contract extends ContractBase {
|
|
|
350
346
|
}
|
|
351
347
|
`;
|
|
352
348
|
}
|
|
353
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
349
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../src/contract-interface-gen/typescript.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/builder",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.44.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -41,7 +41,15 @@
|
|
|
41
41
|
"rootDir": "./src",
|
|
42
42
|
"transform": {
|
|
43
43
|
"^.+\\.tsx?$": [
|
|
44
|
-
"@swc/jest"
|
|
44
|
+
"@swc/jest",
|
|
45
|
+
{
|
|
46
|
+
"jsc": {
|
|
47
|
+
"parser": {
|
|
48
|
+
"syntax": "typescript",
|
|
49
|
+
"decorators": true
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
45
53
|
]
|
|
46
54
|
},
|
|
47
55
|
"extensionsToTreatAsEsm": [
|
|
@@ -57,9 +65,9 @@
|
|
|
57
65
|
]
|
|
58
66
|
},
|
|
59
67
|
"dependencies": {
|
|
60
|
-
"@aztec/circuits.js": "0.
|
|
61
|
-
"@aztec/foundation": "0.
|
|
62
|
-
"@aztec/types": "0.
|
|
68
|
+
"@aztec/circuits.js": "0.44.0",
|
|
69
|
+
"@aztec/foundation": "0.44.0",
|
|
70
|
+
"@aztec/types": "0.44.0",
|
|
63
71
|
"@iarna/toml": "^2.2.5",
|
|
64
72
|
"base64-js": "^1.5.1",
|
|
65
73
|
"commander": "^9.0.0",
|
|
@@ -194,10 +194,9 @@ function generateStorageLayoutGetter(input: ContractArtifact) {
|
|
|
194
194
|
const storageFieldsUnionType = entries.map(([name]) => `'${name}'`).join(' | ');
|
|
195
195
|
const layout = entries
|
|
196
196
|
.map(
|
|
197
|
-
([name, { slot
|
|
197
|
+
([name, { slot }]) =>
|
|
198
198
|
`${name}: {
|
|
199
199
|
slot: new Fr(${slot.toBigInt()}n),
|
|
200
|
-
typ: "${typ}",
|
|
201
200
|
}`,
|
|
202
201
|
)
|
|
203
202
|
.join(',\n');
|
|
@@ -226,7 +225,7 @@ function generateNotesGetter(input: ContractArtifact) {
|
|
|
226
225
|
.map(
|
|
227
226
|
([name, { id }]) =>
|
|
228
227
|
`${name}: {
|
|
229
|
-
id: new
|
|
228
|
+
id: new NoteSelector(${id.value}),
|
|
230
229
|
}`,
|
|
231
230
|
)
|
|
232
231
|
.join(',\n');
|
|
@@ -256,13 +255,13 @@ function generateEvents(events: any[] | undefined) {
|
|
|
256
255
|
`;
|
|
257
256
|
|
|
258
257
|
const fieldNames = event.fields.map((field: any) => `"${field.name}"`);
|
|
259
|
-
const eventType = `${eventName}: {decode: (payload: L1EventPayload | undefined) => ${eventName} | undefined,
|
|
258
|
+
const eventType = `${eventName}: {decode: (payload: L1EventPayload | undefined) => ${eventName} | undefined, eventSelector: EventSelector, fieldNames: string[] }`;
|
|
260
259
|
|
|
261
260
|
const eventImpl = `${eventName}: {
|
|
262
|
-
decode: this.decodeEvent(${event.fields.length},
|
|
261
|
+
decode: this.decodeEvent(${event.fields.length}, EventSelector.fromSignature('${eventName}(${event.fields
|
|
263
262
|
.map(() => 'Field')
|
|
264
263
|
.join(',')})'), [${fieldNames}]),
|
|
265
|
-
|
|
264
|
+
eventSelector: EventSelector.fromSignature('${eventName}(${event.fields.map(() => 'Field').join(',')})'),
|
|
266
265
|
fieldNames: [${fieldNames}],
|
|
267
266
|
}`;
|
|
268
267
|
|
|
@@ -277,21 +276,17 @@ function generateEvents(events: any[] | undefined) {
|
|
|
277
276
|
eventDefs: eventsMetadata.map(({ eventDef }) => eventDef).join('\n'),
|
|
278
277
|
events: `
|
|
279
278
|
// Partial application is chosen is to avoid the duplication of so much codegen.
|
|
280
|
-
private static decodeEvent<T>(fieldsLength: number,
|
|
279
|
+
private static decodeEvent<T>(fieldsLength: number, eventSelector: EventSelector, fields: string[]): (payload: L1EventPayload | undefined) => T | undefined {
|
|
281
280
|
return (payload: L1EventPayload | undefined): T | undefined => {
|
|
282
281
|
if (payload === undefined) {
|
|
283
282
|
return undefined;
|
|
284
283
|
}
|
|
285
|
-
if (
|
|
286
|
-
!functionSelector.equals(
|
|
287
|
-
FunctionSelector.fromField(payload.eventTypeId),
|
|
288
|
-
)
|
|
289
|
-
) {
|
|
284
|
+
if (!eventSelector.equals(payload.eventTypeId)) {
|
|
290
285
|
return undefined;
|
|
291
286
|
}
|
|
292
287
|
if (payload.event.items.length !== fieldsLength) {
|
|
293
288
|
throw new Error(
|
|
294
|
-
'Something is weird here, we have matching
|
|
289
|
+
'Something is weird here, we have matching EventSelectors, but the actual payload has mismatched length',
|
|
295
290
|
);
|
|
296
291
|
}
|
|
297
292
|
|
|
@@ -350,13 +345,14 @@ import {
|
|
|
350
345
|
DeployMethod,
|
|
351
346
|
EthAddress,
|
|
352
347
|
EthAddressLike,
|
|
348
|
+
EventSelector,
|
|
353
349
|
FieldLike,
|
|
354
350
|
Fr,
|
|
355
|
-
FunctionSelector,
|
|
356
351
|
FunctionSelectorLike,
|
|
357
352
|
L1EventPayload,
|
|
358
353
|
loadContractArtifact,
|
|
359
354
|
NoirCompiledContract,
|
|
355
|
+
NoteSelector,
|
|
360
356
|
Point,
|
|
361
357
|
PublicKey,
|
|
362
358
|
Wallet,
|