@aztec/stdlib 3.0.0-nightly.20251216 → 3.0.0-rc.2
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/dest/interfaces/get_logs_response.d.ts +1 -8
- package/dest/interfaces/get_logs_response.d.ts.map +1 -1
- package/dest/logs/extended_public_log.d.ts +1 -7
- package/dest/logs/extended_public_log.d.ts.map +1 -1
- package/dest/logs/log_id.d.ts +1 -9
- package/dest/logs/log_id.d.ts.map +1 -1
- package/dest/logs/log_id.js +8 -15
- package/dest/logs/tx_scoped_l2_log.d.ts +2 -8
- package/dest/logs/tx_scoped_l2_log.d.ts.map +1 -1
- package/dest/logs/tx_scoped_l2_log.js +6 -13
- package/package.json +8 -8
- package/src/logs/log_id.ts +6 -16
- package/src/logs/tx_scoped_l2_log.ts +6 -14
|
@@ -21,24 +21,20 @@ 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>;
|
|
25
24
|
txIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
26
25
|
logIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
27
26
|
}, "strip", z.ZodTypeAny, {
|
|
28
27
|
blockNumber: number & {
|
|
29
28
|
_branding: "BlockNumber";
|
|
30
29
|
};
|
|
31
|
-
blockHash: import("../block/block_hash.js").L2BlockHash;
|
|
32
30
|
txIndex: number;
|
|
33
31
|
logIndex: number;
|
|
34
32
|
}, {
|
|
35
33
|
blockNumber: string | number | bigint;
|
|
36
|
-
blockHash: string;
|
|
37
34
|
txIndex: string | number | bigint;
|
|
38
35
|
logIndex: string | number | bigint;
|
|
39
36
|
}>, import("../logs/log_id.js").LogId, {
|
|
40
37
|
blockNumber: string | number | bigint;
|
|
41
|
-
blockHash: string;
|
|
42
38
|
txIndex: string | number | bigint;
|
|
43
39
|
logIndex: string | number | bigint;
|
|
44
40
|
}>;
|
|
@@ -49,7 +45,6 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
|
|
|
49
45
|
}, {
|
|
50
46
|
id: {
|
|
51
47
|
blockNumber: string | number | bigint;
|
|
52
|
-
blockHash: string;
|
|
53
48
|
txIndex: string | number | bigint;
|
|
54
49
|
logIndex: string | number | bigint;
|
|
55
50
|
};
|
|
@@ -57,7 +52,6 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
|
|
|
57
52
|
}>, ExtendedPublicLog, {
|
|
58
53
|
id: {
|
|
59
54
|
blockNumber: string | number | bigint;
|
|
60
|
-
blockHash: string;
|
|
61
55
|
txIndex: string | number | bigint;
|
|
62
56
|
logIndex: string | number | bigint;
|
|
63
57
|
};
|
|
@@ -71,7 +65,6 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
|
|
|
71
65
|
logs: {
|
|
72
66
|
id: {
|
|
73
67
|
blockNumber: string | number | bigint;
|
|
74
|
-
blockHash: string;
|
|
75
68
|
txIndex: string | number | bigint;
|
|
76
69
|
logIndex: string | number | bigint;
|
|
77
70
|
};
|
|
@@ -79,4 +72,4 @@ export declare const GetPublicLogsResponseSchema: z.ZodObject<{
|
|
|
79
72
|
}[];
|
|
80
73
|
maxLogsHit: boolean;
|
|
81
74
|
}>;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2xvZ3NfcmVzcG9uc2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2dldF9sb2dzX3Jlc3BvbnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDbEYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEQsMkRBQTJEO0FBQzNELE1BQU0sTUFBTSw0QkFBNEIsR0FBRztJQUN6QyxxREFBcUQ7SUFDckQsSUFBSSxFQUFFLHdCQUF3QixFQUFFLENBQUM7SUFDakMsNkNBQTZDO0lBQzdDLFVBQVUsRUFBRSxPQUFPLENBQUM7Q0FDckIsQ0FBQztBQUVGLGVBQU8sTUFBTSxrQ0FBa0MsRUFBRSxNQUFNLENBQUMsNEJBQTRCLENBR2xGLENBQUM7QUFFSCxvREFBb0Q7QUFDcEQsTUFBTSxNQUFNLHFCQUFxQixHQUFHO0lBQ2xDLDhDQUE4QztJQUM5QyxJQUFJLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztJQUMxQiw2Q0FBNkM7SUFDN0MsVUFBVSxFQUFFLE9BQU8sQ0FBQztDQUNyQixDQUFDO0FBRUYsZUFBTyxNQUFNLDJCQUEyQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBR0UsQ0FBQyJ9
|
|
@@ -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
|
|
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,24 +18,20 @@ 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>;
|
|
22
21
|
txIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
23
22
|
logIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
24
23
|
}, "strip", z.ZodTypeAny, {
|
|
25
24
|
blockNumber: number & {
|
|
26
25
|
_branding: "BlockNumber";
|
|
27
26
|
};
|
|
28
|
-
blockHash: import("../block/block_hash.js").L2BlockHash;
|
|
29
27
|
txIndex: number;
|
|
30
28
|
logIndex: number;
|
|
31
29
|
}, {
|
|
32
30
|
blockNumber: string | number | bigint;
|
|
33
|
-
blockHash: string;
|
|
34
31
|
txIndex: string | number | bigint;
|
|
35
32
|
logIndex: string | number | bigint;
|
|
36
33
|
}>, LogId, {
|
|
37
34
|
blockNumber: string | number | bigint;
|
|
38
|
-
blockHash: string;
|
|
39
35
|
txIndex: string | number | bigint;
|
|
40
36
|
logIndex: string | number | bigint;
|
|
41
37
|
}>;
|
|
@@ -46,7 +42,6 @@ export declare class ExtendedPublicLog {
|
|
|
46
42
|
}, {
|
|
47
43
|
id: {
|
|
48
44
|
blockNumber: string | number | bigint;
|
|
49
|
-
blockHash: string;
|
|
50
45
|
txIndex: string | number | bigint;
|
|
51
46
|
logIndex: string | number | bigint;
|
|
52
47
|
};
|
|
@@ -54,7 +49,6 @@ export declare class ExtendedPublicLog {
|
|
|
54
49
|
}>, ExtendedPublicLog, {
|
|
55
50
|
id: {
|
|
56
51
|
blockNumber: string | number | bigint;
|
|
57
|
-
blockHash: string;
|
|
58
52
|
txIndex: string | number | bigint;
|
|
59
53
|
logIndex: string | number | bigint;
|
|
60
54
|
};
|
|
@@ -95,4 +89,4 @@ export declare class ExtendedPublicLog {
|
|
|
95
89
|
*/
|
|
96
90
|
static fromString(data: string): ExtendedPublicLog;
|
|
97
91
|
}
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kZWRfcHVibGljX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvZXh0ZW5kZWRfcHVibGljX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILHFCQUFhLGlCQUFpQjthQUdWLEVBQUUsRUFBRSxLQUFLO2FBRVQsR0FBRyxFQUFFLFNBQVM7SUFKaEM7SUFDRSxxQ0FBcUM7SUFDckIsRUFBRSxFQUFFLEtBQUs7SUFDekIsb0NBQW9DO0lBQ3BCLEdBQUcsRUFBRSxTQUFTLEVBQzVCO0lBRUosT0FBYSxNQUFNLCtCQUVsQjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQU9oQjtJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFFOUM7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVEOzs7T0FHRztJQUNJLFFBQVEsSUFBSSxNQUFNLENBRXhCO0lBRUQ7OztPQUdHO0lBQ0ksZUFBZSxJQUFJLE1BQU0sQ0FFL0I7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLEtBQUssRUFBRSxpQkFBaUIsR0FBRyxPQUFPLENBRS9DO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGlCQUFpQixDQU96RTtJQUVEOzs7O09BSUc7SUFDSCxPQUFjLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLGlCQUFpQixDQUV4RDtDQUNGIn0=
|
|
@@ -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
|
|
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"}
|
package/dest/logs/log_id.d.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
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';
|
|
5
4
|
/** A globally unique log id. */
|
|
6
5
|
export declare class LogId {
|
|
7
6
|
readonly blockNumber: BlockNumber;
|
|
8
|
-
readonly blockHash: L2BlockHash;
|
|
9
7
|
readonly txIndex: number;
|
|
10
8
|
readonly logIndex: number;
|
|
11
9
|
/**
|
|
@@ -17,8 +15,6 @@ export declare class LogId {
|
|
|
17
15
|
constructor(
|
|
18
16
|
/** The block number the log was emitted in. */
|
|
19
17
|
blockNumber: BlockNumber,
|
|
20
|
-
/** The hash of the block the log was emitted in. */
|
|
21
|
-
blockHash: L2BlockHash,
|
|
22
18
|
/** The index of a tx in a block the log was emitted in. */
|
|
23
19
|
txIndex: number,
|
|
24
20
|
/** The index of a log the tx was emitted in. */
|
|
@@ -26,24 +22,20 @@ export declare class LogId {
|
|
|
26
22
|
static random(): LogId;
|
|
27
23
|
static get schema(): z.ZodEffects<z.ZodObject<{
|
|
28
24
|
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>;
|
|
30
25
|
txIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
31
26
|
logIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
32
27
|
}, "strip", z.ZodTypeAny, {
|
|
33
28
|
blockNumber: number & {
|
|
34
29
|
_branding: "BlockNumber";
|
|
35
30
|
};
|
|
36
|
-
blockHash: L2BlockHash;
|
|
37
31
|
txIndex: number;
|
|
38
32
|
logIndex: number;
|
|
39
33
|
}, {
|
|
40
34
|
blockNumber: string | number | bigint;
|
|
41
|
-
blockHash: string;
|
|
42
35
|
txIndex: string | number | bigint;
|
|
43
36
|
logIndex: string | number | bigint;
|
|
44
37
|
}>, LogId, {
|
|
45
38
|
blockNumber: string | number | bigint;
|
|
46
|
-
blockHash: string;
|
|
47
39
|
txIndex: string | number | bigint;
|
|
48
40
|
logIndex: string | number | bigint;
|
|
49
41
|
}>;
|
|
@@ -75,4 +67,4 @@ export declare class LogId {
|
|
|
75
67
|
*/
|
|
76
68
|
toHumanReadable(): string;
|
|
77
69
|
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX2lkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9sb2dfaWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUl4QixnQ0FBZ0M7QUFDaEMscUJBQWEsS0FBSzthQVNFLFdBQVcsRUFBRSxXQUFXO2FBRXhCLE9BQU8sRUFBRSxNQUFNO2FBRWYsUUFBUSxFQUFFLE1BQU07SUFabEM7Ozs7O09BS0c7SUFDSDtJQUNFLCtDQUErQztJQUMvQixXQUFXLEVBQUUsV0FBVztJQUN4QywyREFBMkQ7SUFDM0MsT0FBTyxFQUFFLE1BQU07SUFDL0IsZ0RBQWdEO0lBQ2hDLFFBQVEsRUFBRSxNQUFNLEVBV2pDO0lBRUQsTUFBTSxDQUFDLE1BQU0sVUFNWjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FRaEI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQU14QjtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLEtBQUssQ0FRdEQ7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsS0FBSyxDQU9yQztJQUVEOzs7T0FHRztJQUNJLGVBQWUsSUFBSSxNQUFNLENBRS9CO0NBQ0YifQ==
|
|
@@ -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;
|
|
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"}
|
package/dest/logs/log_id.js
CHANGED
|
@@ -3,11 +3,9 @@ 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';
|
|
7
6
|
import { schemas } from '../schemas/index.js';
|
|
8
7
|
/** A globally unique log id. */ export class LogId {
|
|
9
8
|
blockNumber;
|
|
10
|
-
blockHash;
|
|
11
9
|
txIndex;
|
|
12
10
|
logIndex;
|
|
13
11
|
/**
|
|
@@ -15,9 +13,8 @@ import { schemas } from '../schemas/index.js';
|
|
|
15
13
|
* @param blockNumber - The block number.
|
|
16
14
|
* @param txIndex - The transaction index.
|
|
17
15
|
* @param logIndex - The log index.
|
|
18
|
-
*/ constructor(/** The block number the log was emitted in. */ blockNumber, /** The
|
|
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){
|
|
19
17
|
this.blockNumber = blockNumber;
|
|
20
|
-
this.blockHash = blockHash;
|
|
21
18
|
this.txIndex = txIndex;
|
|
22
19
|
this.logIndex = logIndex;
|
|
23
20
|
if (!Number.isInteger(blockNumber) || blockNumber < INITIAL_L2_BLOCK_NUM) {
|
|
@@ -31,15 +28,14 @@ import { schemas } from '../schemas/index.js';
|
|
|
31
28
|
}
|
|
32
29
|
}
|
|
33
30
|
static random() {
|
|
34
|
-
return new LogId(BlockNumber(Math.floor(Math.random() * 1000) + 1),
|
|
31
|
+
return new LogId(BlockNumber(Math.floor(Math.random() * 1000) + 1), Math.floor(Math.random() * 1000), Math.floor(Math.random() * 100));
|
|
35
32
|
}
|
|
36
33
|
static get schema() {
|
|
37
34
|
return z.object({
|
|
38
35
|
blockNumber: BlockNumberSchema,
|
|
39
|
-
blockHash: L2BlockHash.schema,
|
|
40
36
|
txIndex: schemas.Integer,
|
|
41
37
|
logIndex: schemas.Integer
|
|
42
|
-
}).transform(({ blockNumber,
|
|
38
|
+
}).transform(({ blockNumber, txIndex, logIndex })=>new LogId(blockNumber, txIndex, logIndex));
|
|
43
39
|
}
|
|
44
40
|
/**
|
|
45
41
|
* Serializes log id to a buffer.
|
|
@@ -47,7 +43,6 @@ import { schemas } from '../schemas/index.js';
|
|
|
47
43
|
*/ toBuffer() {
|
|
48
44
|
return Buffer.concat([
|
|
49
45
|
toBufferBE(BigInt(this.blockNumber), 4),
|
|
50
|
-
this.blockHash.toBuffer(),
|
|
51
46
|
toBufferBE(BigInt(this.txIndex), 4),
|
|
52
47
|
toBufferBE(BigInt(this.logIndex), 4)
|
|
53
48
|
]);
|
|
@@ -59,33 +54,31 @@ import { schemas } from '../schemas/index.js';
|
|
|
59
54
|
*/ static fromBuffer(buffer) {
|
|
60
55
|
const reader = BufferReader.asReader(buffer);
|
|
61
56
|
const blockNumber = BlockNumber(reader.readNumber());
|
|
62
|
-
const blockHash = reader.readObject(L2BlockHash);
|
|
63
57
|
const txIndex = reader.readNumber();
|
|
64
58
|
const logIndex = reader.readNumber();
|
|
65
|
-
return new LogId(blockNumber,
|
|
59
|
+
return new LogId(blockNumber, txIndex, logIndex);
|
|
66
60
|
}
|
|
67
61
|
/**
|
|
68
62
|
* Converts the LogId instance to a string.
|
|
69
63
|
* @returns A string representation of the log id.
|
|
70
64
|
*/ toString() {
|
|
71
|
-
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}
|
|
65
|
+
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}`;
|
|
72
66
|
}
|
|
73
67
|
/**
|
|
74
68
|
* Creates a LogId from a string.
|
|
75
69
|
* @param data - A string representation of a log id.
|
|
76
70
|
* @returns A log id.
|
|
77
71
|
*/ static fromString(data) {
|
|
78
|
-
const [rawBlockNumber, rawTxIndex, rawLogIndex
|
|
72
|
+
const [rawBlockNumber, rawTxIndex, rawLogIndex] = data.split('-');
|
|
79
73
|
const blockNumber = BlockNumber(Number(rawBlockNumber));
|
|
80
|
-
const blockHash = L2BlockHash.fromString(rawBlockHash);
|
|
81
74
|
const txIndex = Number(rawTxIndex);
|
|
82
75
|
const logIndex = Number(rawLogIndex);
|
|
83
|
-
return new LogId(blockNumber,
|
|
76
|
+
return new LogId(blockNumber, txIndex, logIndex);
|
|
84
77
|
}
|
|
85
78
|
/**
|
|
86
79
|
* Serializes log id to a human readable string.
|
|
87
80
|
* @returns A human readable representation of the log id.
|
|
88
81
|
*/ toHumanReadable() {
|
|
89
|
-
return `logId: (blockNumber: ${this.blockNumber},
|
|
82
|
+
return `logId: (blockNumber: ${this.blockNumber}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
|
|
90
83
|
}
|
|
91
84
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { z } from 'zod';
|
|
3
|
-
import { L2BlockHash } from '../block/block_hash.js';
|
|
4
3
|
import { TxHash } from '../tx/tx_hash.js';
|
|
5
4
|
import { PrivateLog } from './private_log.js';
|
|
6
5
|
import { PublicLog } from './public_log.js';
|
|
@@ -9,16 +8,14 @@ export declare class TxScopedL2Log {
|
|
|
9
8
|
dataStartIndexForTx: number;
|
|
10
9
|
logIndexInTx: number;
|
|
11
10
|
blockNumber: BlockNumber;
|
|
12
|
-
blockHash: L2BlockHash;
|
|
13
11
|
log: PrivateLog | PublicLog;
|
|
14
|
-
constructor(txHash: TxHash, dataStartIndexForTx: number, logIndexInTx: number, blockNumber: BlockNumber,
|
|
12
|
+
constructor(txHash: TxHash, dataStartIndexForTx: number, logIndexInTx: number, blockNumber: BlockNumber, log: PrivateLog | PublicLog);
|
|
15
13
|
get isFromPublic(): boolean;
|
|
16
14
|
static get schema(): z.ZodEffects<z.ZodObject<{
|
|
17
15
|
txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>;
|
|
18
16
|
dataStartIndexForTx: z.ZodNumber;
|
|
19
17
|
logIndexInTx: z.ZodNumber;
|
|
20
18
|
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>;
|
|
22
19
|
log: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
|
|
23
20
|
fields: z.ZodArray<z.ZodType<import("../../../foundation/dest/schemas/schemas.js").Fr, any, string>, "many">;
|
|
24
21
|
emittedLength: z.ZodNumber;
|
|
@@ -39,21 +36,18 @@ export declare class TxScopedL2Log {
|
|
|
39
36
|
blockNumber: number & {
|
|
40
37
|
_branding: "BlockNumber";
|
|
41
38
|
};
|
|
42
|
-
blockHash: L2BlockHash;
|
|
43
39
|
log: PrivateLog | PublicLog;
|
|
44
40
|
}, {
|
|
45
41
|
txHash: string;
|
|
46
42
|
dataStartIndexForTx: number;
|
|
47
43
|
logIndexInTx: number;
|
|
48
44
|
blockNumber: string | number | bigint;
|
|
49
|
-
blockHash: string;
|
|
50
45
|
log?: any;
|
|
51
46
|
}>, TxScopedL2Log, {
|
|
52
47
|
txHash: string;
|
|
53
48
|
dataStartIndexForTx: number;
|
|
54
49
|
logIndexInTx: number;
|
|
55
50
|
blockNumber: string | number | bigint;
|
|
56
|
-
blockHash: string;
|
|
57
51
|
log?: any;
|
|
58
52
|
}>;
|
|
59
53
|
toBuffer(): Buffer<ArrayBuffer>;
|
|
@@ -61,4 +55,4 @@ export declare class TxScopedL2Log {
|
|
|
61
55
|
static random(isFromPublic?: boolean): Promise<TxScopedL2Log>;
|
|
62
56
|
equals(other: TxScopedL2Log): boolean;
|
|
63
57
|
}
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc2NvcGVkX2wyX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvdHhfc2NvcGVkX2wyX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBR2pGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHNUMscUJBQWEsYUFBYTtJQUtmLE1BQU0sRUFBRSxNQUFNO0lBS2QsbUJBQW1CLEVBQUUsTUFBTTtJQUszQixZQUFZLEVBQUUsTUFBTTtJQUlwQixXQUFXLEVBQUUsV0FBVztJQUl4QixHQUFHLEVBQUUsVUFBVSxHQUFHLFNBQVM7SUF0QnBDLFlBSVMsTUFBTSxFQUFFLE1BQU0sRUFLZCxtQkFBbUIsRUFBRSxNQUFNLEVBSzNCLFlBQVksRUFBRSxNQUFNLEVBSXBCLFdBQVcsRUFBRSxXQUFXLEVBSXhCLEdBQUcsRUFBRSxVQUFVLEdBQUcsU0FBUyxFQUNoQztJQUVKLElBQUksWUFBWSxZQUVmO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BYWhCO0lBRUQsUUFBUSx3QkFVUDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0saUJBVS9CO0lBRUQsT0FBYSxNQUFNLENBQUMsWUFBWSxVQUFzQiwwQkFHckQ7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLGFBQWEsV0FVMUI7Q0FDRiJ9
|
|
@@ -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,
|
|
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,7 +1,6 @@
|
|
|
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';
|
|
5
4
|
import { TxHash } from '../tx/tx_hash.js';
|
|
6
5
|
import { PrivateLog } from './private_log.js';
|
|
7
6
|
import { PublicLog } from './public_log.js';
|
|
@@ -11,7 +10,6 @@ export class TxScopedL2Log {
|
|
|
11
10
|
dataStartIndexForTx;
|
|
12
11
|
logIndexInTx;
|
|
13
12
|
blockNumber;
|
|
14
|
-
blockHash;
|
|
15
13
|
log;
|
|
16
14
|
constructor(/*
|
|
17
15
|
* Hash of the tx where the log is included
|
|
@@ -24,15 +22,12 @@ export class TxScopedL2Log {
|
|
|
24
22
|
*/ logIndexInTx, /*
|
|
25
23
|
* The block this log is included in
|
|
26
24
|
*/ blockNumber, /*
|
|
27
|
-
* The block this log is included in
|
|
28
|
-
*/ blockHash, /*
|
|
29
25
|
* The log data as either a PrivateLog or PublicLog
|
|
30
26
|
*/ log){
|
|
31
27
|
this.txHash = txHash;
|
|
32
28
|
this.dataStartIndexForTx = dataStartIndexForTx;
|
|
33
29
|
this.logIndexInTx = logIndexInTx;
|
|
34
30
|
this.blockNumber = blockNumber;
|
|
35
|
-
this.blockHash = blockHash;
|
|
36
31
|
this.log = log;
|
|
37
32
|
}
|
|
38
33
|
get isFromPublic() {
|
|
@@ -44,21 +39,20 @@ export class TxScopedL2Log {
|
|
|
44
39
|
dataStartIndexForTx: z.number(),
|
|
45
40
|
logIndexInTx: z.number(),
|
|
46
41
|
blockNumber: BlockNumberSchema,
|
|
47
|
-
blockHash: L2BlockHash.schema,
|
|
48
42
|
log: z.union([
|
|
49
43
|
PrivateLog.schema,
|
|
50
44
|
PublicLog.schema
|
|
51
45
|
])
|
|
52
|
-
}).transform(({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber,
|
|
46
|
+
}).transform(({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log })=>new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log));
|
|
53
47
|
}
|
|
54
48
|
toBuffer() {
|
|
49
|
+
const isFromPublic = this.log instanceof PublicLog;
|
|
55
50
|
return Buffer.concat([
|
|
56
51
|
this.txHash.toBuffer(),
|
|
57
52
|
numToUInt32BE(this.dataStartIndexForTx),
|
|
58
53
|
numToUInt32BE(this.logIndexInTx),
|
|
59
54
|
numToUInt32BE(this.blockNumber),
|
|
60
|
-
|
|
61
|
-
boolToBuffer(this.isFromPublic),
|
|
55
|
+
boolToBuffer(isFromPublic),
|
|
62
56
|
this.log.toBuffer()
|
|
63
57
|
]);
|
|
64
58
|
}
|
|
@@ -68,16 +62,15 @@ export class TxScopedL2Log {
|
|
|
68
62
|
const dataStartIndexForTx = reader.readNumber();
|
|
69
63
|
const logIndexInTx = reader.readNumber();
|
|
70
64
|
const blockNumber = BlockNumber(reader.readNumber());
|
|
71
|
-
const blockHash = reader.readObject(L2BlockHash);
|
|
72
65
|
const isFromPublic = reader.readBoolean();
|
|
73
66
|
const log = isFromPublic ? PublicLog.fromBuffer(reader) : PrivateLog.fromBuffer(reader);
|
|
74
|
-
return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber,
|
|
67
|
+
return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log);
|
|
75
68
|
}
|
|
76
69
|
static async random(isFromPublic = Math.random() < 0.5) {
|
|
77
70
|
const log = isFromPublic ? await PublicLog.random() : PrivateLog.random();
|
|
78
|
-
return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1),
|
|
71
|
+
return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1), log);
|
|
79
72
|
}
|
|
80
73
|
equals(other) {
|
|
81
|
-
return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.logIndexInTx === other.logIndexInTx && this.blockNumber === other.blockNumber &&
|
|
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);
|
|
82
75
|
}
|
|
83
76
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/stdlib",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-rc.2",
|
|
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-
|
|
81
|
-
"@aztec/blob-lib": "3.0.0-
|
|
82
|
-
"@aztec/constants": "3.0.0-
|
|
83
|
-
"@aztec/ethereum": "3.0.0-
|
|
84
|
-
"@aztec/foundation": "3.0.0-
|
|
85
|
-
"@aztec/l1-artifacts": "3.0.0-
|
|
86
|
-
"@aztec/noir-noirc_abi": "3.0.0-
|
|
80
|
+
"@aztec/bb.js": "3.0.0-rc.2",
|
|
81
|
+
"@aztec/blob-lib": "3.0.0-rc.2",
|
|
82
|
+
"@aztec/constants": "3.0.0-rc.2",
|
|
83
|
+
"@aztec/ethereum": "3.0.0-rc.2",
|
|
84
|
+
"@aztec/foundation": "3.0.0-rc.2",
|
|
85
|
+
"@aztec/l1-artifacts": "3.0.0-rc.2",
|
|
86
|
+
"@aztec/noir-noirc_abi": "3.0.0-rc.2",
|
|
87
87
|
"@google-cloud/storage": "^7.15.0",
|
|
88
88
|
"axios": "^1.12.0",
|
|
89
89
|
"json-stringify-deterministic": "1.0.12",
|
package/src/logs/log_id.ts
CHANGED
|
@@ -5,7 +5,6 @@ import { BufferReader } from '@aztec/foundation/serialize';
|
|
|
5
5
|
|
|
6
6
|
import { z } from 'zod';
|
|
7
7
|
|
|
8
|
-
import { L2BlockHash } from '../block/block_hash.js';
|
|
9
8
|
import { schemas } from '../schemas/index.js';
|
|
10
9
|
|
|
11
10
|
/** A globally unique log id. */
|
|
@@ -19,8 +18,6 @@ export class LogId {
|
|
|
19
18
|
constructor(
|
|
20
19
|
/** The block number the log was emitted in. */
|
|
21
20
|
public readonly blockNumber: BlockNumber,
|
|
22
|
-
/** The hash of the block the log was emitted in. */
|
|
23
|
-
public readonly blockHash: L2BlockHash,
|
|
24
21
|
/** The index of a tx in a block the log was emitted in. */
|
|
25
22
|
public readonly txIndex: number,
|
|
26
23
|
/** The index of a log the tx was emitted in. */
|
|
@@ -40,7 +37,6 @@ export class LogId {
|
|
|
40
37
|
static random() {
|
|
41
38
|
return new LogId(
|
|
42
39
|
BlockNumber(Math.floor(Math.random() * 1000) + 1),
|
|
43
|
-
L2BlockHash.random(),
|
|
44
40
|
Math.floor(Math.random() * 1000),
|
|
45
41
|
Math.floor(Math.random() * 100),
|
|
46
42
|
);
|
|
@@ -50,13 +46,10 @@ export class LogId {
|
|
|
50
46
|
return z
|
|
51
47
|
.object({
|
|
52
48
|
blockNumber: BlockNumberSchema,
|
|
53
|
-
blockHash: L2BlockHash.schema,
|
|
54
49
|
txIndex: schemas.Integer,
|
|
55
50
|
logIndex: schemas.Integer,
|
|
56
51
|
})
|
|
57
|
-
.transform(
|
|
58
|
-
({ blockNumber, blockHash, txIndex, logIndex }) => new LogId(blockNumber, blockHash, txIndex, logIndex),
|
|
59
|
-
);
|
|
52
|
+
.transform(({ blockNumber, txIndex, logIndex }) => new LogId(blockNumber, txIndex, logIndex));
|
|
60
53
|
}
|
|
61
54
|
|
|
62
55
|
/**
|
|
@@ -66,7 +59,6 @@ export class LogId {
|
|
|
66
59
|
public toBuffer(): Buffer {
|
|
67
60
|
return Buffer.concat([
|
|
68
61
|
toBufferBE(BigInt(this.blockNumber), 4),
|
|
69
|
-
this.blockHash.toBuffer(),
|
|
70
62
|
toBufferBE(BigInt(this.txIndex), 4),
|
|
71
63
|
toBufferBE(BigInt(this.logIndex), 4),
|
|
72
64
|
]);
|
|
@@ -81,11 +73,10 @@ export class LogId {
|
|
|
81
73
|
const reader = BufferReader.asReader(buffer);
|
|
82
74
|
|
|
83
75
|
const blockNumber = BlockNumber(reader.readNumber());
|
|
84
|
-
const blockHash = reader.readObject(L2BlockHash);
|
|
85
76
|
const txIndex = reader.readNumber();
|
|
86
77
|
const logIndex = reader.readNumber();
|
|
87
78
|
|
|
88
|
-
return new LogId(blockNumber,
|
|
79
|
+
return new LogId(blockNumber, txIndex, logIndex);
|
|
89
80
|
}
|
|
90
81
|
|
|
91
82
|
/**
|
|
@@ -93,7 +84,7 @@ export class LogId {
|
|
|
93
84
|
* @returns A string representation of the log id.
|
|
94
85
|
*/
|
|
95
86
|
public toString(): string {
|
|
96
|
-
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}
|
|
87
|
+
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}`;
|
|
97
88
|
}
|
|
98
89
|
|
|
99
90
|
/**
|
|
@@ -102,13 +93,12 @@ export class LogId {
|
|
|
102
93
|
* @returns A log id.
|
|
103
94
|
*/
|
|
104
95
|
static fromString(data: string): LogId {
|
|
105
|
-
const [rawBlockNumber, rawTxIndex, rawLogIndex
|
|
96
|
+
const [rawBlockNumber, rawTxIndex, rawLogIndex] = data.split('-');
|
|
106
97
|
const blockNumber = BlockNumber(Number(rawBlockNumber));
|
|
107
|
-
const blockHash = L2BlockHash.fromString(rawBlockHash);
|
|
108
98
|
const txIndex = Number(rawTxIndex);
|
|
109
99
|
const logIndex = Number(rawLogIndex);
|
|
110
100
|
|
|
111
|
-
return new LogId(blockNumber,
|
|
101
|
+
return new LogId(blockNumber, txIndex, logIndex);
|
|
112
102
|
}
|
|
113
103
|
|
|
114
104
|
/**
|
|
@@ -116,6 +106,6 @@ export class LogId {
|
|
|
116
106
|
* @returns A human readable representation of the log id.
|
|
117
107
|
*/
|
|
118
108
|
public toHumanReadable(): string {
|
|
119
|
-
return `logId: (blockNumber: ${this.blockNumber},
|
|
109
|
+
return `logId: (blockNumber: ${this.blockNumber}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
|
|
120
110
|
}
|
|
121
111
|
}
|
|
@@ -3,7 +3,6 @@ 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';
|
|
7
6
|
import { TxHash } from '../tx/tx_hash.js';
|
|
8
7
|
import { PrivateLog } from './private_log.js';
|
|
9
8
|
import { PublicLog } from './public_log.js';
|
|
@@ -29,10 +28,6 @@ export class TxScopedL2Log {
|
|
|
29
28
|
* The block this log is included in
|
|
30
29
|
*/
|
|
31
30
|
public blockNumber: BlockNumber,
|
|
32
|
-
/*
|
|
33
|
-
* The block this log is included in
|
|
34
|
-
*/
|
|
35
|
-
public blockHash: L2BlockHash,
|
|
36
31
|
/*
|
|
37
32
|
* The log data as either a PrivateLog or PublicLog
|
|
38
33
|
*/
|
|
@@ -50,23 +45,22 @@ export class TxScopedL2Log {
|
|
|
50
45
|
dataStartIndexForTx: z.number(),
|
|
51
46
|
logIndexInTx: z.number(),
|
|
52
47
|
blockNumber: BlockNumberSchema,
|
|
53
|
-
blockHash: L2BlockHash.schema,
|
|
54
48
|
log: z.union([PrivateLog.schema, PublicLog.schema]),
|
|
55
49
|
})
|
|
56
50
|
.transform(
|
|
57
|
-
({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber,
|
|
58
|
-
new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber,
|
|
51
|
+
({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log }) =>
|
|
52
|
+
new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log),
|
|
59
53
|
);
|
|
60
54
|
}
|
|
61
55
|
|
|
62
56
|
toBuffer() {
|
|
57
|
+
const isFromPublic = this.log instanceof PublicLog;
|
|
63
58
|
return Buffer.concat([
|
|
64
59
|
this.txHash.toBuffer(),
|
|
65
60
|
numToUInt32BE(this.dataStartIndexForTx),
|
|
66
61
|
numToUInt32BE(this.logIndexInTx),
|
|
67
62
|
numToUInt32BE(this.blockNumber),
|
|
68
|
-
|
|
69
|
-
boolToBuffer(this.isFromPublic),
|
|
63
|
+
boolToBuffer(isFromPublic),
|
|
70
64
|
this.log.toBuffer(),
|
|
71
65
|
]);
|
|
72
66
|
}
|
|
@@ -77,16 +71,15 @@ export class TxScopedL2Log {
|
|
|
77
71
|
const dataStartIndexForTx = reader.readNumber();
|
|
78
72
|
const logIndexInTx = reader.readNumber();
|
|
79
73
|
const blockNumber = BlockNumber(reader.readNumber());
|
|
80
|
-
const blockHash = reader.readObject(L2BlockHash);
|
|
81
74
|
const isFromPublic = reader.readBoolean();
|
|
82
75
|
const log = isFromPublic ? PublicLog.fromBuffer(reader) : PrivateLog.fromBuffer(reader);
|
|
83
76
|
|
|
84
|
-
return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber,
|
|
77
|
+
return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log);
|
|
85
78
|
}
|
|
86
79
|
|
|
87
80
|
static async random(isFromPublic = Math.random() < 0.5) {
|
|
88
81
|
const log = isFromPublic ? await PublicLog.random() : PrivateLog.random();
|
|
89
|
-
return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1),
|
|
82
|
+
return new TxScopedL2Log(TxHash.random(), 1, 1, BlockNumber(1), log);
|
|
90
83
|
}
|
|
91
84
|
|
|
92
85
|
equals(other: TxScopedL2Log) {
|
|
@@ -95,7 +88,6 @@ export class TxScopedL2Log {
|
|
|
95
88
|
this.dataStartIndexForTx === other.dataStartIndexForTx &&
|
|
96
89
|
this.logIndexInTx === other.logIndexInTx &&
|
|
97
90
|
this.blockNumber === other.blockNumber &&
|
|
98
|
-
this.blockHash.equals(other.blockHash) &&
|
|
99
91
|
((this.log instanceof PublicLog && other.log instanceof PublicLog) ||
|
|
100
92
|
(this.log instanceof PrivateLog && other.log instanceof PrivateLog)) &&
|
|
101
93
|
this.log.equals(other.log as any)
|