@aztec/builder 0.42.0 → 0.43.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;AAmT/B;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,MAAM,UAsEvG"}
|
|
@@ -206,6 +206,74 @@ function generateNotesGetter(input) {
|
|
|
206
206
|
}
|
|
207
207
|
`;
|
|
208
208
|
}
|
|
209
|
+
// events is of type AbiType
|
|
210
|
+
function generateEvents(events) {
|
|
211
|
+
if (events === undefined) {
|
|
212
|
+
return { events: '', eventDefs: '' };
|
|
213
|
+
}
|
|
214
|
+
const eventsMetadata = events.map(event => {
|
|
215
|
+
const eventName = event.path.split('::').at(-1);
|
|
216
|
+
const eventDefProps = event.fields.map((field) => `${field.name}: Fr`);
|
|
217
|
+
const eventDef = `
|
|
218
|
+
export type ${eventName} = {
|
|
219
|
+
${eventDefProps.join('\n')}
|
|
220
|
+
}
|
|
221
|
+
`;
|
|
222
|
+
const fieldNames = event.fields.map((field) => `"${field.name}"`);
|
|
223
|
+
const eventType = `${eventName}: {decode: (payload: L1EventPayload | undefined) => ${eventName} | undefined, functionSelector: FunctionSelector, fieldNames: string[] }`;
|
|
224
|
+
const eventImpl = `${eventName}: {
|
|
225
|
+
decode: this.decodeEvent(${event.fields.length}, FunctionSelector.fromSignature('${eventName}(${event.fields
|
|
226
|
+
.map(() => 'Field')
|
|
227
|
+
.join(',')})'), [${fieldNames}]),
|
|
228
|
+
functionSelector: FunctionSelector.fromSignature('${eventName}(${event.fields.map(() => 'Field').join(',')})'),
|
|
229
|
+
fieldNames: [${fieldNames}],
|
|
230
|
+
}`;
|
|
231
|
+
return {
|
|
232
|
+
eventDef,
|
|
233
|
+
eventType,
|
|
234
|
+
eventImpl,
|
|
235
|
+
};
|
|
236
|
+
});
|
|
237
|
+
return {
|
|
238
|
+
eventDefs: eventsMetadata.map(({ eventDef }) => eventDef).join('\n'),
|
|
239
|
+
events: `
|
|
240
|
+
// Partial application is chosen is to avoid the duplication of so much codegen.
|
|
241
|
+
private static decodeEvent<T>(fieldsLength: number, functionSelector: FunctionSelector, fields: string[]): (payload: L1EventPayload | undefined) => T | undefined {
|
|
242
|
+
return (payload: L1EventPayload | undefined): T | undefined => {
|
|
243
|
+
if (payload === undefined) {
|
|
244
|
+
return undefined;
|
|
245
|
+
}
|
|
246
|
+
if (
|
|
247
|
+
!functionSelector.equals(
|
|
248
|
+
FunctionSelector.fromField(payload.eventTypeId),
|
|
249
|
+
)
|
|
250
|
+
) {
|
|
251
|
+
return undefined;
|
|
252
|
+
}
|
|
253
|
+
if (payload.event.items.length !== fieldsLength) {
|
|
254
|
+
throw new Error(
|
|
255
|
+
'Something is weird here, we have matching FunctionSelectors, but the actual payload has mismatched length',
|
|
256
|
+
);
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
return fields.reduce(
|
|
260
|
+
(acc, curr, i) => ({
|
|
261
|
+
...acc,
|
|
262
|
+
[curr]: payload.event.items[i],
|
|
263
|
+
}),
|
|
264
|
+
{} as T,
|
|
265
|
+
);
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
public static get events(): { ${eventsMetadata.map(({ eventType }) => eventType).join(', ')} } {
|
|
270
|
+
return {
|
|
271
|
+
${eventsMetadata.map(({ eventImpl }) => eventImpl).join(',\n')}
|
|
272
|
+
};
|
|
273
|
+
}
|
|
274
|
+
`,
|
|
275
|
+
};
|
|
276
|
+
}
|
|
209
277
|
/**
|
|
210
278
|
* Generates the typescript code to represent a contract.
|
|
211
279
|
* @param input - The compiled Noir artifact.
|
|
@@ -221,6 +289,7 @@ export function generateTypescriptContractInterface(input, artifactImportPath) {
|
|
|
221
289
|
const artifactGetter = artifactImportPath && generateArtifactGetter(input.name);
|
|
222
290
|
const storageLayoutGetter = artifactImportPath && generateStorageLayoutGetter(input);
|
|
223
291
|
const notesGetter = artifactImportPath && generateNotesGetter(input);
|
|
292
|
+
const { eventDefs, events } = generateEvents(input.outputs.structs?.events);
|
|
224
293
|
return `
|
|
225
294
|
/* Autogenerated file, do not edit! */
|
|
226
295
|
|
|
@@ -242,7 +311,9 @@ import {
|
|
|
242
311
|
EthAddressLike,
|
|
243
312
|
FieldLike,
|
|
244
313
|
Fr,
|
|
314
|
+
FunctionSelector,
|
|
245
315
|
FunctionSelectorLike,
|
|
316
|
+
L1EventPayload,
|
|
246
317
|
loadContractArtifact,
|
|
247
318
|
NoirCompiledContract,
|
|
248
319
|
Point,
|
|
@@ -252,6 +323,8 @@ import {
|
|
|
252
323
|
} from '@aztec/aztec.js';
|
|
253
324
|
${artifactStatement}
|
|
254
325
|
|
|
326
|
+
${eventDefs}
|
|
327
|
+
|
|
255
328
|
/**
|
|
256
329
|
* Type-safe interface for contract ${input.name};
|
|
257
330
|
*/
|
|
@@ -272,7 +345,9 @@ export class ${input.name}Contract extends ContractBase {
|
|
|
272
345
|
public override methods!: {
|
|
273
346
|
${methods.join('\n')}
|
|
274
347
|
};
|
|
348
|
+
|
|
349
|
+
${events}
|
|
275
350
|
}
|
|
276
351
|
`;
|
|
277
352
|
}
|
|
278
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
353
|
+
//# 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.43.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -57,9 +57,9 @@
|
|
|
57
57
|
]
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@aztec/circuits.js": "0.
|
|
61
|
-
"@aztec/foundation": "0.
|
|
62
|
-
"@aztec/types": "0.
|
|
60
|
+
"@aztec/circuits.js": "0.43.0",
|
|
61
|
+
"@aztec/foundation": "0.43.0",
|
|
62
|
+
"@aztec/types": "0.43.0",
|
|
63
63
|
"@iarna/toml": "^2.2.5",
|
|
64
64
|
"base64-js": "^1.5.1",
|
|
65
65
|
"commander": "^9.0.0",
|
|
@@ -239,6 +239,81 @@ function generateNotesGetter(input: ContractArtifact) {
|
|
|
239
239
|
`;
|
|
240
240
|
}
|
|
241
241
|
|
|
242
|
+
// events is of type AbiType
|
|
243
|
+
function generateEvents(events: any[] | undefined) {
|
|
244
|
+
if (events === undefined) {
|
|
245
|
+
return { events: '', eventDefs: '' };
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
const eventsMetadata = events.map(event => {
|
|
249
|
+
const eventName = event.path.split('::').at(-1);
|
|
250
|
+
|
|
251
|
+
const eventDefProps = event.fields.map((field: any) => `${field.name}: Fr`);
|
|
252
|
+
const eventDef = `
|
|
253
|
+
export type ${eventName} = {
|
|
254
|
+
${eventDefProps.join('\n')}
|
|
255
|
+
}
|
|
256
|
+
`;
|
|
257
|
+
|
|
258
|
+
const fieldNames = event.fields.map((field: any) => `"${field.name}"`);
|
|
259
|
+
const eventType = `${eventName}: {decode: (payload: L1EventPayload | undefined) => ${eventName} | undefined, functionSelector: FunctionSelector, fieldNames: string[] }`;
|
|
260
|
+
|
|
261
|
+
const eventImpl = `${eventName}: {
|
|
262
|
+
decode: this.decodeEvent(${event.fields.length}, FunctionSelector.fromSignature('${eventName}(${event.fields
|
|
263
|
+
.map(() => 'Field')
|
|
264
|
+
.join(',')})'), [${fieldNames}]),
|
|
265
|
+
functionSelector: FunctionSelector.fromSignature('${eventName}(${event.fields.map(() => 'Field').join(',')})'),
|
|
266
|
+
fieldNames: [${fieldNames}],
|
|
267
|
+
}`;
|
|
268
|
+
|
|
269
|
+
return {
|
|
270
|
+
eventDef,
|
|
271
|
+
eventType,
|
|
272
|
+
eventImpl,
|
|
273
|
+
};
|
|
274
|
+
});
|
|
275
|
+
|
|
276
|
+
return {
|
|
277
|
+
eventDefs: eventsMetadata.map(({ eventDef }) => eventDef).join('\n'),
|
|
278
|
+
events: `
|
|
279
|
+
// Partial application is chosen is to avoid the duplication of so much codegen.
|
|
280
|
+
private static decodeEvent<T>(fieldsLength: number, functionSelector: FunctionSelector, fields: string[]): (payload: L1EventPayload | undefined) => T | undefined {
|
|
281
|
+
return (payload: L1EventPayload | undefined): T | undefined => {
|
|
282
|
+
if (payload === undefined) {
|
|
283
|
+
return undefined;
|
|
284
|
+
}
|
|
285
|
+
if (
|
|
286
|
+
!functionSelector.equals(
|
|
287
|
+
FunctionSelector.fromField(payload.eventTypeId),
|
|
288
|
+
)
|
|
289
|
+
) {
|
|
290
|
+
return undefined;
|
|
291
|
+
}
|
|
292
|
+
if (payload.event.items.length !== fieldsLength) {
|
|
293
|
+
throw new Error(
|
|
294
|
+
'Something is weird here, we have matching FunctionSelectors, but the actual payload has mismatched length',
|
|
295
|
+
);
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
return fields.reduce(
|
|
299
|
+
(acc, curr, i) => ({
|
|
300
|
+
...acc,
|
|
301
|
+
[curr]: payload.event.items[i],
|
|
302
|
+
}),
|
|
303
|
+
{} as T,
|
|
304
|
+
);
|
|
305
|
+
};
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
public static get events(): { ${eventsMetadata.map(({ eventType }) => eventType).join(', ')} } {
|
|
309
|
+
return {
|
|
310
|
+
${eventsMetadata.map(({ eventImpl }) => eventImpl).join(',\n')}
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
`,
|
|
314
|
+
};
|
|
315
|
+
}
|
|
316
|
+
|
|
242
317
|
/**
|
|
243
318
|
* Generates the typescript code to represent a contract.
|
|
244
319
|
* @param input - The compiled Noir artifact.
|
|
@@ -254,6 +329,7 @@ export function generateTypescriptContractInterface(input: ContractArtifact, art
|
|
|
254
329
|
const artifactGetter = artifactImportPath && generateArtifactGetter(input.name);
|
|
255
330
|
const storageLayoutGetter = artifactImportPath && generateStorageLayoutGetter(input);
|
|
256
331
|
const notesGetter = artifactImportPath && generateNotesGetter(input);
|
|
332
|
+
const { eventDefs, events } = generateEvents(input.outputs.structs?.events);
|
|
257
333
|
|
|
258
334
|
return `
|
|
259
335
|
/* Autogenerated file, do not edit! */
|
|
@@ -276,7 +352,9 @@ import {
|
|
|
276
352
|
EthAddressLike,
|
|
277
353
|
FieldLike,
|
|
278
354
|
Fr,
|
|
355
|
+
FunctionSelector,
|
|
279
356
|
FunctionSelectorLike,
|
|
357
|
+
L1EventPayload,
|
|
280
358
|
loadContractArtifact,
|
|
281
359
|
NoirCompiledContract,
|
|
282
360
|
Point,
|
|
@@ -286,6 +364,8 @@ import {
|
|
|
286
364
|
} from '@aztec/aztec.js';
|
|
287
365
|
${artifactStatement}
|
|
288
366
|
|
|
367
|
+
${eventDefs}
|
|
368
|
+
|
|
289
369
|
/**
|
|
290
370
|
* Type-safe interface for contract ${input.name};
|
|
291
371
|
*/
|
|
@@ -306,6 +386,8 @@ export class ${input.name}Contract extends ContractBase {
|
|
|
306
386
|
public override methods!: {
|
|
307
387
|
${methods.join('\n')}
|
|
308
388
|
};
|
|
389
|
+
|
|
390
|
+
${events}
|
|
309
391
|
}
|
|
310
392
|
`;
|
|
311
393
|
}
|