@aztec/stdlib 4.0.0-nightly.20260119 → 4.0.0-nightly.20260120

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.
Files changed (85) hide show
  1. package/dest/avm/avm.d.ts +300 -300
  2. package/dest/block/block_parameter.d.ts +4 -3
  3. package/dest/block/block_parameter.d.ts.map +1 -1
  4. package/dest/block/block_parameter.js +2 -0
  5. package/dest/block/checkpointed_l2_block.d.ts +10 -127
  6. package/dest/block/checkpointed_l2_block.d.ts.map +1 -1
  7. package/dest/block/checkpointed_l2_block.js +2 -41
  8. package/dest/block/in_block.d.ts +3 -3
  9. package/dest/block/in_block.d.ts.map +1 -1
  10. package/dest/block/index.d.ts +1 -3
  11. package/dest/block/index.d.ts.map +1 -1
  12. package/dest/block/index.js +0 -2
  13. package/dest/block/l2_block_new.d.ts +11 -9
  14. package/dest/block/l2_block_new.d.ts.map +1 -1
  15. package/dest/block/l2_block_new.js +5 -5
  16. package/dest/block/l2_block_source.d.ts +20 -11
  17. package/dest/block/l2_block_source.d.ts.map +1 -1
  18. package/dest/checkpoint/checkpoint.d.ts +10 -8
  19. package/dest/checkpoint/checkpoint.d.ts.map +1 -1
  20. package/dest/checkpoint/checkpoint.js +2 -2
  21. package/dest/checkpoint/published_checkpoint.d.ts +11 -9
  22. package/dest/checkpoint/published_checkpoint.d.ts.map +1 -1
  23. package/dest/interfaces/archiver.d.ts +1 -1
  24. package/dest/interfaces/archiver.d.ts.map +1 -1
  25. package/dest/interfaces/archiver.js +9 -8
  26. package/dest/interfaces/aztec-node.d.ts +35 -40
  27. package/dest/interfaces/aztec-node.d.ts.map +1 -1
  28. package/dest/interfaces/aztec-node.js +6 -8
  29. package/dest/interfaces/block-builder.d.ts +18 -17
  30. package/dest/interfaces/block-builder.d.ts.map +1 -1
  31. package/dest/interfaces/proving-job.d.ts +166 -166
  32. package/dest/kernel/hints/build_note_hash_read_request_hints.d.ts +1 -1
  33. package/dest/kernel/hints/build_note_hash_read_request_hints.d.ts.map +1 -1
  34. package/dest/kernel/hints/build_note_hash_read_request_hints.js +16 -6
  35. package/dest/kernel/hints/build_nullifier_read_request_hints.d.ts +1 -1
  36. package/dest/kernel/hints/build_nullifier_read_request_hints.d.ts.map +1 -1
  37. package/dest/kernel/hints/build_nullifier_read_request_hints.js +14 -4
  38. package/dest/p2p/block_proposal.d.ts +9 -9
  39. package/dest/p2p/block_proposal.d.ts.map +1 -1
  40. package/dest/p2p/block_proposal.js +6 -5
  41. package/dest/p2p/checkpoint_proposal.d.ts +4 -4
  42. package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
  43. package/dest/p2p/checkpoint_proposal.js +3 -3
  44. package/dest/p2p/consensus_payload.d.ts +1 -3
  45. package/dest/p2p/consensus_payload.d.ts.map +1 -1
  46. package/dest/p2p/consensus_payload.js +0 -3
  47. package/dest/tests/factories.d.ts +2 -4
  48. package/dest/tests/factories.d.ts.map +1 -1
  49. package/dest/tests/factories.js +3 -13
  50. package/dest/tests/jest.d.ts +4 -4
  51. package/dest/tests/jest.js +9 -9
  52. package/dest/tests/mocks.d.ts +12 -12
  53. package/dest/tests/mocks.d.ts.map +1 -1
  54. package/dest/tests/mocks.js +33 -21
  55. package/package.json +9 -9
  56. package/src/block/block_parameter.ts +4 -2
  57. package/src/block/checkpointed_l2_block.ts +2 -53
  58. package/src/block/in_block.ts +2 -2
  59. package/src/block/index.ts +0 -2
  60. package/src/block/l2_block_new.ts +14 -7
  61. package/src/block/l2_block_source.ts +21 -11
  62. package/src/checkpoint/checkpoint.ts +8 -2
  63. package/src/interfaces/archiver.ts +9 -8
  64. package/src/interfaces/aztec-node.ts +39 -57
  65. package/src/interfaces/block-builder.ts +33 -28
  66. package/src/kernel/hints/build_note_hash_read_request_hints.ts +17 -6
  67. package/src/kernel/hints/build_nullifier_read_request_hints.ts +22 -10
  68. package/src/p2p/block_proposal.ts +10 -10
  69. package/src/p2p/checkpoint_proposal.ts +4 -4
  70. package/src/p2p/consensus_payload.ts +0 -5
  71. package/src/tests/factories.ts +2 -25
  72. package/src/tests/jest.ts +9 -9
  73. package/src/tests/mocks.ts +35 -28
  74. package/dest/block/l2_block.d.ts +0 -150
  75. package/dest/block/l2_block.d.ts.map +0 -1
  76. package/dest/block/l2_block.js +0 -201
  77. package/dest/block/l2_block_code_to_purge.d.ts +0 -11
  78. package/dest/block/l2_block_code_to_purge.d.ts.map +0 -1
  79. package/dest/block/l2_block_code_to_purge.js +0 -55
  80. package/dest/block/l2_block_header.d.ts +0 -106
  81. package/dest/block/l2_block_header.d.ts.map +0 -1
  82. package/dest/block/l2_block_header.js +0 -167
  83. package/src/block/l2_block.ts +0 -274
  84. package/src/block/l2_block_code_to_purge.ts +0 -81
  85. package/src/block/l2_block_header.ts +0 -268
@@ -1,5 +1,6 @@
1
1
  import { z } from 'zod';
2
- export declare const BlockParameterSchema: z.ZodUnion<[z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>, z.ZodLiteral<"latest">]>;
3
- /** Block parameter - either a specific BlockNumber or 'latest' */
2
+ import { L2BlockHash } from './block_hash.js';
3
+ export declare const BlockParameterSchema: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>, z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>, z.ZodLiteral<"latest">]>;
4
+ /** Block parameter - either a specific BlockNumber, block hash (L2BlockHash), or 'latest' */
4
5
  export type BlockParameter = z.infer<typeof BlockParameterSchema>;
5
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsZUFBTyxNQUFNLG9CQUFvQixzTkFBb0QsQ0FBQztBQUV0RixrRUFBa0U7QUFDbEUsTUFBTSxNQUFNLGNBQWMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sb0JBQW9CLENBQUMsQ0FBQyJ9
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTlDLGVBQU8sTUFBTSxvQkFBb0IsNldBQXdFLENBQUM7QUFFMUcsNkZBQTZGO0FBQzdGLE1BQU0sTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,oBAAoB,sNAAoD,CAAC;AAEtF,kEAAkE;AAClE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
1
+ {"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,eAAO,MAAM,oBAAoB,6WAAwE,CAAC;AAE1G,6FAA6F;AAC7F,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
@@ -1,6 +1,8 @@
1
1
  import { BlockNumberSchema } from '@aztec/foundation/branded-types';
2
2
  import { z } from 'zod';
3
+ import { L2BlockHash } from './block_hash.js';
3
4
  export const BlockParameterSchema = z.union([
5
+ L2BlockHash.schema,
4
6
  BlockNumberSchema,
5
7
  z.literal('latest')
6
8
  ]);
@@ -2,8 +2,7 @@ import { CheckpointNumber } from '@aztec/foundation/branded-types';
2
2
  import { BufferReader } from '@aztec/foundation/serialize';
3
3
  import type { FieldsOf } from '@aztec/foundation/types';
4
4
  import { z } from 'zod';
5
- import { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
6
- import { L2Block } from './l2_block.js';
5
+ import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
7
6
  import { L2BlockNew } from './l2_block_new.js';
8
7
  import { CommitteeAttestation } from './proposal/committee_attestation.js';
9
8
  /**
@@ -34,7 +33,7 @@ export declare class CheckpointedL2Block {
34
33
  header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
35
34
  body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
36
35
  checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
37
- indexWithinCheckpoint: z.ZodNumber;
36
+ indexWithinCheckpoint: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").IndexWithinCheckpoint, string | number | bigint>;
38
37
  }, "strip", z.ZodTypeAny, {
39
38
  archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
40
39
  header: import("../tx/block_header.js").BlockHeader;
@@ -42,7 +41,9 @@ export declare class CheckpointedL2Block {
42
41
  checkpointNumber: number & {
43
42
  _branding: "CheckpointNumber";
44
43
  };
45
- indexWithinCheckpoint: number;
44
+ indexWithinCheckpoint: number & {
45
+ _branding: "IndexWithinCheckpoint";
46
+ };
46
47
  }, {
47
48
  archive: {
48
49
  root: string;
@@ -51,7 +52,7 @@ export declare class CheckpointedL2Block {
51
52
  header?: any;
52
53
  body?: any;
53
54
  checkpointNumber: string | number | bigint;
54
- indexWithinCheckpoint: number;
55
+ indexWithinCheckpoint: string | number | bigint;
55
56
  }>, L2BlockNew, {
56
57
  archive: {
57
58
  root: string;
@@ -60,7 +61,7 @@ export declare class CheckpointedL2Block {
60
61
  header?: any;
61
62
  body?: any;
62
63
  checkpointNumber: string | number | bigint;
63
- indexWithinCheckpoint: number;
64
+ indexWithinCheckpoint: string | number | bigint;
64
65
  }>;
65
66
  l1: z.ZodEffects<z.ZodObject<{
66
67
  blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
@@ -109,7 +110,7 @@ export declare class CheckpointedL2Block {
109
110
  header?: any;
110
111
  body?: any;
111
112
  checkpointNumber: string | number | bigint;
112
- indexWithinCheckpoint: number;
113
+ indexWithinCheckpoint: string | number | bigint;
113
114
  };
114
115
  l1: {
115
116
  blockNumber: string | number | bigint;
@@ -130,7 +131,7 @@ export declare class CheckpointedL2Block {
130
131
  header?: any;
131
132
  body?: any;
132
133
  checkpointNumber: string | number | bigint;
133
- indexWithinCheckpoint: number;
134
+ indexWithinCheckpoint: string | number | bigint;
134
135
  };
135
136
  l1: {
136
137
  blockNumber: string | number | bigint;
@@ -146,122 +147,4 @@ export declare class CheckpointedL2Block {
146
147
  static fromFields(fields: FieldsOf<CheckpointedL2Block>): CheckpointedL2Block;
147
148
  toBuffer(): Buffer;
148
149
  }
149
- export declare class PublishedL2Block {
150
- block: L2Block;
151
- l1: L1PublishedData;
152
- attestations: CommitteeAttestation[];
153
- constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
154
- static get schema(): z.ZodEffects<z.ZodObject<{
155
- block: z.ZodEffects<z.ZodObject<{
156
- archive: z.ZodEffects<z.ZodObject<{
157
- root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
158
- nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
159
- }, "strip", z.ZodTypeAny, {
160
- root: import("@aztec/foundation/schemas").Fr;
161
- nextAvailableLeafIndex: number;
162
- }, {
163
- root: string;
164
- nextAvailableLeafIndex: string | number | bigint;
165
- }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
166
- root: string;
167
- nextAvailableLeafIndex: string | number | bigint;
168
- }>;
169
- header: import("@aztec/foundation/schemas").ZodFor<import("./l2_block_header.js").L2BlockHeader>;
170
- body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
171
- }, "strip", z.ZodTypeAny, {
172
- archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
173
- header: import("./l2_block_header.js").L2BlockHeader;
174
- body: import("./body.js").Body;
175
- }, {
176
- archive: {
177
- root: string;
178
- nextAvailableLeafIndex: string | number | bigint;
179
- };
180
- header?: any;
181
- body?: any;
182
- }>, L2Block, {
183
- archive: {
184
- root: string;
185
- nextAvailableLeafIndex: string | number | bigint;
186
- };
187
- header?: any;
188
- body?: any;
189
- }>;
190
- l1: z.ZodEffects<z.ZodObject<{
191
- blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
192
- timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
193
- blockHash: z.ZodString;
194
- }, "strip", z.ZodTypeAny, {
195
- blockNumber: bigint;
196
- timestamp: bigint;
197
- blockHash: string;
198
- }, {
199
- blockNumber: string | number | bigint;
200
- timestamp: string | number | bigint;
201
- blockHash: string;
202
- }>, L1PublishedData, {
203
- blockNumber: string | number | bigint;
204
- timestamp: string | number | bigint;
205
- blockHash: string;
206
- }>;
207
- attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
208
- address: z.ZodType<import("@aztec/foundation/eth-address").EthAddress, any, string>;
209
- signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
210
- }, "strip", z.ZodTypeAny, {
211
- address: import("@aztec/foundation/eth-address").EthAddress;
212
- signature: import("./proposal/committee_attestation.js").Signature;
213
- }, {
214
- address: string;
215
- signature: string;
216
- }>, CommitteeAttestation, {
217
- address: string;
218
- signature: string;
219
- }>, "many">;
220
- }, "strip", z.ZodTypeAny, {
221
- block: L2Block;
222
- l1: L1PublishedData;
223
- attestations: CommitteeAttestation[];
224
- }, {
225
- block: {
226
- archive: {
227
- root: string;
228
- nextAvailableLeafIndex: string | number | bigint;
229
- };
230
- header?: any;
231
- body?: any;
232
- };
233
- l1: {
234
- blockNumber: string | number | bigint;
235
- timestamp: string | number | bigint;
236
- blockHash: string;
237
- };
238
- attestations: {
239
- address: string;
240
- signature: string;
241
- }[];
242
- }>, PublishedL2Block, {
243
- block: {
244
- archive: {
245
- root: string;
246
- nextAvailableLeafIndex: string | number | bigint;
247
- };
248
- header?: any;
249
- body?: any;
250
- };
251
- l1: {
252
- blockNumber: string | number | bigint;
253
- timestamp: string | number | bigint;
254
- blockHash: string;
255
- };
256
- attestations: {
257
- address: string;
258
- signature: string;
259
- }[];
260
- }>;
261
- static fromBuffer(bufferOrReader: Buffer | BufferReader): PublishedL2Block;
262
- static fromFields(fields: FieldsOf<PublishedL2Block>): PublishedL2Block;
263
- toBuffer(): Buffer;
264
- toPublishedCheckpoint(): PublishedCheckpoint;
265
- static fromPublishedCheckpoint(checkpoint: PublishedCheckpoint): PublishedL2Block;
266
- }
267
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRTdGLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTNFOztHQUVHO0FBQ0gscUJBQWEsbUJBQW1CO0lBRXJCLGdCQUFnQixFQUFFLGdCQUFnQjtJQUNsQyxLQUFLLEVBQUUsVUFBVTtJQUNqQixFQUFFLEVBQUUsZUFBZTtJQUNuQixZQUFZLEVBQUUsb0JBQW9CLEVBQUU7SUFKN0MsWUFDUyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsS0FBSyxFQUFFLFVBQVUsRUFDakIsRUFBRSxFQUFFLGVBQWUsRUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQ3pDO0lBQ0osTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQVNoQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsbUJBQW1CLENBYzVFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLG1CQUFtQixDQUFDLHVCQU90RDtJQUVNLFFBQVEsSUFBSSxNQUFNLENBU3hCO0NBQ0Y7QUFFRCxxQkFBYSxnQkFBZ0I7SUFFbEIsS0FBSyxFQUFFLE9BQU87SUFDZCxFQUFFLEVBQUUsZUFBZTtJQUNuQixZQUFZLEVBQUUsb0JBQW9CLEVBQUU7SUFIN0MsWUFDUyxLQUFLLEVBQUUsT0FBTyxFQUNkLEVBQUUsRUFBRSxlQUFlLEVBQ25CLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxFQUN6QztJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BUWhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxnQkFBZ0IsQ0FRekU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsb0JBRW5EO0lBRU0sUUFBUSxJQUFJLE1BQU0sQ0FTeEI7SUFFTSxxQkFBcUIsd0JBRTNCO0lBRUQsTUFBTSxDQUFDLHVCQUF1QixDQUFDLFVBQVUsRUFBRSxtQkFBbUIsb0JBRTdEO0NBQ0YifQ==
150
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUUzRTs7R0FFRztBQUNILHFCQUFhLG1CQUFtQjtJQUVyQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFDbEMsS0FBSyxFQUFFLFVBQVU7SUFDakIsRUFBRSxFQUFFLGVBQWU7SUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFO0lBSjdDLFlBQ1MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEtBQUssRUFBRSxVQUFVLEVBQ2pCLEVBQUUsRUFBRSxlQUFlLEVBQ25CLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxFQUN6QztJQUNKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQVNoQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsbUJBQW1CLENBYzVFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLG1CQUFtQixDQUFDLHVCQU90RDtJQUVNLFFBQVEsSUFBSSxNQUFNLENBVXhCO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"checkpointed_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/checkpointed_l2_block.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAE7F,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;GAEG;AACH,qBAAa,mBAAmB;IAErB,gBAAgB,EAAE,gBAAgB;IAClC,KAAK,EAAE,UAAU;IACjB,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAJ7C,YACS,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IACJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAc5E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,uBAOtD;IAEM,QAAQ,IAAI,MAAM,CASxB;CACF;AAED,qBAAa,gBAAgB;IAElB,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAH7C,YACS,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB,CAQzE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,oBAEnD;IAEM,QAAQ,IAAI,MAAM,CASxB;IAEM,qBAAqB,wBAE3B;IAED,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,mBAAmB,oBAE7D;CACF"}
1
+ {"version":3,"file":"checkpointed_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/checkpointed_l2_block.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;GAEG;AACH,qBAAa,mBAAmB;IAErB,gBAAgB,EAAE,gBAAgB;IAClC,KAAK,EAAE,UAAU;IACjB,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAJ7C,YACS,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IACJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAc5E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,uBAOtD;IAEM,QAAQ,IAAI,MAAM,CAUxB;CACF"}
@@ -2,9 +2,8 @@
2
2
  import { CheckpointNumber, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
3
3
  import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
4
4
  import { z } from 'zod';
5
- import { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
5
+ import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
6
6
  import { MAX_BLOCK_HASH_STRING_LENGTH, MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
7
- import { L2Block } from './l2_block.js';
8
7
  import { L2BlockNew } from './l2_block_new.js';
9
8
  import { CommitteeAttestation } from './proposal/committee_attestation.js';
10
9
  /**
@@ -42,44 +41,6 @@ import { CommitteeAttestation } from './proposal/committee_attestation.js';
42
41
  return new CheckpointedL2Block(CheckpointNumber(fields.checkpointNumber), fields.block, fields.l1, fields.attestations);
43
42
  }
44
43
  toBuffer() {
45
- return serializeToBuffer(this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
46
- }
47
- }
48
- export class PublishedL2Block {
49
- block;
50
- l1;
51
- attestations;
52
- constructor(block, l1, attestations){
53
- this.block = block;
54
- this.l1 = l1;
55
- this.attestations = attestations;
56
- }
57
- static get schema() {
58
- return z.object({
59
- block: L2Block.schema,
60
- l1: L1PublishedData.schema,
61
- attestations: z.array(CommitteeAttestation.schema)
62
- }).transform((obj)=>PublishedL2Block.fromFields(obj));
63
- }
64
- static fromBuffer(bufferOrReader) {
65
- const reader = BufferReader.asReader(bufferOrReader);
66
- const block = reader.readObject(L2Block);
67
- const l1BlockNumber = reader.readBigInt();
68
- const l1BlockHash = reader.readString(MAX_BLOCK_HASH_STRING_LENGTH);
69
- const l1Timestamp = reader.readBigInt();
70
- const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
71
- return new PublishedL2Block(block, new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash), attestations);
72
- }
73
- static fromFields(fields) {
74
- return new PublishedL2Block(fields.block, fields.l1, fields.attestations);
75
- }
76
- toBuffer() {
77
- return serializeToBuffer(this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
78
- }
79
- toPublishedCheckpoint() {
80
- return new PublishedCheckpoint(this.block.toCheckpoint(), this.l1, this.attestations);
81
- }
82
- static fromPublishedCheckpoint(checkpoint) {
83
- return new PublishedL2Block(L2Block.fromCheckpoint(checkpoint.checkpoint), checkpoint.l1, checkpoint.attestations);
44
+ return serializeToBuffer(this.checkpointNumber, this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
84
45
  }
85
46
  }
@@ -1,7 +1,7 @@
1
1
  import { BlockNumber } from '@aztec/foundation/branded-types';
2
2
  import { type ZodTypeAny, z } from 'zod';
3
3
  import { L2BlockHash } from './block_hash.js';
4
- import type { L2Block } from './l2_block.js';
4
+ import type { L2BlockNew } from './l2_block_new.js';
5
5
  export type InBlock = {
6
6
  l2BlockNumber: BlockNumber;
7
7
  l2BlockHash: L2BlockHash;
@@ -11,7 +11,7 @@ export type DataInBlock<T> = {
11
11
  } & InBlock;
12
12
  export declare function randomInBlock(): InBlock;
13
13
  export declare function randomDataInBlock<T>(data: T): DataInBlock<T>;
14
- export declare function wrapDataInBlock<T>(data: T, block: L2Block): Promise<DataInBlock<T>>;
14
+ export declare function wrapDataInBlock<T>(data: T, block: L2BlockNew): Promise<DataInBlock<T>>;
15
15
  export declare function inBlockSchema(): z.ZodObject<{
16
16
  l2BlockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
17
17
  l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
@@ -40,4 +40,4 @@ export declare function dataInBlockSchemaFor<T extends ZodTypeAny>(schema: T): z
40
40
  } & {
41
41
  data: T;
42
42
  }> extends infer T_2 ? { [k in keyof T_2]: T_2[k]; } : never>;
43
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFdBQVcsQ0FBQztDQUMxQixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7Ozs7Ozs7OztHQUs1QjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7OERBRW5FIn0=
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBELE1BQU0sTUFBTSxPQUFPLEdBQUc7SUFDcEIsYUFBYSxFQUFFLFdBQVcsQ0FBQztJQUMzQixXQUFXLEVBQUUsV0FBVyxDQUFDO0NBQzFCLENBQUM7QUFHRixNQUFNLE1BQU0sV0FBVyxDQUFDLENBQUMsSUFBSTtJQUMzQixJQUFJLEVBQUUsQ0FBQyxDQUFDO0NBQ1QsR0FBRyxPQUFPLENBQUM7QUFFWix3QkFBZ0IsYUFBYSxJQUFJLE9BQU8sQ0FLdkM7QUFFRCx3QkFBZ0IsaUJBQWlCLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUs1RDtBQUVELHdCQUFzQixlQUFlLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBTTVGO0FBRUQsd0JBQWdCLGFBQWE7Ozs7Ozs7Ozs7O0dBSzVCO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLENBQUMsU0FBUyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs4REFFbkUifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"in_block.d.ts","sourceRoot":"","sources":["../../src/block/in_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,WAAW,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,CAAC,CAAC;CACT,GAAG,OAAO,CAAC;AAEZ,wBAAgB,aAAa,IAAI,OAAO,CAKvC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAK5D;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAMzF;AAED,wBAAgB,aAAa;;;;;;;;;;;GAK5B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;8DAEnE"}
1
+ {"version":3,"file":"in_block.d.ts","sourceRoot":"","sources":["../../src/block/in_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,WAAW,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,CAAC,CAAC;CACT,GAAG,OAAO,CAAC;AAEZ,wBAAgB,aAAa,IAAI,OAAO,CAKvC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAK5D;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAM5F;AAED,wBAAgB,aAAa;;;;;;;;;;;GAK5B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;8DAEnE"}
@@ -1,6 +1,4 @@
1
- export * from './l2_block.js';
2
1
  export * from './l2_block_new.js';
3
- export * from './l2_block_header.js';
4
2
  export * from './l2_block_stream/index.js';
5
3
  export * from './in_block.js';
6
4
  export * from './body.js';
@@ -12,4 +10,4 @@ export * from './proposal/index.js';
12
10
  export * from './validate_block_result.js';
13
11
  export * from './l2_block_info.js';
14
12
  export * from './attestation_info.js';
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsdUJBQXVCLENBQUMifQ==
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHVCQUF1QixDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}
@@ -1,6 +1,4 @@
1
- export * from './l2_block.js';
2
1
  export * from './l2_block_new.js';
3
- export * from './l2_block_header.js';
4
2
  export * from './l2_block_stream/index.js';
5
3
  export * from './in_block.js';
6
4
  export * from './body.js';
@@ -1,5 +1,5 @@
1
1
  import { type BlockBlobData } from '@aztec/blob-lib/encoding';
2
- import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
+ import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
3
3
  import { Fr } from '@aztec/foundation/curves/bn254';
4
4
  import { BufferReader } from '@aztec/foundation/serialize';
5
5
  import { z } from 'zod';
@@ -21,7 +21,7 @@ export declare class L2BlockNew {
21
21
  /** Number of the checkpoint that the block belongs to. */
22
22
  checkpointNumber: CheckpointNumber;
23
23
  /** Index of the block within the checkpoint. */
24
- indexWithinCheckpoint: number;
24
+ indexWithinCheckpoint: IndexWithinCheckpoint;
25
25
  constructor(
26
26
  /** Snapshot of archive tree after the block is applied. */
27
27
  archive: AppendOnlyTreeSnapshot,
@@ -32,7 +32,7 @@ export declare class L2BlockNew {
32
32
  /** Number of the checkpoint that the block belongs to. */
33
33
  checkpointNumber: CheckpointNumber,
34
34
  /** Index of the block within the checkpoint. */
35
- indexWithinCheckpoint: number);
35
+ indexWithinCheckpoint: IndexWithinCheckpoint);
36
36
  get number(): BlockNumber;
37
37
  get slot(): SlotNumber;
38
38
  get timestamp(): bigint;
@@ -53,7 +53,7 @@ export declare class L2BlockNew {
53
53
  header: import("@aztec/foundation/schemas").ZodFor<BlockHeader>;
54
54
  body: import("@aztec/foundation/schemas").ZodFor<Body>;
55
55
  checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
56
- indexWithinCheckpoint: z.ZodNumber;
56
+ indexWithinCheckpoint: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, IndexWithinCheckpoint, string | number | bigint>;
57
57
  }, "strip", z.ZodTypeAny, {
58
58
  archive: AppendOnlyTreeSnapshot;
59
59
  header: BlockHeader;
@@ -61,7 +61,9 @@ export declare class L2BlockNew {
61
61
  checkpointNumber: number & {
62
62
  _branding: "CheckpointNumber";
63
63
  };
64
- indexWithinCheckpoint: number;
64
+ indexWithinCheckpoint: number & {
65
+ _branding: "IndexWithinCheckpoint";
66
+ };
65
67
  }, {
66
68
  archive: {
67
69
  root: string;
@@ -70,7 +72,7 @@ export declare class L2BlockNew {
70
72
  header?: any;
71
73
  body?: any;
72
74
  checkpointNumber: string | number | bigint;
73
- indexWithinCheckpoint: number;
75
+ indexWithinCheckpoint: string | number | bigint;
74
76
  }>, L2BlockNew, {
75
77
  archive: {
76
78
  root: string;
@@ -79,7 +81,7 @@ export declare class L2BlockNew {
79
81
  header?: any;
80
82
  body?: any;
81
83
  checkpointNumber: string | number | bigint;
82
- indexWithinCheckpoint: number;
84
+ indexWithinCheckpoint: string | number | bigint;
83
85
  }>;
84
86
  /**
85
87
  * Deserializes a block from a buffer
@@ -116,7 +118,7 @@ export declare class L2BlockNew {
116
118
  */
117
119
  static random(blockNumber: BlockNumber, { checkpointNumber, indexWithinCheckpoint, txsPerBlock, txOptions, makeTxOptions, ...blockHeaderOverrides }?: {
118
120
  checkpointNumber?: CheckpointNumber;
119
- indexWithinCheckpoint?: number;
121
+ indexWithinCheckpoint?: IndexWithinCheckpoint;
120
122
  txsPerBlock?: number;
121
123
  txOptions?: Partial<Parameters<typeof Body.random>[0]>;
122
124
  makeTxOptions?: (txIndex: number) => Partial<Parameters<typeof Body.random>[0]>;
@@ -137,4 +139,4 @@ export declare class L2BlockNew {
137
139
  getPrivateLogs(): PrivateLog[];
138
140
  toBlockInfo(): L2BlockInfo;
139
141
  }
140
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfbmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRixPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUEwQixVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNwSCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBT3REOztHQUVHO0FBQ0gscUJBQWEsVUFBVTtJQUVuQiwyREFBMkQ7SUFDcEQsT0FBTyxFQUFFLHNCQUFzQjtJQUN0QywyQkFBMkI7SUFDcEIsTUFBTSxFQUFFLFdBQVc7SUFDMUIscUJBQXFCO0lBQ2QsSUFBSSxFQUFFLElBQUk7SUFDakIsMERBQTBEO0lBQ25ELGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6QyxnREFBZ0Q7SUFDekMscUJBQXFCLEVBQUUsTUFBTTtJQVZ0QztJQUNFLDJEQUEyRDtJQUNwRCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLDJCQUEyQjtJQUNwQixNQUFNLEVBQUUsV0FBVztJQUMxQixxQkFBcUI7SUFDZCxJQUFJLEVBQUUsSUFBSTtJQUNqQiwwREFBMEQ7SUFDbkQsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ3pDLGdEQUFnRDtJQUN6QyxxQkFBcUIsRUFBRSxNQUFNLEVBQ2xDO0lBRUosSUFBSSxNQUFNLElBQUksV0FBVyxDQUV4QjtJQUVELElBQUksSUFBSSxJQUFJLFVBQVUsQ0FFckI7SUFFRCxJQUFJLFNBQVMsSUFBSSxNQUFNLENBRXRCO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BYWhCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksY0FTM0M7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQUVQO0lBRUQ7OztPQUdHO0lBQ0ksSUFBSSxJQUFJLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFekI7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLEdBQUcsT0FBTyxDQVFsQztJQUVNLFlBQVksSUFBSSxFQUFFLEVBQUUsQ0FHMUI7SUFFTSxlQUFlLElBQUksYUFBYSxDQXNCdEM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLFdBQVcsY0FRaEM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE9BQWEsTUFBTSxDQUNqQixXQUFXLEVBQUUsV0FBVyxFQUN4QixFQUNFLGdCQUF3RCxFQUN4RCxxQkFBeUIsRUFDekIsV0FBZSxFQUNmLFNBQWMsRUFDZCxhQUFhLEVBQ2IsR0FBRyxvQkFBb0IsRUFDeEIsR0FBRTtRQUNELGdCQUFnQixDQUFDLEVBQUUsZ0JBQWdCLENBQUM7UUFDcEMscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDL0IsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3JCLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RCxhQUFhLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pGLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBTSxHQUN6RCxPQUFPLENBQUMsVUFBVSxDQUFDLENBS3JCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUTs7Ozs7Ozs7TUFxQlA7SUFFRCxjQUFjLElBQUksVUFBVSxFQUFFLENBRTdCO0lBRUQsV0FBVyxJQUFJLFdBQVcsQ0FTekI7Q0FDRiJ9
142
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfbmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRixPQUFPLEVBQ0wsV0FBVyxFQUNYLGdCQUFnQixFQUVoQixxQkFBcUIsRUFFckIsVUFBVSxFQUNYLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNqQyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQU90RDs7R0FFRztBQUNILHFCQUFhLFVBQVU7SUFFbkIsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsMkJBQTJCO0lBQ3BCLE1BQU0sRUFBRSxXQUFXO0lBQzFCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJO0lBQ2pCLDBEQUEwRDtJQUNuRCxnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFDekMsZ0RBQWdEO0lBQ3pDLHFCQUFxQixFQUFFLHFCQUFxQjtJQVZyRDtJQUNFLDJEQUEyRDtJQUNwRCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLDJCQUEyQjtJQUNwQixNQUFNLEVBQUUsV0FBVztJQUMxQixxQkFBcUI7SUFDZCxJQUFJLEVBQUUsSUFBSTtJQUNqQiwwREFBMEQ7SUFDbkQsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ3pDLGdEQUFnRDtJQUN6QyxxQkFBcUIsRUFBRSxxQkFBcUIsRUFDakQ7SUFFSixJQUFJLE1BQU0sSUFBSSxXQUFXLENBRXhCO0lBRUQsSUFBSSxJQUFJLElBQUksVUFBVSxDQUVyQjtJQUVELElBQUksU0FBUyxJQUFJLE1BQU0sQ0FFdEI7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQWFoQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLGNBUzNDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFFUDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXpCO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FRbEM7SUFFTSxZQUFZLElBQUksRUFBRSxFQUFFLENBRzFCO0lBRU0sZUFBZSxJQUFJLGFBQWEsQ0FzQnRDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxXQUFXLGNBUWhDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFhLE1BQU0sQ0FDakIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsRUFDRSxnQkFBd0QsRUFDeEQscUJBQWdELEVBQ2hELFdBQWUsRUFDZixTQUFjLEVBQ2QsYUFBYSxFQUNiLEdBQUcsb0JBQW9CLEVBQ3hCLEdBQUU7UUFDRCxnQkFBZ0IsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO1FBQ3BDLHFCQUFxQixDQUFDLEVBQUUscUJBQXFCLENBQUM7UUFDOUMsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3JCLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RCxhQUFhLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pGLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBTSxHQUN6RCxPQUFPLENBQUMsVUFBVSxDQUFDLENBS3JCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUTs7Ozs7Ozs7TUFxQlA7SUFFRCxjQUFjLElBQUksVUFBVSxFQUFFLENBRTdCO0lBRUQsV0FBVyxJQUFJLFdBQVcsQ0FTekI7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"l2_block_new.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAuB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAA0B,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACpH,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOtD;;GAEG;AACH,qBAAa,UAAU;IAEnB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,2BAA2B;IACpB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,0DAA0D;IACnD,gBAAgB,EAAE,gBAAgB;IACzC,gDAAgD;IACzC,qBAAqB,EAAE,MAAM;IAVtC;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,2BAA2B;IACpB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,0DAA0D;IACnD,gBAAgB,EAAE,gBAAgB;IACzC,gDAAgD;IACzC,qBAAqB,EAAE,MAAM,EAClC;IAEJ,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,cAS3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC,CAEzB;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAQlC;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,eAAe,IAAI,aAAa,CAsBtC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,cAQhC;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,WAAW,EAAE,WAAW,EACxB,EACE,gBAAwD,EACxD,qBAAyB,EACzB,WAAe,EACf,SAAc,EACd,aAAa,EACb,GAAG,oBAAoB,EACxB,GAAE;QACD,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,GACzD,OAAO,CAAC,UAAU,CAAC,CAKrB;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,cAAc,IAAI,UAAU,EAAE,CAE7B;IAED,WAAW,IAAI,WAAW,CASzB;CACF"}
1
+ {"version":3,"file":"l2_block_new.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_new.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { encodeBlockBlobData } from '@aztec/blob-lib/encoding';
2
- import { CheckpointNumber, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
2
+ import { CheckpointNumber, CheckpointNumberSchema, IndexWithinCheckpoint, IndexWithinCheckpointSchema } from '@aztec/foundation/branded-types';
3
3
  import { Fr } from '@aztec/foundation/curves/bn254';
4
4
  import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
5
5
  import { z } from 'zod';
@@ -40,7 +40,7 @@ import { Body } from './body.js';
40
40
  header: BlockHeader.schema,
41
41
  body: Body.schema,
42
42
  checkpointNumber: CheckpointNumberSchema,
43
- indexWithinCheckpoint: z.number()
43
+ indexWithinCheckpoint: IndexWithinCheckpointSchema
44
44
  }).transform(({ archive, header, body, checkpointNumber, indexWithinCheckpoint })=>new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint));
45
45
  }
46
46
  /**
@@ -52,7 +52,7 @@ import { Body } from './body.js';
52
52
  const archive = reader.readObject(AppendOnlyTreeSnapshot);
53
53
  const body = reader.readObject(Body);
54
54
  const checkpointNumber = CheckpointNumber(reader.readNumber());
55
- const indexWithinCheckpoint = reader.readNumber();
55
+ const indexWithinCheckpoint = IndexWithinCheckpoint(reader.readNumber());
56
56
  return new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint);
57
57
  }
58
58
  /**
@@ -102,7 +102,7 @@ import { Body } from './body.js';
102
102
  };
103
103
  }
104
104
  static empty(header) {
105
- return new L2BlockNew(AppendOnlyTreeSnapshot.empty(), header ?? BlockHeader.empty(), Body.empty(), CheckpointNumber(0), 0);
105
+ return new L2BlockNew(AppendOnlyTreeSnapshot.empty(), header ?? BlockHeader.empty(), Body.empty(), CheckpointNumber(0), IndexWithinCheckpoint(0));
106
106
  }
107
107
  /**
108
108
  * Creates an L2 block containing random data.
@@ -112,7 +112,7 @@ import { Body } from './body.js';
112
112
  * @param numPublicLogsPerCall - The number of public logs per 1 public function invocation.
113
113
  * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
114
114
  * @returns The L2 block.
115
- */ static async random(blockNumber, { checkpointNumber = CheckpointNumber(Number(blockNumber)), indexWithinCheckpoint = 0, txsPerBlock = 1, txOptions = {}, makeTxOptions, ...blockHeaderOverrides } = {}) {
115
+ */ static async random(blockNumber, { checkpointNumber = CheckpointNumber(Number(blockNumber)), indexWithinCheckpoint = IndexWithinCheckpoint(0), txsPerBlock = 1, txOptions = {}, makeTxOptions, ...blockHeaderOverrides } = {}) {
116
116
  const archive = new AppendOnlyTreeSnapshot(Fr.random(), blockNumber + 1);
117
117
  const header = BlockHeader.random({
118
118
  blockNumber,
@@ -10,8 +10,7 @@ import type { BlockHeader } from '../tx/block_header.js';
10
10
  import type { IndexedTxEffect } from '../tx/indexed_tx_effect.js';
11
11
  import type { TxHash } from '../tx/tx_hash.js';
12
12
  import type { TxReceipt } from '../tx/tx_receipt.js';
13
- import { type CheckpointedL2Block, PublishedL2Block } from './checkpointed_l2_block.js';
14
- import type { L2Block } from './l2_block.js';
13
+ import type { CheckpointedL2Block } from './checkpointed_l2_block.js';
15
14
  import type { L2BlockNew } from './l2_block_new.js';
16
15
  import type { ValidateCheckpointNegativeResult, ValidateCheckpointResult } from './validate_block_result.js';
17
16
  /**
@@ -82,6 +81,18 @@ export interface L2BlockSource {
82
81
  * @returns The requested L2 block (or undefined if not found).
83
82
  */
84
83
  getL2BlockNew(number: BlockNumber): Promise<L2BlockNew | undefined>;
84
+ /**
85
+ * Gets an L2 block by its hash.
86
+ * @param blockHash - The block hash to retrieve.
87
+ * @returns The requested L2 block (or undefined if not found).
88
+ */
89
+ getL2BlockNewByHash(blockHash: Fr): Promise<L2BlockNew | undefined>;
90
+ /**
91
+ * Gets an L2 block by its archive root.
92
+ * @param archive - The archive root to retrieve.
93
+ * @returns The requested L2 block (or undefined if not found).
94
+ */
95
+ getL2BlockNewByArchive(archive: Fr): Promise<L2BlockNew | undefined>;
85
96
  /**
86
97
  * Gets a tx effect.
87
98
  * @param txHash - The hash of the tx corresponding to the tx effect.
@@ -143,17 +154,15 @@ export interface L2BlockSource {
143
154
  * Gets an l2 block. If a negative number is passed, the block returned is the most recent.
144
155
  * @param number - The block number to return (inclusive).
145
156
  * @returns The requested L2 block.
146
- * @deprecated Use getL2BlockNew instead.
147
157
  */
148
- getBlock(number: BlockNumber): Promise<L2Block | undefined>;
149
- getL2BlockNew(number: BlockNumber): Promise<L2BlockNew | undefined>;
158
+ getBlock(number: BlockNumber): Promise<L2BlockNew | undefined>;
150
159
  getL2BlocksNew(from: BlockNumber, limit: number, proven?: boolean): Promise<L2BlockNew[]>;
151
160
  /**
152
161
  * Returns all blocks for a given epoch.
153
162
  * @dev Use this method only with recent epochs, since it walks the block list backwards.
154
163
  * @param epochNumber - The epoch number to return blocks for.
155
164
  */
156
- getBlocksForEpoch(epochNumber: EpochNumber): Promise<L2Block[]>;
165
+ getBlocksForEpoch(epochNumber: EpochNumber): Promise<L2BlockNew[]>;
157
166
  /**
158
167
  * Returns all blocks for a given slot.
159
168
  * @dev Use this method only with recent slots, since it walks the block list backwards.
@@ -165,13 +174,13 @@ export interface L2BlockSource {
165
174
  * @param blockHash - The block hash to retrieve.
166
175
  * @returns The requested block (or undefined if not found).
167
176
  */
168
- getPublishedBlockByHash(blockHash: Fr): Promise<PublishedL2Block | undefined>;
177
+ getPublishedBlockByHash(blockHash: Fr): Promise<CheckpointedL2Block | undefined>;
169
178
  /**
170
179
  * Gets a published block by its archive root.
171
180
  * @param archive - The archive root to retrieve.
172
181
  * @returns The requested block (or undefined if not found).
173
182
  */
174
- getPublishedBlockByArchive(archive: Fr): Promise<PublishedL2Block | undefined>;
183
+ getPublishedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined>;
175
184
  /**
176
185
  * Gets up to `limit` amount of L2 blocks starting from `from`.
177
186
  * @param from - Number of the first block to return (inclusive).
@@ -179,9 +188,9 @@ export interface L2BlockSource {
179
188
  * @param proven - If true, only return blocks that have been proven.
180
189
  * @returns The requested L2 blocks.
181
190
  */
182
- getBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<L2Block[]>;
191
+ getBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<L2BlockNew[]>;
183
192
  /** Equivalent to getBlocks but includes publish data. */
184
- getPublishedBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<PublishedL2Block[]>;
193
+ getPublishedBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<CheckpointedL2Block[]>;
185
194
  }
186
195
  /**
187
196
  * Interface for classes that can receive and store L2 blocks.
@@ -514,4 +523,4 @@ export type InvalidCheckpointDetectedEvent = {
514
523
  type: 'invalidCheckpointDetected';
515
524
  validationResult: ValidateCheckpointNegativeResult;
516
525
  };
517
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l2_block_source.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_source.ts"],"names":[],"mappings":"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"}
526
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l2_block_source.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_source.ts"],"names":[],"mappings":"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"}