@aztec/stdlib 0.87.3-nightly.20250529 → 0.87.4

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 (182) hide show
  1. package/dest/abi/abi.d.ts +0 -3
  2. package/dest/abi/abi.d.ts.map +1 -1
  3. package/dest/abi/abi.js +0 -38
  4. package/dest/avm/avm.d.ts +12 -696
  5. package/dest/avm/avm.d.ts.map +1 -1
  6. package/dest/avm/avm.js +8 -16
  7. package/dest/avm/avm_accumulated_data.d.ts +0 -77
  8. package/dest/avm/avm_accumulated_data.d.ts.map +1 -1
  9. package/dest/avm/avm_accumulated_data.js +0 -67
  10. package/dest/avm/avm_circuit_public_inputs.d.ts +3 -73
  11. package/dest/avm/avm_circuit_public_inputs.d.ts.map +1 -1
  12. package/dest/avm/avm_circuit_public_inputs.js +9 -19
  13. package/dest/avm/avm_proving_request.d.ts +0 -366
  14. package/dest/avm/avm_proving_request.d.ts.map +1 -1
  15. package/dest/block/body.d.ts +1 -1
  16. package/dest/block/body.d.ts.map +1 -1
  17. package/dest/block/body.js +2 -2
  18. package/dest/block/index.d.ts +0 -1
  19. package/dest/block/index.d.ts.map +1 -1
  20. package/dest/block/index.js +0 -1
  21. package/dest/block/l2_block.d.ts +2 -3
  22. package/dest/block/l2_block.d.ts.map +1 -1
  23. package/dest/block/l2_block.js +5 -10
  24. package/dest/block/l2_block_source.d.ts +4 -9
  25. package/dest/block/l2_block_source.d.ts.map +1 -1
  26. package/dest/block/l2_block_source.js +0 -1
  27. package/dest/block/published_l2_block.d.ts +69 -99
  28. package/dest/block/published_l2_block.d.ts.map +1 -1
  29. package/dest/block/published_l2_block.js +12 -38
  30. package/dest/block/test/l2_tips_store_test_suite.js +1 -1
  31. package/dest/interfaces/archiver.js +2 -2
  32. package/dest/interfaces/aztec-node.js +2 -2
  33. package/dest/interfaces/p2p.d.ts +2 -5
  34. package/dest/interfaces/p2p.d.ts.map +1 -1
  35. package/dest/interfaces/p2p.js +2 -1
  36. package/dest/interfaces/proving-job.d.ts +4 -370
  37. package/dest/interfaces/proving-job.d.ts.map +1 -1
  38. package/dest/interfaces/proving-job.js +2 -2
  39. package/dest/interfaces/server_circuit_prover.d.ts +2 -3
  40. package/dest/interfaces/server_circuit_prover.d.ts.map +1 -1
  41. package/dest/kernel/hints/find_private_kernel_reset_dimensions.js +1 -1
  42. package/dest/kernel/hints/key_validation_hint.d.ts +6 -2
  43. package/dest/kernel/hints/key_validation_hint.d.ts.map +1 -1
  44. package/dest/kernel/hints/key_validation_hint.js +7 -5
  45. package/dest/kernel/hints/private_kernel_reset_hints.d.ts +7 -7
  46. package/dest/kernel/hints/private_kernel_reset_hints.d.ts.map +1 -1
  47. package/dest/kernel/hints/private_kernel_reset_hints.js +4 -8
  48. package/dest/kernel/hints/read_request_hints.d.ts +8 -8
  49. package/dest/kernel/hints/read_request_hints.d.ts.map +1 -1
  50. package/dest/kernel/index.d.ts +0 -1
  51. package/dest/kernel/index.d.ts.map +1 -1
  52. package/dest/kernel/index.js +0 -1
  53. package/dest/kernel/private_kernel_data.d.ts +25 -6
  54. package/dest/kernel/private_kernel_data.d.ts.map +1 -1
  55. package/dest/kernel/private_kernel_data.js +19 -8
  56. package/dest/kernel/private_kernel_reset_circuit_private_inputs.d.ts +4 -7
  57. package/dest/kernel/private_kernel_reset_circuit_private_inputs.d.ts.map +1 -1
  58. package/dest/kernel/private_kernel_reset_circuit_private_inputs.js +6 -10
  59. package/dest/kernel/private_kernel_reset_dimensions.d.ts +10 -10
  60. package/dest/kernel/private_kernel_reset_dimensions.d.ts.map +1 -1
  61. package/dest/kernel/private_kernel_reset_dimensions.js +29 -29
  62. package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts +1 -10
  63. package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts.map +1 -1
  64. package/dest/kernel/private_kernel_tail_circuit_private_inputs.js +3 -8
  65. package/dest/kernel/public_call_request.d.ts +0 -54
  66. package/dest/kernel/public_call_request.d.ts.map +1 -1
  67. package/dest/kernel/public_call_request.js +0 -58
  68. package/dest/logs/contract_class_log.d.ts +4 -0
  69. package/dest/logs/contract_class_log.d.ts.map +1 -1
  70. package/dest/logs/contract_class_log.js +33 -0
  71. package/dest/logs/log_with_tx_data.d.ts +3 -3
  72. package/dest/logs/log_with_tx_data.d.ts.map +1 -1
  73. package/dest/logs/log_with_tx_data.js +13 -9
  74. package/dest/logs/private_log.d.ts +0 -1
  75. package/dest/logs/private_log.d.ts.map +1 -1
  76. package/dest/logs/private_log.js +0 -3
  77. package/dest/logs/public_log.d.ts +0 -1
  78. package/dest/logs/public_log.d.ts.map +1 -1
  79. package/dest/logs/public_log.js +0 -3
  80. package/dest/logs/tx_scoped_l2_log.d.ts.map +1 -1
  81. package/dest/logs/tx_scoped_l2_log.js +0 -1
  82. package/dest/rollup/avm_proof_data.d.ts +5 -7
  83. package/dest/rollup/avm_proof_data.d.ts.map +1 -1
  84. package/dest/rollup/avm_proof_data.js +4 -12
  85. package/dest/rollup/base_rollup_hints.d.ts +4 -4
  86. package/dest/rollup/base_rollup_hints.d.ts.map +1 -1
  87. package/dest/rollup/base_rollup_hints.js +8 -8
  88. package/dest/rollup/previous_rollup_block_data.d.ts +15 -6
  89. package/dest/rollup/previous_rollup_block_data.d.ts.map +1 -1
  90. package/dest/rollup/previous_rollup_block_data.js +13 -8
  91. package/dest/rollup/previous_rollup_data.d.ts +15 -6
  92. package/dest/rollup/previous_rollup_data.d.ts.map +1 -1
  93. package/dest/rollup/previous_rollup_data.js +13 -8
  94. package/dest/rollup/private_tube_data.d.ts +3 -3
  95. package/dest/rollup/private_tube_data.d.ts.map +1 -1
  96. package/dest/rollup/private_tube_data.js +3 -3
  97. package/dest/rollup/public_tube_data.d.ts +3 -3
  98. package/dest/rollup/public_tube_data.d.ts.map +1 -1
  99. package/dest/rollup/public_tube_data.js +3 -3
  100. package/dest/rollup/root_rollup.d.ts +10 -9
  101. package/dest/rollup/root_rollup.d.ts.map +1 -1
  102. package/dest/rollup/root_rollup.js +20 -9
  103. package/dest/tests/factories.d.ts +1 -2
  104. package/dest/tests/factories.d.ts.map +1 -1
  105. package/dest/tests/factories.js +19 -25
  106. package/dest/tests/mocks.d.ts.map +1 -1
  107. package/dest/tests/mocks.js +3 -4
  108. package/dest/tx/processed_tx.d.ts.map +1 -1
  109. package/dest/tx/processed_tx.js +5 -2
  110. package/dest/tx/tx.d.ts +25 -10
  111. package/dest/tx/tx.d.ts.map +1 -1
  112. package/dest/tx/tx.js +50 -25
  113. package/dest/tx/tx_effect.d.ts +1 -1
  114. package/dest/tx/tx_effect.d.ts.map +1 -1
  115. package/dest/tx/tx_effect.js +2 -2
  116. package/dest/validators/types.d.ts +0 -4
  117. package/dest/validators/types.d.ts.map +1 -1
  118. package/dest/vks/index.d.ts +1 -1
  119. package/dest/vks/index.d.ts.map +1 -1
  120. package/dest/vks/index.js +1 -1
  121. package/dest/vks/{vk_data.d.ts → vk_witness_data.d.ts} +8 -8
  122. package/dest/vks/vk_witness_data.d.ts.map +1 -0
  123. package/dest/vks/{vk_data.js → vk_witness_data.js} +10 -10
  124. package/package.json +7 -7
  125. package/src/abi/abi.ts +0 -37
  126. package/src/avm/avm.ts +0 -14
  127. package/src/avm/avm_accumulated_data.ts +0 -93
  128. package/src/avm/avm_circuit_public_inputs.ts +2 -22
  129. package/src/block/body.ts +2 -7
  130. package/src/block/index.ts +0 -1
  131. package/src/block/l2_block.ts +3 -8
  132. package/src/block/l2_block_source.ts +3 -9
  133. package/src/block/published_l2_block.ts +24 -38
  134. package/src/block/test/l2_tips_store_test_suite.ts +1 -1
  135. package/src/interfaces/archiver.ts +2 -2
  136. package/src/interfaces/aztec-node.ts +2 -2
  137. package/src/interfaces/p2p.ts +3 -8
  138. package/src/interfaces/proving-job.ts +3 -3
  139. package/src/interfaces/server_circuit_prover.ts +2 -3
  140. package/src/kernel/hints/find_private_kernel_reset_dimensions.ts +3 -3
  141. package/src/kernel/hints/key_validation_hint.ts +6 -4
  142. package/src/kernel/hints/private_kernel_reset_hints.ts +43 -34
  143. package/src/kernel/hints/read_request_hints.ts +15 -27
  144. package/src/kernel/index.ts +0 -1
  145. package/src/kernel/private_kernel_data.ts +29 -7
  146. package/src/kernel/private_kernel_reset_circuit_private_inputs.ts +13 -16
  147. package/src/kernel/private_kernel_reset_dimensions.ts +27 -27
  148. package/src/kernel/private_kernel_tail_circuit_private_inputs.ts +2 -10
  149. package/src/kernel/public_call_request.ts +0 -66
  150. package/src/logs/contract_class_log.ts +36 -0
  151. package/src/logs/log_with_tx_data.ts +11 -7
  152. package/src/logs/private_log.ts +0 -4
  153. package/src/logs/public_log.ts +0 -4
  154. package/src/logs/tx_scoped_l2_log.ts +0 -1
  155. package/src/rollup/avm_proof_data.ts +7 -14
  156. package/src/rollup/base_rollup_hints.ts +4 -4
  157. package/src/rollup/previous_rollup_block_data.ts +12 -6
  158. package/src/rollup/previous_rollup_data.ts +12 -6
  159. package/src/rollup/private_tube_data.ts +4 -4
  160. package/src/rollup/public_tube_data.ts +4 -4
  161. package/src/rollup/root_rollup.ts +19 -6
  162. package/src/tests/factories.ts +32 -36
  163. package/src/tests/mocks.ts +3 -6
  164. package/src/tx/processed_tx.ts +5 -4
  165. package/src/tx/tx.ts +54 -28
  166. package/src/tx/tx_effect.ts +5 -23
  167. package/src/validators/types.ts +0 -2
  168. package/src/vks/index.ts +1 -1
  169. package/src/vks/{vk_data.ts → vk_witness_data.ts} +6 -6
  170. package/dest/block/proposal/committee_attestation.d.ts +0 -34
  171. package/dest/block/proposal/committee_attestation.d.ts.map +0 -1
  172. package/dest/block/proposal/committee_attestation.js +0 -59
  173. package/dest/block/proposal/index.d.ts +0 -2
  174. package/dest/block/proposal/index.d.ts.map +0 -1
  175. package/dest/block/proposal/index.js +0 -1
  176. package/dest/kernel/padded_side_effects.d.ts +0 -26
  177. package/dest/kernel/padded_side_effects.d.ts.map +0 -1
  178. package/dest/kernel/padded_side_effects.js +0 -51
  179. package/dest/vks/vk_data.d.ts.map +0 -1
  180. package/src/block/proposal/committee_attestation.ts +0 -70
  181. package/src/block/proposal/index.ts +0 -1
  182. package/src/kernel/padded_side_effects.ts +0 -73
@@ -14,14 +14,13 @@ export declare class L2Block {
14
14
  header: BlockHeader;
15
15
  /** L2 block body. */
16
16
  body: Body;
17
- private blockHash;
18
17
  constructor(
19
18
  /** Snapshot of archive tree after the block is applied. */
20
19
  archive: AppendOnlyTreeSnapshot,
21
20
  /** L2 block header. */
22
21
  header: BlockHeader,
23
22
  /** L2 block body. */
24
- body: Body, blockHash?: Fr | undefined);
23
+ body: Body);
25
24
  static get schema(): z.ZodEffects<z.ZodObject<{
26
25
  archive: z.ZodEffects<z.ZodObject<{
27
26
  root: z.ZodType<Fr, any, string>;
@@ -87,7 +86,7 @@ export declare class L2Block {
87
86
  * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
88
87
  * @returns The L2 block.
89
88
  */
90
- static random(l2BlockNum: number, txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, inHash?: Buffer | undefined, slotNumber?: number | undefined, maxEffects?: number | undefined): Promise<L2Block>;
89
+ static random(l2BlockNum: number, txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, inHash?: Buffer | undefined, slotNumber?: number | undefined): Promise<L2Block>;
91
90
  /**
92
91
  * Creates an L2 block containing empty data.
93
92
  * @returns The L2 block.
@@ -1 +1 @@
1
- {"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC;;GAEG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;;IANjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB;IAG/C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAS5C;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;OAQG;WACU,MAAM,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,MAAM,GAAG,SAAqB,EACtC,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC;IAUnB;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO;IAIvB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAOhC;;;OAGG;IACH,QAAQ;;;;;;;;;IAuBR,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB"}
1
+ {"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC;;GAEG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;;IALjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IAGnB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAS5C;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;OAQG;WACU,MAAM,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,MAAM,GAAG,SAAqB,EACtC,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC;IAUnB;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO;IAIvB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAI1B;;;OAGG;IACH,QAAQ;;;;;;;;;IAuBR,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB"}
@@ -11,12 +11,10 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
11
11
  archive;
12
12
  header;
13
13
  body;
14
- blockHash;
15
- constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** L2 block header. */ header, /** L2 block body. */ body, blockHash = undefined){
14
+ constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** L2 block header. */ header, /** L2 block body. */ body){
16
15
  this.archive = archive;
17
16
  this.header = header;
18
17
  this.body = body;
19
- this.blockHash = blockHash;
20
18
  }
21
19
  static get schema() {
22
20
  return z.object({
@@ -62,8 +60,8 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
62
60
  * @param numPublicLogsPerCall - The number of public logs per 1 public function invocation.
63
61
  * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
64
62
  * @returns The L2 block.
65
- */ static async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined, maxEffects = undefined) {
66
- const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall, maxEffects);
63
+ */ static async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined) {
64
+ const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall);
67
65
  return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeHeader(0, txsPerBlock, l2BlockNum, slotNumber ?? l2BlockNum, inHash), body);
68
66
  }
69
67
  /**
@@ -78,11 +76,8 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
78
76
  /**
79
77
  * Returns the block's hash (hash of block header).
80
78
  * @returns The block's hash.
81
- */ async hash() {
82
- if (this.blockHash === undefined) {
83
- this.blockHash = await this.header.hash();
84
- }
85
- return this.blockHash;
79
+ */ hash() {
80
+ return this.header.hash();
86
81
  }
87
82
  /**
88
83
  * Returns stats used for logging.
@@ -1,5 +1,5 @@
1
1
  import type { EthAddress } from '@aztec/foundation/eth-address';
2
- import type { TypedEventEmitter } from '@aztec/foundation/types';
2
+ import type { EventEmitter } from 'events';
3
3
  import { z } from 'zod';
4
4
  import type { L1RollupConstants } from '../epoch-helpers/index.js';
5
5
  import type { BlockHeader } from '../tx/block_header.js';
@@ -106,11 +106,7 @@ export interface L2BlockSource {
106
106
  * L2BlockSource that emits events upon pending / proven chain changes.
107
107
  * see L2BlockSourceEvents for the events emitted.
108
108
  */
109
- export type ArchiverEmitter = TypedEventEmitter<{
110
- [L2BlockSourceEvents.L2PruneDetected]: (args: L2BlockSourceEvent) => void;
111
- [L2BlockSourceEvents.L2BlockProven]: (args: L2BlockSourceEvent) => void;
112
- }>;
113
- export interface L2BlockSourceEventEmitter extends L2BlockSource, ArchiverEmitter {
109
+ export interface L2BlockSourceEventEmitter extends L2BlockSource, EventEmitter {
114
110
  }
115
111
  /**
116
112
  * Identifier for L2 block tags.
@@ -248,11 +244,10 @@ export declare const L2TipsSchema: z.ZodObject<{
248
244
  };
249
245
  }>;
250
246
  export declare enum L2BlockSourceEvents {
251
- L2PruneDetected = "l2PruneDetected",
252
- L2BlockProven = "l2BlockProven"
247
+ L2PruneDetected = "l2PruneDetected"
253
248
  }
254
249
  export type L2BlockSourceEvent = {
255
- type: 'l2PruneDetected' | 'l2BlockProven';
250
+ type: 'l2PruneDetected';
256
251
  blockNumber: bigint;
257
252
  slotNumber: bigint;
258
253
  epochNumber: bigint;
@@ -1 +1 @@
1
- {"version":3,"file":"l2_block_source.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_source.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"l2_block_source.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_source.ts"],"names":[],"mappings":"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"}
@@ -26,6 +26,5 @@ export const L2TipsSchema = z.object({
26
26
  });
27
27
  export var L2BlockSourceEvents = /*#__PURE__*/ function(L2BlockSourceEvents) {
28
28
  L2BlockSourceEvents["L2PruneDetected"] = "l2PruneDetected";
29
- L2BlockSourceEvents["L2BlockProven"] = "l2BlockProven";
30
29
  return L2BlockSourceEvents;
31
30
  }({});
@@ -1,13 +1,54 @@
1
+ import { Signature } from '@aztec/foundation/eth-signature';
2
+ import { L2Block } from '@aztec/stdlib/block';
1
3
  import { z } from 'zod';
2
4
  import { BlockAttestation } from '../p2p/block_attestation.js';
3
- import { L2Block } from './l2_block.js';
4
- import { CommitteeAttestation } from './proposal/committee_attestation.js';
5
- export declare class L1PublishedData {
5
+ export type L1PublishedData = {
6
6
  blockNumber: bigint;
7
7
  timestamp: bigint;
8
8
  blockHash: string;
9
- constructor(blockNumber: bigint, timestamp: bigint, blockHash: string);
10
- static get schema(): z.ZodObject<{
9
+ };
10
+ export type PublishedL2Block = {
11
+ block: L2Block;
12
+ l1: L1PublishedData;
13
+ signatures: Signature[];
14
+ };
15
+ export declare const PublishedL2BlockSchema: z.ZodObject<{
16
+ block: z.ZodEffects<z.ZodObject<{
17
+ archive: z.ZodEffects<z.ZodObject<{
18
+ root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
19
+ nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
20
+ }, "strip", z.ZodTypeAny, {
21
+ root: import("@aztec/foundation/schemas").Fr;
22
+ nextAvailableLeafIndex: number;
23
+ }, {
24
+ root: string;
25
+ nextAvailableLeafIndex: string | number | bigint;
26
+ }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
27
+ root: string;
28
+ nextAvailableLeafIndex: string | number | bigint;
29
+ }>;
30
+ header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
31
+ body: import("@aztec/foundation/schemas").ZodFor<import("@aztec/stdlib/block").Body>;
32
+ }, "strip", z.ZodTypeAny, {
33
+ archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
34
+ header: import("../tx/block_header.js").BlockHeader;
35
+ body: import("@aztec/stdlib/block").Body;
36
+ }, {
37
+ archive: {
38
+ root: string;
39
+ nextAvailableLeafIndex: string | number | bigint;
40
+ };
41
+ header?: any;
42
+ body?: any;
43
+ }>, L2Block, {
44
+ archive: {
45
+ root: string;
46
+ nextAvailableLeafIndex: string | number | bigint;
47
+ };
48
+ header?: any;
49
+ body?: any;
50
+ }>;
51
+ l1: z.ZodObject<{
11
52
  blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
12
53
  timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
13
54
  blockHash: z.ZodString;
@@ -20,101 +61,30 @@ export declare class L1PublishedData {
20
61
  timestamp: string | number | bigint;
21
62
  blockHash: string;
22
63
  }>;
23
- }
24
- export declare class PublishedL2Block {
64
+ signatures: z.ZodArray<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, Signature, string>, "many">;
65
+ }, "strip", z.ZodTypeAny, {
25
66
  block: L2Block;
26
- l1: L1PublishedData;
27
- attestations: CommitteeAttestation[];
28
- constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
29
- static get schema(): z.ZodObject<{
30
- block: z.ZodEffects<z.ZodObject<{
31
- archive: z.ZodEffects<z.ZodObject<{
32
- root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
33
- nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
34
- }, "strip", z.ZodTypeAny, {
35
- root: import("@aztec/foundation/schemas").Fr;
36
- nextAvailableLeafIndex: number;
37
- }, {
38
- root: string;
39
- nextAvailableLeafIndex: string | number | bigint;
40
- }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
41
- root: string;
42
- nextAvailableLeafIndex: string | number | bigint;
43
- }>;
44
- header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
45
- body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
46
- }, "strip", z.ZodTypeAny, {
47
- archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
48
- header: import("../tx/block_header.js").BlockHeader;
49
- body: import("./body.js").Body;
50
- }, {
51
- archive: {
52
- root: string;
53
- nextAvailableLeafIndex: string | number | bigint;
54
- };
55
- header?: any;
56
- body?: any;
57
- }>, L2Block, {
58
- archive: {
59
- root: string;
60
- nextAvailableLeafIndex: string | number | bigint;
61
- };
62
- header?: any;
63
- body?: any;
64
- }>;
65
- l1: z.ZodObject<{
66
- blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
67
- timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
68
- blockHash: z.ZodString;
69
- }, "strip", z.ZodTypeAny, {
70
- blockNumber: bigint;
71
- timestamp: bigint;
72
- blockHash: string;
73
- }, {
74
- blockNumber: string | number | bigint;
75
- timestamp: string | number | bigint;
76
- blockHash: string;
77
- }>;
78
- attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
79
- address: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
80
- signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
81
- }, "strip", z.ZodTypeAny, {
82
- address: import("@aztec/foundation/schemas").EthAddress;
83
- signature: import("./proposal/committee_attestation.js").Signature;
84
- }, {
85
- address: string;
86
- signature: string;
87
- }>, CommitteeAttestation, {
88
- address: string;
89
- signature: string;
90
- }>, "many">;
91
- }, "strip", z.ZodTypeAny, {
92
- block: L2Block;
93
- l1: {
94
- blockNumber: bigint;
95
- timestamp: bigint;
96
- blockHash: string;
97
- };
98
- attestations: CommitteeAttestation[];
99
- }, {
100
- block: {
101
- archive: {
102
- root: string;
103
- nextAvailableLeafIndex: string | number | bigint;
104
- };
105
- header?: any;
106
- body?: any;
107
- };
108
- l1: {
109
- blockNumber: string | number | bigint;
110
- timestamp: string | number | bigint;
111
- blockHash: string;
67
+ l1: {
68
+ blockNumber: bigint;
69
+ timestamp: bigint;
70
+ blockHash: string;
71
+ };
72
+ signatures: Signature[];
73
+ }, {
74
+ block: {
75
+ archive: {
76
+ root: string;
77
+ nextAvailableLeafIndex: string | number | bigint;
112
78
  };
113
- attestations: {
114
- address: string;
115
- signature: string;
116
- }[];
117
- }>;
118
- }
79
+ header?: any;
80
+ body?: any;
81
+ };
82
+ l1: {
83
+ blockNumber: string | number | bigint;
84
+ timestamp: string | number | bigint;
85
+ blockHash: string;
86
+ };
87
+ signatures: string[];
88
+ }>;
119
89
  export declare function getAttestationsFromPublishedL2Block(block: PublishedL2Block): BlockAttestation[];
120
90
  //# sourceMappingURL=published_l2_block.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,qBAAa,eAAe;IAEjB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;gBAFjB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAMhB;CACF;AAED,qBAAa,gBAAgB;IAElB,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;gBAFpC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE;IAG7C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAMhB;CACF;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,sBAQ1E"}
1
+ {"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQjC,CAAC;AAEH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,sBAK1E"}
@@ -1,45 +1,19 @@
1
- // Ignoring import issue to fix portable inferred type issue in zod schema
1
+ import { Signature } from '@aztec/foundation/eth-signature';
2
2
  import { schemas } from '@aztec/foundation/schemas';
3
+ import { L2Block } from '@aztec/stdlib/block';
3
4
  import { z } from 'zod';
4
5
  import { BlockAttestation } from '../p2p/block_attestation.js';
5
6
  import { ConsensusPayload } from '../p2p/consensus_payload.js';
6
- import { L2Block } from './l2_block.js';
7
- import { CommitteeAttestation } from './proposal/committee_attestation.js';
8
- export class L1PublishedData {
9
- blockNumber;
10
- timestamp;
11
- blockHash;
12
- constructor(blockNumber, timestamp, blockHash){
13
- this.blockNumber = blockNumber;
14
- this.timestamp = timestamp;
15
- this.blockHash = blockHash;
16
- }
17
- static get schema() {
18
- return z.object({
19
- blockNumber: schemas.BigInt,
20
- timestamp: schemas.BigInt,
21
- blockHash: z.string()
22
- });
23
- }
24
- }
25
- export class PublishedL2Block {
26
- block;
27
- l1;
28
- attestations;
29
- constructor(block, l1, attestations){
30
- this.block = block;
31
- this.l1 = l1;
32
- this.attestations = attestations;
33
- }
34
- static get schema() {
35
- return z.object({
36
- block: L2Block.schema,
37
- l1: L1PublishedData.schema,
38
- attestations: z.array(CommitteeAttestation.schema)
39
- });
40
- }
41
- }
7
+ export const PublishedL2BlockSchema = z.object({
8
+ block: L2Block.schema,
9
+ l1: z.object({
10
+ blockNumber: schemas.BigInt,
11
+ timestamp: schemas.BigInt,
12
+ blockHash: z.string()
13
+ }),
14
+ signatures: z.array(Signature.schema)
15
+ });
42
16
  export function getAttestationsFromPublishedL2Block(block) {
43
17
  const payload = ConsensusPayload.fromBlock(block.block);
44
- return block.attestations.filter((attestation)=>!attestation.signature.isEmpty()).map((attestation)=>new BlockAttestation(block.block.header.globalVariables.blockNumber, payload, attestation.signature));
18
+ return block.signatures.filter((sig)=>!sig.isEmpty).map((signature)=>new BlockAttestation(block.block.header.globalVariables.blockNumber, payload, signature));
45
19
  }
@@ -18,7 +18,7 @@ export function testL2TipsStore(makeTipsStore) {
18
18
  blockHash: `0x${number}`,
19
19
  timestamp: BigInt(number)
20
20
  },
21
- attestations: []
21
+ signatures: []
22
22
  });
23
23
  const makeBlockId = (number)=>({
24
24
  number,
@@ -1,7 +1,7 @@
1
1
  import { z } from 'zod';
2
2
  import { L2Block } from '../block/l2_block.js';
3
3
  import { L2TipsSchema } from '../block/l2_block_source.js';
4
- import { PublishedL2Block } from '../block/published_l2_block.js';
4
+ import { PublishedL2BlockSchema } from '../block/published_l2_block.js';
5
5
  import { ContractClassPublicSchema, ContractInstanceWithAddressSchema } from '../contract/index.js';
6
6
  import { L1RollupConstantsSchema } from '../epoch-helpers/index.js';
7
7
  import { LogFilterSchema } from '../logs/log_filter.js';
@@ -24,7 +24,7 @@ export const ArchiverApiSchema = {
24
24
  z.literal('latest')
25
25
  ])).returns(BlockHeader.schema.optional()),
26
26
  getBlocks: z.function().args(schemas.Integer, schemas.Integer, optional(z.boolean())).returns(z.array(L2Block.schema)),
27
- getPublishedBlocks: z.function().args(schemas.Integer, schemas.Integer, optional(z.boolean())).returns(z.array(PublishedL2Block.schema)),
27
+ getPublishedBlocks: z.function().args(schemas.Integer, schemas.Integer, optional(z.boolean())).returns(z.array(PublishedL2BlockSchema)),
28
28
  getTxEffect: z.function().args(TxHash.schema).returns(indexedTxSchema().optional()),
29
29
  getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
30
30
  getL2SlotNumber: z.function().args().returns(schemas.BigInt),
@@ -7,7 +7,7 @@ import { inBlockSchemaFor } from '../block/in_block.js';
7
7
  import { L2Block } from '../block/l2_block.js';
8
8
  import { L2BlockNumberSchema } from '../block/l2_block_number.js';
9
9
  import { L2TipsSchema } from '../block/l2_block_source.js';
10
- import { PublishedL2Block } from '../block/published_l2_block.js';
10
+ import { PublishedL2BlockSchema } from '../block/published_l2_block.js';
11
11
  import { ContractClassPublicSchema, ContractInstanceWithAddressSchema, NodeInfoSchema, ProtocolContractAddressesSchema } from '../contract/index.js';
12
12
  import { GasFees } from '../gas/gas_fees.js';
13
13
  import { LogFilterSchema } from '../logs/log_filter.js';
@@ -48,7 +48,7 @@ export const AztecNodeApiSchema = {
48
48
  isReady: z.function().returns(z.boolean()),
49
49
  getNodeInfo: z.function().returns(NodeInfoSchema),
50
50
  getBlocks: z.function().args(z.number(), z.number()).returns(z.array(L2Block.schema)),
51
- getPublishedBlocks: z.function().args(z.number(), z.number()).returns(z.array(PublishedL2Block.schema)),
51
+ getPublishedBlocks: z.function().args(z.number(), z.number()).returns(z.array(PublishedL2BlockSchema)),
52
52
  getCurrentBaseFees: z.function().returns(GasFees.schema),
53
53
  getNodeVersion: z.function().returns(z.string()),
54
54
  getVersion: z.function().returns(z.number()),
@@ -36,7 +36,7 @@ export interface P2PApiWithoutAttestations {
36
36
  */
37
37
  getPeers(includePending?: boolean): Promise<PeerInfo[]>;
38
38
  }
39
- export interface P2PApiWithAttestations extends P2PApiWithoutAttestations {
39
+ export interface P2PClient extends P2PApiWithoutAttestations {
40
40
  /**
41
41
  * Queries the Attestation pool for attestations for the given slot
42
42
  *
@@ -45,12 +45,9 @@ export interface P2PApiWithAttestations extends P2PApiWithoutAttestations {
45
45
  * @returns BlockAttestations
46
46
  */
47
47
  getAttestationsForSlot(slot: bigint, proposalId?: string): Promise<BlockAttestation[]>;
48
- }
49
- export interface P2PClient extends P2PApiWithAttestations {
50
48
  /** Manually adds an attestation to the p2p client attestation pool. */
51
49
  addAttestation(attestation: BlockAttestation): Promise<void>;
52
50
  }
53
- export type P2PApi<T extends P2PClientType = P2PClientType.Full> = T extends P2PClientType.Full ? P2PApiWithAttestations : P2PApiWithoutAttestations;
54
- export type P2PApiFull<T extends P2PClientType = P2PClientType.Full> = T extends P2PClientType.Full ? P2PApiWithAttestations & P2PClient : P2PApiWithoutAttestations;
51
+ export type P2PApi<T extends P2PClientType = P2PClientType.Full> = T extends P2PClientType.Full ? P2PClient & P2PApiWithoutAttestations : P2PApiWithoutAttestations;
55
52
  export declare const P2PApiSchema: ApiSchemaFor<P2PApi>;
56
53
  //# sourceMappingURL=p2p.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"p2p.d.ts","sourceRoot":"","sources":["../../src/interfaces/p2p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,MAAM,MAAM,QAAQ,GAChB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GAC1E;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAc7F,qCAAqC;AACrC,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/B,4DAA4D;IAC5D,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB;IACvE;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;CACxF;AAED,MAAM,WAAW,SAAU,SAAQ,sBAAsB;IACvD,uEAAuE;IACvE,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAC,IAAI,IAAI,CAAC,SAAS,aAAa,CAAC,IAAI,GAC3F,sBAAsB,GACtB,yBAAyB,CAAC;AAE9B,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAC,IAAI,IAAI,CAAC,SAAS,aAAa,CAAC,IAAI,GAC/F,sBAAsB,GAAG,SAAS,GAClC,yBAAyB,CAAC;AAE9B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,MAAM,CAS7C,CAAC"}
1
+ {"version":3,"file":"p2p.d.ts","sourceRoot":"","sources":["../../src/interfaces/p2p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,MAAM,MAAM,QAAQ,GAChB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GAC1E;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAc7F,qCAAqC;AACrC,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/B,4DAA4D;IAC5D,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,SAAU,SAAQ,yBAAyB;IAC1D;;;;;;OAMG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEvF,uEAAuE;IACvE,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAC,IAAI,IAAI,CAAC,SAAS,aAAa,CAAC,IAAI,GAC3F,SAAS,GAAG,yBAAyB,GACrC,yBAAyB,CAAC;AAE9B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,MAAM,CAU7C,CAAC"}
@@ -27,5 +27,6 @@ export const P2PApiSchema = {
27
27
  getPendingTxs: z.function().returns(z.array(Tx.schema)),
28
28
  getPendingTxCount: z.function().returns(schemas.Integer),
29
29
  getEncodedEnr: z.function().returns(z.string().optional()),
30
- getPeers: z.function().args(optional(z.boolean())).returns(z.array(PeerInfoSchema))
30
+ getPeers: z.function().args(optional(z.boolean())).returns(z.array(PeerInfoSchema)),
31
+ addAttestation: z.function().args(BlockAttestation.schema).returns(z.void())
31
32
  };