@aztec/stdlib 3.0.0-nightly.20251213 → 3.0.0-nightly.20251216

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.
@@ -21,20 +21,24 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
21
21
  logs: z.ZodArray<z.ZodEffects<z.ZodObject<{
22
22
  id: z.ZodEffects<z.ZodObject<{
23
23
  blockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("../../../foundation/dest/branded-types/block_number.js").BlockNumber, string | number | bigint>;
24
+ blockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, import("../block/block_hash.js").L2BlockHash, string>;
24
25
  txIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
25
26
  logIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
26
27
  }, "strip", z.ZodTypeAny, {
27
28
  blockNumber: number & {
28
29
  _branding: "BlockNumber";
29
30
  };
31
+ blockHash: import("../block/block_hash.js").L2BlockHash;
30
32
  txIndex: number;
31
33
  logIndex: number;
32
34
  }, {
33
35
  blockNumber: string | number | bigint;
36
+ blockHash: string;
34
37
  txIndex: string | number | bigint;
35
38
  logIndex: string | number | bigint;
36
39
  }>, import("../logs/log_id.js").LogId, {
37
40
  blockNumber: string | number | bigint;
41
+ blockHash: string;
38
42
  txIndex: string | number | bigint;
39
43
  logIndex: string | number | bigint;
40
44
  }>;
@@ -45,6 +49,7 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
45
49
  }, {
46
50
  id: {
47
51
  blockNumber: string | number | bigint;
52
+ blockHash: string;
48
53
  txIndex: string | number | bigint;
49
54
  logIndex: string | number | bigint;
50
55
  };
@@ -52,6 +57,7 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
52
57
  }>, ExtendedPublicLog, {
53
58
  id: {
54
59
  blockNumber: string | number | bigint;
60
+ blockHash: string;
55
61
  txIndex: string | number | bigint;
56
62
  logIndex: string | number | bigint;
57
63
  };
@@ -65,6 +71,7 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
65
71
  logs: {
66
72
  id: {
67
73
  blockNumber: string | number | bigint;
74
+ blockHash: string;
68
75
  txIndex: string | number | bigint;
69
76
  logIndex: string | number | bigint;
70
77
  };
@@ -72,4 +79,4 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
72
79
  }[];
73
80
  maxLogsHit: boolean;
74
81
  }>;
75
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2xvZ3NfcmVzcG9uc2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2dldF9sb2dzX3Jlc3BvbnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDbEYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEQsMkRBQTJEO0FBQzNELE1BQU0sTUFBTSw0QkFBNEIsR0FBRztJQUN6QyxxREFBcUQ7SUFDckQsSUFBSSxFQUFFLHdCQUF3QixFQUFFLENBQUM7SUFDakMsNkNBQTZDO0lBQzdDLFVBQVUsRUFBRSxPQUFPLENBQUM7Q0FDckIsQ0FBQztBQUVGLGVBQU8sTUFBTSxrQ0FBa0MsRUFBRSxNQUFNLENBQUMsNEJBQTRCLENBR2xGLENBQUM7QUFFSCxvREFBb0Q7QUFDcEQsTUFBTSxNQUFNLHFCQUFxQixHQUFHO0lBQ2xDLDhDQUE4QztJQUM5QyxJQUFJLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztJQUMxQiw2Q0FBNkM7SUFDN0MsVUFBVSxFQUFFLE9BQU8sQ0FBQztDQUNyQixDQUFDO0FBRUYsZUFBTyxNQUFNLDJCQUEyQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBR0UsQ0FBQyJ9
82
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2xvZ3NfcmVzcG9uc2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2dldF9sb2dzX3Jlc3BvbnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDbEYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEQsMkRBQTJEO0FBQzNELE1BQU0sTUFBTSw0QkFBNEIsR0FBRztJQUN6QyxxREFBcUQ7SUFDckQsSUFBSSxFQUFFLHdCQUF3QixFQUFFLENBQUM7SUFDakMsNkNBQTZDO0lBQzdDLFVBQVUsRUFBRSxPQUFPLENBQUM7Q0FDckIsQ0FBQztBQUVGLGVBQU8sTUFBTSxrQ0FBa0MsRUFBRSxNQUFNLENBQUMsNEJBQTRCLENBR2xGLENBQUM7QUFFSCxvREFBb0Q7QUFDcEQsTUFBTSxNQUFNLHFCQUFxQixHQUFHO0lBQ2xDLDhDQUE4QztJQUM5QyxJQUFJLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztJQUMxQiw2Q0FBNkM7SUFDN0MsVUFBVSxFQUFFLE9BQU8sQ0FBQztDQUNyQixDQUFDO0FBRUYsZUFBTyxNQUFNLDJCQUEyQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQUdFLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"get_logs_response.d.ts","sourceRoot":"","sources":["../../src/interfaces/get_logs_response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,2DAA2D;AAC3D,MAAM,MAAM,4BAA4B,GAAG;IACzC,qDAAqD;IACrD,IAAI,EAAE,wBAAwB,EAAE,CAAC;IACjC,6CAA6C;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,MAAM,CAAC,4BAA4B,CAGlF,CAAC;AAEH,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,GAAG;IAClC,8CAA8C;IAC9C,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC1B,6CAA6C;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGE,CAAC"}
1
+ {"version":3,"file":"get_logs_response.d.ts","sourceRoot":"","sources":["../../src/interfaces/get_logs_response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,2DAA2D;AAC3D,MAAM,MAAM,4BAA4B,GAAG;IACzC,qDAAqD;IACrD,IAAI,EAAE,wBAAwB,EAAE,CAAC;IACjC,6CAA6C;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,MAAM,CAAC,4BAA4B,CAGlF,CAAC;AAEH,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,GAAG;IAClC,8CAA8C;IAC9C,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC1B,6CAA6C;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGE,CAAC"}
@@ -18,20 +18,24 @@ export declare class ExtendedPublicLog {
18
18
  static get schema(): z.ZodEffects<z.ZodObject<{
19
19
  id: z.ZodEffects<z.ZodObject<{
20
20
  blockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("../../../foundation/dest/branded-types/block_number.js").BlockNumber, string | number | bigint>;
21
+ blockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, import("../block/block_hash.js").L2BlockHash, string>;
21
22
  txIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
22
23
  logIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
23
24
  }, "strip", z.ZodTypeAny, {
24
25
  blockNumber: number & {
25
26
  _branding: "BlockNumber";
26
27
  };
28
+ blockHash: import("../block/block_hash.js").L2BlockHash;
27
29
  txIndex: number;
28
30
  logIndex: number;
29
31
  }, {
30
32
  blockNumber: string | number | bigint;
33
+ blockHash: string;
31
34
  txIndex: string | number | bigint;
32
35
  logIndex: string | number | bigint;
33
36
  }>, LogId, {
34
37
  blockNumber: string | number | bigint;
38
+ blockHash: string;
35
39
  txIndex: string | number | bigint;
36
40
  logIndex: string | number | bigint;
37
41
  }>;
@@ -42,6 +46,7 @@ export declare class ExtendedPublicLog {
42
46
  }, {
43
47
  id: {
44
48
  blockNumber: string | number | bigint;
49
+ blockHash: string;
45
50
  txIndex: string | number | bigint;
46
51
  logIndex: string | number | bigint;
47
52
  };
@@ -49,6 +54,7 @@ export declare class ExtendedPublicLog {
49
54
  }>, ExtendedPublicLog, {
50
55
  id: {
51
56
  blockNumber: string | number | bigint;
57
+ blockHash: string;
52
58
  txIndex: string | number | bigint;
53
59
  logIndex: string | number | bigint;
54
60
  };
@@ -89,4 +95,4 @@ export declare class ExtendedPublicLog {
89
95
  */
90
96
  static fromString(data: string): ExtendedPublicLog;
91
97
  }
92
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRfcHVibGljX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvZXh0ZW5kZWRfcHVibGljX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILHFCQUFhLGlCQUFpQjthQUdWLEVBQUUsRUFBRSxLQUFLO2FBRVQsR0FBRyxFQUFFLFNBQVM7SUFKaEM7SUFDRSxxQ0FBcUM7SUFDckIsRUFBRSxFQUFFLEtBQUs7SUFDekIsb0NBQW9DO0lBQ3BCLEdBQUcsRUFBRSxTQUFTLEVBQzVCO0lBRUosT0FBYSxNQUFNLCtCQUVsQjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQU9oQjtJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFFOUM7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVEOzs7T0FHRztJQUNJLFFBQVEsSUFBSSxNQUFNLENBRXhCO0lBRUQ7OztPQUdHO0lBQ0ksZUFBZSxJQUFJLE1BQU0sQ0FFL0I7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLEtBQUssRUFBRSxpQkFBaUIsR0FBRyxPQUFPLENBRS9DO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGlCQUFpQixDQU96RTtJQUVEOzs7O09BSUc7SUFDSCxPQUFjLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLGlCQUFpQixDQUV4RDtDQUNGIn0=
98
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRfcHVibGljX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvZXh0ZW5kZWRfcHVibGljX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILHFCQUFhLGlCQUFpQjthQUdWLEVBQUUsRUFBRSxLQUFLO2FBRVQsR0FBRyxFQUFFLFNBQVM7SUFKaEM7SUFDRSxxQ0FBcUM7SUFDckIsRUFBRSxFQUFFLEtBQUs7SUFDekIsb0NBQW9DO0lBQ3BCLEdBQUcsRUFBRSxTQUFTLEVBQzVCO0lBRUosT0FBYSxNQUFNLCtCQUVsQjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQU9oQjtJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFFOUM7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVEOzs7T0FHRztJQUNJLFFBQVEsSUFBSSxNQUFNLENBRXhCO0lBRUQ7OztPQUdHO0lBQ0ksZUFBZSxJQUFJLE1BQU0sQ0FFL0I7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLEtBQUssRUFBRSxpQkFBaUIsR0FBRyxPQUFPLENBRS9DO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGlCQUFpQixDQU96RTtJQUVEOzs7O09BSUc7SUFDSCxPQUFjLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLGlCQUFpQixDQUV4RDtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"extended_public_log.d.ts","sourceRoot":"","sources":["../../src/logs/extended_public_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,iBAAiB;aAGV,EAAE,EAAE,KAAK;aAET,GAAG,EAAE,SAAS;IAJhC;IACE,qCAAqC;IACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;IACpB,GAAG,EAAE,SAAS,EAC5B;IAEJ,OAAa,MAAM,+BAElB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,qBAE9C;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAExB;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAExB;IAED;;;OAGG;IACI,eAAe,IAAI,MAAM,CAE/B;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAE/C;IAED;;;;OAIG;IACH,OAAc,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAOzE;IAED;;;;OAIG;IACH,OAAc,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAExD;CACF"}
1
+ {"version":3,"file":"extended_public_log.d.ts","sourceRoot":"","sources":["../../src/logs/extended_public_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,iBAAiB;aAGV,EAAE,EAAE,KAAK;aAET,GAAG,EAAE,SAAS;IAJhC;IACE,qCAAqC;IACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;IACpB,GAAG,EAAE,SAAS,EAC5B;IAEJ,OAAa,MAAM,+BAElB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,qBAE9C;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAExB;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAExB;IAED;;;OAGG;IACI,eAAe,IAAI,MAAM,CAE/B;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAE/C;IAED;;;;OAIG;IACH,OAAc,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAOzE;IAED;;;;OAIG;IACH,OAAc,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAExD;CACF"}
@@ -1,9 +1,11 @@
1
1
  import { BlockNumber } from '@aztec/foundation/branded-types';
2
2
  import { BufferReader } from '@aztec/foundation/serialize';
3
3
  import { z } from 'zod';
4
+ import { L2BlockHash } from '../block/block_hash.js';
4
5
  /** A globally unique log id. */
5
6
  export declare class LogId {
6
7
  readonly blockNumber: BlockNumber;
8
+ readonly blockHash: L2BlockHash;
7
9
  readonly txIndex: number;
8
10
  readonly logIndex: number;
9
11
  /**
@@ -15,6 +17,8 @@ export declare class LogId {
15
17
  constructor(
16
18
  /** The block number the log was emitted in. */
17
19
  blockNumber: BlockNumber,
20
+ /** The hash of the block the log was emitted in. */
21
+ blockHash: L2BlockHash,
18
22
  /** The index of a tx in a block the log was emitted in. */
19
23
  txIndex: number,
20
24
  /** The index of a log the tx was emitted in. */
@@ -22,20 +26,24 @@ export declare class LogId {
22
26
  static random(): LogId;
23
27
  static get schema(): z.ZodEffects<z.ZodObject<{
24
28
  blockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
29
+ blockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
25
30
  txIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
26
31
  logIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
27
32
  }, "strip", z.ZodTypeAny, {
28
33
  blockNumber: number & {
29
34
  _branding: "BlockNumber";
30
35
  };
36
+ blockHash: L2BlockHash;
31
37
  txIndex: number;
32
38
  logIndex: number;
33
39
  }, {
34
40
  blockNumber: string | number | bigint;
41
+ blockHash: string;
35
42
  txIndex: string | number | bigint;
36
43
  logIndex: string | number | bigint;
37
44
  }>, LogId, {
38
45
  blockNumber: string | number | bigint;
46
+ blockHash: string;
39
47
  txIndex: string | number | bigint;
40
48
  logIndex: string | number | bigint;
41
49
  }>;
@@ -67,4 +75,4 @@ export declare class LogId {
67
75
  */
68
76
  toHumanReadable(): string;
69
77
  }
70
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX2lkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9sb2dfaWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUl4QixnQ0FBZ0M7QUFDaEMscUJBQWEsS0FBSzthQVNFLFdBQVcsRUFBRSxXQUFXO2FBRXhCLE9BQU8sRUFBRSxNQUFNO2FBRWYsUUFBUSxFQUFFLE1BQU07SUFabEM7Ozs7O09BS0c7SUFDSDtJQUNFLCtDQUErQztJQUMvQixXQUFXLEVBQUUsV0FBVztJQUN4QywyREFBMkQ7SUFDM0MsT0FBTyxFQUFFLE1BQU07SUFDL0IsZ0RBQWdEO0lBQ2hDLFFBQVEsRUFBRSxNQUFNLEVBV2pDO0lBRUQsTUFBTSxDQUFDLE1BQU0sVUFNWjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FRaEI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQU14QjtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLEtBQUssQ0FRdEQ7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsS0FBSyxDQU9yQztJQUVEOzs7T0FHRztJQUNJLGVBQWUsSUFBSSxNQUFNLENBRS9CO0NBQ0YifQ==
78
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX2lkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9sb2dfaWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHckQsZ0NBQWdDO0FBQ2hDLHFCQUFhLEtBQUs7YUFTRSxXQUFXLEVBQUUsV0FBVzthQUV4QixTQUFTLEVBQUUsV0FBVzthQUV0QixPQUFPLEVBQUUsTUFBTTthQUVmLFFBQVEsRUFBRSxNQUFNO0lBZGxDOzs7OztPQUtHO0lBQ0g7SUFDRSwrQ0FBK0M7SUFDL0IsV0FBVyxFQUFFLFdBQVc7SUFDeEMsb0RBQW9EO0lBQ3BDLFNBQVMsRUFBRSxXQUFXO0lBQ3RDLDJEQUEyRDtJQUMzQyxPQUFPLEVBQUUsTUFBTTtJQUMvQixnREFBZ0Q7SUFDaEMsUUFBUSxFQUFFLE1BQU0sRUFXakM7SUFFRCxNQUFNLENBQUMsTUFBTSxVQU9aO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FXaEI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQU94QjtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLEtBQUssQ0FTdEQ7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsS0FBSyxDQVFyQztJQUVEOzs7T0FHRztJQUNJLGVBQWUsSUFBSSxNQUFNLENBRS9CO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"log_id.d.ts","sourceRoot":"","sources":["../../src/logs/log_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,gCAAgC;AAChC,qBAAa,KAAK;aASE,WAAW,EAAE,WAAW;aAExB,OAAO,EAAE,MAAM;aAEf,QAAQ,EAAE,MAAM;IAZlC;;;;;OAKG;IACH;IACE,+CAA+C;IAC/B,WAAW,EAAE,WAAW;IACxC,2DAA2D;IAC3C,OAAO,EAAE,MAAM;IAC/B,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAWjC;IAED,MAAM,CAAC,MAAM,UAMZ;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAMxB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK,CAQtD;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAExB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAOrC;IAED;;;OAGG;IACI,eAAe,IAAI,MAAM,CAE/B;CACF"}
1
+ {"version":3,"file":"log_id.d.ts","sourceRoot":"","sources":["../../src/logs/log_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,gCAAgC;AAChC,qBAAa,KAAK;aASE,WAAW,EAAE,WAAW;aAExB,SAAS,EAAE,WAAW;aAEtB,OAAO,EAAE,MAAM;aAEf,QAAQ,EAAE,MAAM;IAdlC;;;;;OAKG;IACH;IACE,+CAA+C;IAC/B,WAAW,EAAE,WAAW;IACxC,oDAAoD;IACpC,SAAS,EAAE,WAAW;IACtC,2DAA2D;IAC3C,OAAO,EAAE,MAAM;IAC/B,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAWjC;IAED,MAAM,CAAC,MAAM,UAOZ;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;OAWhB;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAOxB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK,CAStD;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM,CAExB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAQrC;IAED;;;OAGG;IACI,eAAe,IAAI,MAAM,CAE/B;CACF"}
@@ -3,9 +3,11 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer';
3
3
  import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
4
4
  import { BufferReader } from '@aztec/foundation/serialize';
5
5
  import { z } from 'zod';
6
+ import { L2BlockHash } from '../block/block_hash.js';
6
7
  import { schemas } from '../schemas/index.js';
7
8
  /** A globally unique log id. */ export class LogId {
8
9
  blockNumber;
10
+ blockHash;
9
11
  txIndex;
10
12
  logIndex;
11
13
  /**
@@ -13,8 +15,9 @@ import { schemas } from '../schemas/index.js';
13
15
  * @param blockNumber - The block number.
14
16
  * @param txIndex - The transaction index.
15
17
  * @param logIndex - The log index.
16
- */ constructor(/** The block number the log was emitted in. */ blockNumber, /** The index of a tx in a block the log was emitted in. */ txIndex, /** The index of a log the tx was emitted in. */ logIndex){
18
+ */ constructor(/** The block number the log was emitted in. */ blockNumber, /** The hash of the block the log was emitted in. */ blockHash, /** The index of a tx in a block the log was emitted in. */ txIndex, /** The index of a log the tx was emitted in. */ logIndex){
17
19
  this.blockNumber = blockNumber;
20
+ this.blockHash = blockHash;
18
21
  this.txIndex = txIndex;
19
22
  this.logIndex = logIndex;
20
23
  if (!Number.isInteger(blockNumber) || blockNumber < INITIAL_L2_BLOCK_NUM) {
@@ -28,14 +31,15 @@ import { schemas } from '../schemas/index.js';
28
31
  }
29
32
  }
30
33
  static random() {
31
- return new LogId(BlockNumber(Math.floor(Math.random() * 1000) + 1), Math.floor(Math.random() * 1000), Math.floor(Math.random() * 100));
34
+ return new LogId(BlockNumber(Math.floor(Math.random() * 1000) + 1), L2BlockHash.random(), Math.floor(Math.random() * 1000), Math.floor(Math.random() * 100));
32
35
  }
33
36
  static get schema() {
34
37
  return z.object({
35
38
  blockNumber: BlockNumberSchema,
39
+ blockHash: L2BlockHash.schema,
36
40
  txIndex: schemas.Integer,
37
41
  logIndex: schemas.Integer
38
- }).transform(({ blockNumber, txIndex, logIndex })=>new LogId(blockNumber, txIndex, logIndex));
42
+ }).transform(({ blockNumber, blockHash, txIndex, logIndex })=>new LogId(blockNumber, blockHash, txIndex, logIndex));
39
43
  }
40
44
  /**
41
45
  * Serializes log id to a buffer.
@@ -43,6 +47,7 @@ import { schemas } from '../schemas/index.js';
43
47
  */ toBuffer() {
44
48
  return Buffer.concat([
45
49
  toBufferBE(BigInt(this.blockNumber), 4),
50
+ this.blockHash.toBuffer(),
46
51
  toBufferBE(BigInt(this.txIndex), 4),
47
52
  toBufferBE(BigInt(this.logIndex), 4)
48
53
  ]);
@@ -54,31 +59,33 @@ import { schemas } from '../schemas/index.js';
54
59
  */ static fromBuffer(buffer) {
55
60
  const reader = BufferReader.asReader(buffer);
56
61
  const blockNumber = BlockNumber(reader.readNumber());
62
+ const blockHash = reader.readObject(L2BlockHash);
57
63
  const txIndex = reader.readNumber();
58
64
  const logIndex = reader.readNumber();
59
- return new LogId(blockNumber, txIndex, logIndex);
65
+ return new LogId(blockNumber, blockHash, txIndex, logIndex);
60
66
  }
61
67
  /**
62
68
  * Converts the LogId instance to a string.
63
69
  * @returns A string representation of the log id.
64
70
  */ toString() {
65
- return `${this.blockNumber}-${this.txIndex}-${this.logIndex}`;
71
+ return `${this.blockNumber}-${this.txIndex}-${this.logIndex}-${this.blockHash.toString()}`;
66
72
  }
67
73
  /**
68
74
  * Creates a LogId from a string.
69
75
  * @param data - A string representation of a log id.
70
76
  * @returns A log id.
71
77
  */ static fromString(data) {
72
- const [rawBlockNumber, rawTxIndex, rawLogIndex] = data.split('-');
78
+ const [rawBlockNumber, rawTxIndex, rawLogIndex, rawBlockHash] = data.split('-');
73
79
  const blockNumber = BlockNumber(Number(rawBlockNumber));
80
+ const blockHash = L2BlockHash.fromString(rawBlockHash);
74
81
  const txIndex = Number(rawTxIndex);
75
82
  const logIndex = Number(rawLogIndex);
76
- return new LogId(blockNumber, txIndex, logIndex);
83
+ return new LogId(blockNumber, blockHash, txIndex, logIndex);
77
84
  }
78
85
  /**
79
86
  * Serializes log id to a human readable string.
80
87
  * @returns A human readable representation of the log id.
81
88
  */ toHumanReadable() {
82
- return `logId: (blockNumber: ${this.blockNumber}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
89
+ return `logId: (blockNumber: ${this.blockNumber}, blockHash: ${this.blockHash.toString()}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
83
90
  }
84
91
  }
@@ -1,5 +1,6 @@
1
1
  import { BlockNumber } from '@aztec/foundation/branded-types';
2
2
  import { z } from 'zod';
3
+ import { L2BlockHash } from '../block/block_hash.js';
3
4
  import { TxHash } from '../tx/tx_hash.js';
4
5
  import { PrivateLog } from './private_log.js';
5
6
  import { PublicLog } from './public_log.js';
@@ -8,14 +9,16 @@ export declare class TxScopedL2Log {
8
9
  dataStartIndexForTx: number;
9
10
  logIndexInTx: number;
10
11
  blockNumber: BlockNumber;
12
+ blockHash: L2BlockHash;
11
13
  log: PrivateLog | PublicLog;
12
- constructor(txHash: TxHash, dataStartIndexForTx: number, logIndexInTx: number, blockNumber: BlockNumber, log: PrivateLog | PublicLog);
14
+ constructor(txHash: TxHash, dataStartIndexForTx: number, logIndexInTx: number, blockNumber: BlockNumber, blockHash: L2BlockHash, log: PrivateLog | PublicLog);
13
15
  get isFromPublic(): boolean;
14
16
  static get schema(): z.ZodEffects<z.ZodObject<{
15
17
  txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>;
16
18
  dataStartIndexForTx: z.ZodNumber;
17
19
  logIndexInTx: z.ZodNumber;
18
20
  blockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
21
+ blockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
19
22
  log: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
20
23
  fields: z.ZodArray<z.ZodType<import("../../../foundation/dest/schemas/schemas.js").Fr, any, string>, "many">;
21
24
  emittedLength: z.ZodNumber;
@@ -36,18 +39,21 @@ export declare class TxScopedL2Log {
36
39
  blockNumber: number & {
37
40
  _branding: "BlockNumber";
38
41
  };
42
+ blockHash: L2BlockHash;
39
43
  log: PrivateLog | PublicLog;
40
44
  }, {
41
45
  txHash: string;
42
46
  dataStartIndexForTx: number;
43
47
  logIndexInTx: number;
44
48
  blockNumber: string | number | bigint;
49
+ blockHash: string;
45
50
  log?: any;
46
51
  }>, TxScopedL2Log, {
47
52
  txHash: string;
48
53
  dataStartIndexForTx: number;
49
54
  logIndexInTx: number;
50
55
  blockNumber: string | number | bigint;
56
+ blockHash: string;
51
57
  log?: any;
52
58
  }>;
53
59
  toBuffer(): Buffer<ArrayBuffer>;
@@ -55,4 +61,4 @@ export declare class TxScopedL2Log {
55
61
  static random(isFromPublic?: boolean): Promise<TxScopedL2Log>;
56
62
  equals(other: TxScopedL2Log): boolean;
57
63
  }
58
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc2NvcGVkX2wyX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvdHhfc2NvcGVkX2wyX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBR2pGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHNUMscUJBQWEsYUFBYTtJQUtmLE1BQU0sRUFBRSxNQUFNO0lBS2QsbUJBQW1CLEVBQUUsTUFBTTtJQUszQixZQUFZLEVBQUUsTUFBTTtJQUlwQixXQUFXLEVBQUUsV0FBVztJQUl4QixHQUFHLEVBQUUsVUFBVSxHQUFHLFNBQVM7SUF0QnBDLFlBSVMsTUFBTSxFQUFFLE1BQU0sRUFLZCxtQkFBbUIsRUFBRSxNQUFNLEVBSzNCLFlBQVksRUFBRSxNQUFNLEVBSXBCLFdBQVcsRUFBRSxXQUFXLEVBSXhCLEdBQUcsRUFBRSxVQUFVLEdBQUcsU0FBUyxFQUNoQztJQUVKLElBQUksWUFBWSxZQUVmO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BYWhCO0lBRUQsUUFBUSx3QkFVUDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0saUJBVS9CO0lBRUQsT0FBYSxNQUFNLENBQUMsWUFBWSxVQUFzQiwwQkFHckQ7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLGFBQWEsV0FVMUI7Q0FDRiJ9
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc2NvcGVkX2wyX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvdHhfc2NvcGVkX2wyX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBR2pGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRzVDLHFCQUFhLGFBQWE7SUFLZixNQUFNLEVBQUUsTUFBTTtJQUtkLG1CQUFtQixFQUFFLE1BQU07SUFLM0IsWUFBWSxFQUFFLE1BQU07SUFJcEIsV0FBVyxFQUFFLFdBQVc7SUFJeEIsU0FBUyxFQUFFLFdBQVc7SUFJdEIsR0FBRyxFQUFFLFVBQVUsR0FBRyxTQUFTO0lBMUJwQyxZQUlTLE1BQU0sRUFBRSxNQUFNLEVBS2QsbUJBQW1CLEVBQUUsTUFBTSxFQUszQixZQUFZLEVBQUUsTUFBTSxFQUlwQixXQUFXLEVBQUUsV0FBVyxFQUl4QixTQUFTLEVBQUUsV0FBVyxFQUl0QixHQUFHLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDaEM7SUFFSixJQUFJLFlBQVksWUFFZjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FjaEI7SUFFRCxRQUFRLHdCQVVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxpQkFXL0I7SUFFRCxPQUFhLE1BQU0sQ0FBQyxZQUFZLFVBQXNCLDBCQUdyRDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsYUFBYSxXQVcxQjtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAGjF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAK3B,YAAY,EAAE,MAAM;IAIpB,WAAW,EAAE,WAAW;IAIxB,GAAG,EAAE,UAAU,GAAG,SAAS;IAtBpC,YAIS,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAK3B,YAAY,EAAE,MAAM,EAIpB,WAAW,EAAE,WAAW,EAIxB,GAAG,EAAE,UAAU,GAAG,SAAS,EAChC;IAEJ,IAAI,YAAY,YAEf;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ,wBAUP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,iBAU/B;IAED,OAAa,MAAM,CAAC,YAAY,UAAsB,0BAGrD;IAED,MAAM,CAAC,KAAK,EAAE,aAAa,WAU1B;CACF"}
1
+ {"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAGjF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAK3B,YAAY,EAAE,MAAM;IAIpB,WAAW,EAAE,WAAW;IAIxB,SAAS,EAAE,WAAW;IAItB,GAAG,EAAE,UAAU,GAAG,SAAS;IA1BpC,YAIS,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAK3B,YAAY,EAAE,MAAM,EAIpB,WAAW,EAAE,WAAW,EAIxB,SAAS,EAAE,WAAW,EAItB,GAAG,EAAE,UAAU,GAAG,SAAS,EAChC;IAEJ,IAAI,YAAY,YAEf;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAchB;IAED,QAAQ,wBAUP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,iBAW/B;IAED,OAAa,MAAM,CAAC,YAAY,UAAsB,0BAGrD;IAED,MAAM,CAAC,KAAK,EAAE,aAAa,WAW1B;CACF"}
@@ -1,6 +1,7 @@
1
1
  import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
2
2
  import { BufferReader, boolToBuffer, numToUInt32BE } from '@aztec/foundation/serialize';
3
3
  import { z } from 'zod';
4
+ import { L2BlockHash } from '../block/block_hash.js';
4
5
  import { TxHash } from '../tx/tx_hash.js';
5
6
  import { PrivateLog } from './private_log.js';
6
7
  import { PublicLog } from './public_log.js';
@@ -10,6 +11,7 @@ export class TxScopedL2Log {
10
11
  dataStartIndexForTx;
11
12
  logIndexInTx;
12
13
  blockNumber;
14
+ blockHash;
13
15
  log;
14
16
  constructor(/*
15
17
  * Hash of the tx where the log is included
@@ -22,12 +24,15 @@ export class TxScopedL2Log {
22
24
  */ logIndexInTx, /*
23
25
  * The block this log is included in
24
26
  */ blockNumber, /*
27
+ * The block this log is included in
28
+ */ blockHash, /*
25
29
  * The log data as either a PrivateLog or PublicLog
26
30
  */ log){
27
31
  this.txHash = txHash;
28
32
  this.dataStartIndexForTx = dataStartIndexForTx;
29
33
  this.logIndexInTx = logIndexInTx;
30
34
  this.blockNumber = blockNumber;
35
+ this.blockHash = blockHash;
31
36
  this.log = log;
32
37
  }
33
38
  get isFromPublic() {
@@ -39,20 +44,21 @@ export class TxScopedL2Log {
39
44
  dataStartIndexForTx: z.number(),
40
45
  logIndexInTx: z.number(),
41
46
  blockNumber: BlockNumberSchema,
47
+ blockHash: L2BlockHash.schema,
42
48
  log: z.union([
43
49
  PrivateLog.schema,
44
50
  PublicLog.schema
45
51
  ])
46
- }).transform(({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log })=>new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log));
52
+ }).transform(({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, blockHash, log })=>new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, blockHash, log));
47
53
  }
48
54
  toBuffer() {
49
- const isFromPublic = this.log instanceof PublicLog;
50
55
  return Buffer.concat([
51
56
  this.txHash.toBuffer(),
52
57
  numToUInt32BE(this.dataStartIndexForTx),
53
58
  numToUInt32BE(this.logIndexInTx),
54
59
  numToUInt32BE(this.blockNumber),
55
- boolToBuffer(isFromPublic),
60
+ this.blockHash.toBuffer(),
61
+ boolToBuffer(this.isFromPublic),
56
62
  this.log.toBuffer()
57
63
  ]);
58
64
  }
@@ -62,15 +68,16 @@ export class TxScopedL2Log {
62
68
  const dataStartIndexForTx = reader.readNumber();
63
69
  const logIndexInTx = reader.readNumber();
64
70
  const blockNumber = BlockNumber(reader.readNumber());
71
+ const blockHash = reader.readObject(L2BlockHash);
65
72
  const isFromPublic = reader.readBoolean();
66
73
  const log = isFromPublic ? PublicLog.fromBuffer(reader) : PrivateLog.fromBuffer(reader);
67
- return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log);
74
+ return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, blockHash, log);
68
75
  }
69
76
  static async random(isFromPublic = Math.random() < 0.5) {
70
77
  const log = isFromPublic ? await PublicLog.random() : PrivateLog.random();
71
- return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1), log);
78
+ return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1), L2BlockHash.random(), log);
72
79
  }
73
80
  equals(other) {
74
- return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.logIndexInTx === other.logIndexInTx && this.blockNumber === other.blockNumber && (this.log instanceof PublicLog && other.log instanceof PublicLog || this.log instanceof PrivateLog && other.log instanceof PrivateLog) && this.log.equals(other.log);
81
+ return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.logIndexInTx === other.logIndexInTx && this.blockNumber === other.blockNumber && this.blockHash.equals(other.blockHash) && (this.log instanceof PublicLog && other.log instanceof PublicLog || this.log instanceof PrivateLog && other.log instanceof PrivateLog) && this.log.equals(other.log);
75
82
  }
76
83
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/stdlib",
3
- "version": "3.0.0-nightly.20251213",
3
+ "version": "3.0.0-nightly.20251216",
4
4
  "type": "module",
5
5
  "inherits": [
6
6
  "../package.common.json",
@@ -77,13 +77,13 @@
77
77
  },
78
78
  "dependencies": {
79
79
  "@aws-sdk/client-s3": "^3.892.0",
80
- "@aztec/bb.js": "3.0.0-nightly.20251213",
81
- "@aztec/blob-lib": "3.0.0-nightly.20251213",
82
- "@aztec/constants": "3.0.0-nightly.20251213",
83
- "@aztec/ethereum": "3.0.0-nightly.20251213",
84
- "@aztec/foundation": "3.0.0-nightly.20251213",
85
- "@aztec/l1-artifacts": "3.0.0-nightly.20251213",
86
- "@aztec/noir-noirc_abi": "3.0.0-nightly.20251213",
80
+ "@aztec/bb.js": "3.0.0-nightly.20251216",
81
+ "@aztec/blob-lib": "3.0.0-nightly.20251216",
82
+ "@aztec/constants": "3.0.0-nightly.20251216",
83
+ "@aztec/ethereum": "3.0.0-nightly.20251216",
84
+ "@aztec/foundation": "3.0.0-nightly.20251216",
85
+ "@aztec/l1-artifacts": "3.0.0-nightly.20251216",
86
+ "@aztec/noir-noirc_abi": "3.0.0-nightly.20251216",
87
87
  "@google-cloud/storage": "^7.15.0",
88
88
  "axios": "^1.12.0",
89
89
  "json-stringify-deterministic": "1.0.12",
@@ -5,6 +5,7 @@ import { BufferReader } from '@aztec/foundation/serialize';
5
5
 
6
6
  import { z } from 'zod';
7
7
 
8
+ import { L2BlockHash } from '../block/block_hash.js';
8
9
  import { schemas } from '../schemas/index.js';
9
10
 
10
11
  /** A globally unique log id. */
@@ -18,6 +19,8 @@ export class LogId {
18
19
  constructor(
19
20
  /** The block number the log was emitted in. */
20
21
  public readonly blockNumber: BlockNumber,
22
+ /** The hash of the block the log was emitted in. */
23
+ public readonly blockHash: L2BlockHash,
21
24
  /** The index of a tx in a block the log was emitted in. */
22
25
  public readonly txIndex: number,
23
26
  /** The index of a log the tx was emitted in. */
@@ -37,6 +40,7 @@ export class LogId {
37
40
  static random() {
38
41
  return new LogId(
39
42
  BlockNumber(Math.floor(Math.random() * 1000) + 1),
43
+ L2BlockHash.random(),
40
44
  Math.floor(Math.random() * 1000),
41
45
  Math.floor(Math.random() * 100),
42
46
  );
@@ -46,10 +50,13 @@ export class LogId {
46
50
  return z
47
51
  .object({
48
52
  blockNumber: BlockNumberSchema,
53
+ blockHash: L2BlockHash.schema,
49
54
  txIndex: schemas.Integer,
50
55
  logIndex: schemas.Integer,
51
56
  })
52
- .transform(({ blockNumber, txIndex, logIndex }) => new LogId(blockNumber, txIndex, logIndex));
57
+ .transform(
58
+ ({ blockNumber, blockHash, txIndex, logIndex }) => new LogId(blockNumber, blockHash, txIndex, logIndex),
59
+ );
53
60
  }
54
61
 
55
62
  /**
@@ -59,6 +66,7 @@ export class LogId {
59
66
  public toBuffer(): Buffer {
60
67
  return Buffer.concat([
61
68
  toBufferBE(BigInt(this.blockNumber), 4),
69
+ this.blockHash.toBuffer(),
62
70
  toBufferBE(BigInt(this.txIndex), 4),
63
71
  toBufferBE(BigInt(this.logIndex), 4),
64
72
  ]);
@@ -73,10 +81,11 @@ export class LogId {
73
81
  const reader = BufferReader.asReader(buffer);
74
82
 
75
83
  const blockNumber = BlockNumber(reader.readNumber());
84
+ const blockHash = reader.readObject(L2BlockHash);
76
85
  const txIndex = reader.readNumber();
77
86
  const logIndex = reader.readNumber();
78
87
 
79
- return new LogId(blockNumber, txIndex, logIndex);
88
+ return new LogId(blockNumber, blockHash, txIndex, logIndex);
80
89
  }
81
90
 
82
91
  /**
@@ -84,7 +93,7 @@ export class LogId {
84
93
  * @returns A string representation of the log id.
85
94
  */
86
95
  public toString(): string {
87
- return `${this.blockNumber}-${this.txIndex}-${this.logIndex}`;
96
+ return `${this.blockNumber}-${this.txIndex}-${this.logIndex}-${this.blockHash.toString()}`;
88
97
  }
89
98
 
90
99
  /**
@@ -93,12 +102,13 @@ export class LogId {
93
102
  * @returns A log id.
94
103
  */
95
104
  static fromString(data: string): LogId {
96
- const [rawBlockNumber, rawTxIndex, rawLogIndex] = data.split('-');
105
+ const [rawBlockNumber, rawTxIndex, rawLogIndex, rawBlockHash] = data.split('-');
97
106
  const blockNumber = BlockNumber(Number(rawBlockNumber));
107
+ const blockHash = L2BlockHash.fromString(rawBlockHash);
98
108
  const txIndex = Number(rawTxIndex);
99
109
  const logIndex = Number(rawLogIndex);
100
110
 
101
- return new LogId(blockNumber, txIndex, logIndex);
111
+ return new LogId(blockNumber, blockHash, txIndex, logIndex);
102
112
  }
103
113
 
104
114
  /**
@@ -106,6 +116,6 @@ export class LogId {
106
116
  * @returns A human readable representation of the log id.
107
117
  */
108
118
  public toHumanReadable(): string {
109
- return `logId: (blockNumber: ${this.blockNumber}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
119
+ return `logId: (blockNumber: ${this.blockNumber}, blockHash: ${this.blockHash.toString()}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
110
120
  }
111
121
  }
@@ -3,6 +3,7 @@ import { BufferReader, boolToBuffer, numToUInt32BE } from '@aztec/foundation/ser
3
3
 
4
4
  import { z } from 'zod';
5
5
 
6
+ import { L2BlockHash } from '../block/block_hash.js';
6
7
  import { TxHash } from '../tx/tx_hash.js';
7
8
  import { PrivateLog } from './private_log.js';
8
9
  import { PublicLog } from './public_log.js';
@@ -28,6 +29,10 @@ export class TxScopedL2Log {
28
29
  * The block this log is included in
29
30
  */
30
31
  public blockNumber: BlockNumber,
32
+ /*
33
+ * The block this log is included in
34
+ */
35
+ public blockHash: L2BlockHash,
31
36
  /*
32
37
  * The log data as either a PrivateLog or PublicLog
33
38
  */
@@ -45,22 +50,23 @@ export class TxScopedL2Log {
45
50
  dataStartIndexForTx: z.number(),
46
51
  logIndexInTx: z.number(),
47
52
  blockNumber: BlockNumberSchema,
53
+ blockHash: L2BlockHash.schema,
48
54
  log: z.union([PrivateLog.schema, PublicLog.schema]),
49
55
  })
50
56
  .transform(
51
- ({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log }) =>
52
- new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log),
57
+ ({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, blockHash, log }) =>
58
+ new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, blockHash, log),
53
59
  );
54
60
  }
55
61
 
56
62
  toBuffer() {
57
- const isFromPublic = this.log instanceof PublicLog;
58
63
  return Buffer.concat([
59
64
  this.txHash.toBuffer(),
60
65
  numToUInt32BE(this.dataStartIndexForTx),
61
66
  numToUInt32BE(this.logIndexInTx),
62
67
  numToUInt32BE(this.blockNumber),
63
- boolToBuffer(isFromPublic),
68
+ this.blockHash.toBuffer(),
69
+ boolToBuffer(this.isFromPublic),
64
70
  this.log.toBuffer(),
65
71
  ]);
66
72
  }
@@ -71,15 +77,16 @@ export class TxScopedL2Log {
71
77
  const dataStartIndexForTx = reader.readNumber();
72
78
  const logIndexInTx = reader.readNumber();
73
79
  const blockNumber = BlockNumber(reader.readNumber());
80
+ const blockHash = reader.readObject(L2BlockHash);
74
81
  const isFromPublic = reader.readBoolean();
75
82
  const log = isFromPublic ? PublicLog.fromBuffer(reader) : PrivateLog.fromBuffer(reader);
76
83
 
77
- return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log);
84
+ return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, blockHash, log);
78
85
  }
79
86
 
80
87
  static async random(isFromPublic = Math.random() < 0.5) {
81
88
  const log = isFromPublic ? await PublicLog.random() : PrivateLog.random();
82
- return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1), log);
89
+ return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1), L2BlockHash.random(), log);
83
90
  }
84
91
 
85
92
  equals(other: TxScopedL2Log) {
@@ -88,6 +95,7 @@ export class TxScopedL2Log {
88
95
  this.dataStartIndexForTx === other.dataStartIndexForTx &&
89
96
  this.logIndexInTx === other.logIndexInTx &&
90
97
  this.blockNumber === other.blockNumber &&
98
+ this.blockHash.equals(other.blockHash) &&
91
99
  ((this.log instanceof PublicLog && other.log instanceof PublicLog) ||
92
100
  (this.log instanceof PrivateLog && other.log instanceof PrivateLog)) &&
93
101
  this.log.equals(other.log as any)